mirror of
https://github.com/zed-industries/zed.git
synced 2024-10-25 07:55:56 +00:00
Cancel out outdents and indents referring to the previous row
This commit is contained in:
parent
18e5d75fd3
commit
f66b52239e
1 changed files with 9 additions and 7 deletions
|
@ -1084,6 +1084,7 @@ impl Buffer {
|
|||
if range.start.row >= row {
|
||||
break;
|
||||
}
|
||||
|
||||
if range.start.row == prev_row && range.end > row_start {
|
||||
eprintln!(" indent because of {} {:?}", node_kind, range);
|
||||
indent_from_prev_row = true;
|
||||
|
@ -1094,14 +1095,15 @@ impl Buffer {
|
|||
}
|
||||
}
|
||||
|
||||
let mut indent_column = prev_indent_column;
|
||||
if dedent_to_row < row {
|
||||
if !indent_from_prev_row {
|
||||
indent_column = self.indent_column_for_line(dedent_to_row);
|
||||
}
|
||||
let indent_column = if dedent_to_row == prev_row {
|
||||
prev_indent_column
|
||||
} else if indent_from_prev_row {
|
||||
indent_column += INDENT_SIZE;
|
||||
}
|
||||
prev_indent_column + INDENT_SIZE
|
||||
} else if dedent_to_row < prev_row {
|
||||
self.indent_column_for_line(dedent_to_row)
|
||||
} else {
|
||||
prev_indent_column
|
||||
};
|
||||
|
||||
prev_indent_column = indent_column;
|
||||
prev_row = row;
|
||||
|
|
Loading…
Reference in a new issue