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

Editor: Fix indent/unindent empty lines

Browse source
This commit is contained in:
Jeremy Soller 2023-11-14 09:03:36 -07:00
parent 4c85a6be72
commit 0eefb12608
No known key found for this signature in database
GPG key ID: DCFCA852D3906975
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/edit/editor.rs
View file

@ -682,11 +682,13 @@ impl Edit for Editor {
// For every line in selection // For every line in selection
for line_i in start.line..=end.line { for line_i in start.line..=end.line {
// Determine indexes of last indent and first character after whitespace // Determine indexes of last indent and first character after whitespace
let mut after_whitespace = 0; let mut after_whitespace;
let mut required_indent = 0; let mut required_indent = 0;
{ {
let line = &self.buffer.lines[line_i]; let line = &self.buffer.lines[line_i];
let text = line.text(); 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() { for (count, (index, c)) in text.char_indices().enumerate() {
if !c.is_whitespace() { if !c.is_whitespace() {
after_whitespace = index; after_whitespace = index;
@ -755,10 +757,12 @@ impl Edit for Editor {
for line_i in start.line..=end.line { for line_i in start.line..=end.line {
// Determine indexes of last indent and first character after whitespace // Determine indexes of last indent and first character after whitespace
let mut last_indent = 0; let mut last_indent = 0;
let mut after_whitespace = 0; let mut after_whitespace;
{ {
let line = &self.buffer.lines[line_i]; let line = &self.buffer.lines[line_i];
let text = line.text(); 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() { for (count, (index, c)) in text.char_indices().enumerate() {
if !c.is_whitespace() { if !c.is_whitespace() {
after_whitespace = index; after_whitespace = index;