leyoda/cosmic-text
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix some clippy lints

Browse source
This commit is contained in:
Jeremy Soller 2023-11-15 09:21:13 -07:00
parent 6536231dfc
commit 19ae07bd3b
No known key found for this signature in database
GPG key ID: DCFCA852D3906975
5 changed files with 18 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/edit/editor.rs
View file

@ -613,8 +613,7 @@ impl Edit for Editor {
let line = &self.buffer.lines[self.cursor.line];
self.cursor.index = line.text()[..self.cursor.index]
.char_indices()
.rev()
.next()
.next_back()
.map_or(0, |(i, _)| i);
} else if self.cursor.line > 0 {
// Move cursor to previous line
@ -719,15 +718,10 @@ impl Edit for Editor {
}
// Adjust selection
match self.select_opt {
Some(ref mut select) => {
if select.line == line_i {
if select.index >= after_whitespace {
select.index += required_indent;
}
}
if let Some(ref mut select) = self.select_opt {
if select.line == line_i && select.index >= after_whitespace {
select.index += required_indent;
}
None => {}
}
// Request redraw
@ -786,22 +780,15 @@ impl Edit for Editor {
);
// Adjust cursor
if self.cursor.line == line_i {
if self.cursor.index > last_indent {
self.cursor.index -= after_whitespace - last_indent;
}
if self.cursor.line == line_i && self.cursor.index > last_indent {
self.cursor.index -= after_whitespace - last_indent;
}
// Adjust selection
match self.select_opt {
Some(ref mut select) => {
if select.line == line_i {
if select.index > last_indent {
select.index -= after_whitespace - last_indent;
}
}
if let Some(ref mut select) = self.select_opt {
if select.line == line_i && select.index > last_indent {
select.index -= after_whitespace - last_indent;
}
None => {}
}
// Request redraw

2
src/edit/mod.rs
View file

@ -167,7 +167,7 @@ pub trait Edit {
/// Get the current tab width
fn tab_width(&self) -> usize;
/// Set the current tab width. A tab_width of 0 is not allowed, and will be ignored
/// Set the current tab width. A `tab_width` of 0 is not allowed, and will be ignored
fn set_tab_width(&mut self, tab_width: usize);
/// Shape lines until scroll, after adjusting scroll if the cursor moved