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

Fixed Tab indenting the line instead of adding Tab or spaces (#403)

Browse source 
* Update editor.rs

* Makes sure indent_required is calculated according to the selection type

removed the redundant check for required_indent == 0,
introduced a slightly different path for when no selection = None, and calculated the required tab width and indent position accordingly.

* Undo typo

undid an accidental move of a redraw call outside of a loop

* Corrected indenting with rustfmt

formatted the code with rustfmt to pass the failing CI checks
This commit is contained in:
Vancha 2025-07-16 22:39:48 +02:00 • committed by GitHub
parent 85b07b4c8c
commit 7646989d6f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/edit/editor.rs
View file

@ -697,22 +697,32 @@ impl<'buffer> Edit<'buffer> for Editor<'buffer> {
self.with_buffer(|buffer| {
let line = &buffer.lines[line_i];
let text = line.text();
// Default to end of line if no non-whitespace found
after_whitespace = text.len();
for (count, (index, c)) in text.char_indices().enumerate() {
if !c.is_whitespace() {
after_whitespace = index;
required_indent = tab_width - (count % tab_width);
break;
if self.selection == Selection::None {
//Selection::None counts whitespace from the cursor backwards
let whitespace_length = match line.text()[0..self.cursor.index]
.chars()
.rev()
.position(|c| !c.is_whitespace())
{
Some(length) => length,
// The whole line is whitespace
None => self.cursor.index,
};
required_indent = tab_width - (whitespace_length % tab_width);
after_whitespace = self.cursor.index;
} else {
// Other selections count whitespace from the start of the line
for (count, (index, c)) in text.char_indices().enumerate() {
if !c.is_whitespace() {
after_whitespace = index;
required_indent = tab_width - (count % tab_width);
break;
}
}
}
});
// No indent required (not possible?)
if required_indent == 0 {
required_indent = tab_width;
}
self.insert_at(
Cursor::new(line_i, after_whitespace),
&" ".repeat(required_indent),
@ -739,7 +749,6 @@ impl<'buffer> Edit<'buffer> for Editor<'buffer> {
}
}
}
// Request redraw
self.with_buffer_mut(|buffer| buffer.set_redraw(true));
}