Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

💄

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra 2021-10-08 17:43:19 +02:00
parent f66b52239e
commit c60bc00c9e
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/buffer/src/lib.rs
View file

@ -1079,7 +1079,7 @@ impl Buffer {
); );
let mut indent_from_prev_row = false; let mut indent_from_prev_row = false;
let mut dedent_to_row = u32::MAX; let mut outdent_to_row = u32::MAX;
for (range, node_kind) in &indentation_ranges { for (range, node_kind) in &indentation_ranges {
if range.start.row >= row { if range.start.row >= row {
break; break;
@ -1091,16 +1091,16 @@ impl Buffer {
} }
if range.end.row >= prev_row && range.end <= row_start { if range.end.row >= prev_row && range.end <= row_start {
eprintln!(" outdent because of {} {:?}", node_kind, range); eprintln!(" outdent because of {} {:?}", node_kind, range);
dedent_to_row = dedent_to_row.min(range.start.row); outdent_to_row = outdent_to_row.min(range.start.row);
} }
} }
let indent_column = if dedent_to_row == prev_row { let indent_column = if outdent_to_row == prev_row {
prev_indent_column prev_indent_column
} else if indent_from_prev_row { } else if indent_from_prev_row {
prev_indent_column + INDENT_SIZE prev_indent_column + INDENT_SIZE
} else if dedent_to_row < prev_row { } else if outdent_to_row < prev_row {
self.indent_column_for_line(dedent_to_row) self.indent_column_for_line(outdent_to_row)
} else { } else {
prev_indent_column prev_indent_column
}; };