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

Preserve indentation for lines that are both indented and outdented

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Max Brunsfeld 2021-10-07 13:55:59 -07:00
parent d77025540a
commit c0a75abcd2
1 changed files with 30 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -192,29 +192,6 @@ struct SyntaxTree {
version: clock::Global, version: clock::Global,
} }
impl SyntaxTree {
fn interpolate(&mut self, buffer: &Buffer) {
let mut delta = 0_isize;
for edit in buffer.edits_since(self.version.clone()) {
let start_offset = (edit.old_bytes.start as isize + delta) as usize;
let start_point = buffer.visible_text.to_point(start_offset);
self.tree.edit(&InputEdit {
start_byte: start_offset,
old_end_byte: start_offset + edit.deleted_bytes(),
new_end_byte: start_offset + edit.inserted_bytes(),
start_position: start_point.into(),
old_end_position: (start_point + edit.deleted_lines()).into(),
new_end_position: buffer
.visible_text
.to_point(start_offset + edit.inserted_bytes())
.into(),
});
delta += edit.inserted_bytes() as isize - edit.deleted_bytes() as isize;
}
self.version = buffer.version();
}
}
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
struct AutoindentRequest { struct AutoindentRequest {
position: Anchor, position: Anchor,
@ -875,7 +852,7 @@ impl Buffer {
fn syntax_tree(&self) -> Option<Tree> { fn syntax_tree(&self) -> Option<Tree> {
if let Some(syntax_tree) = self.syntax_tree.lock().as_mut() { if let Some(syntax_tree) = self.syntax_tree.lock().as_mut() {
syntax_tree.interpolate(self); self.interpolate_tree(syntax_tree);
Some(syntax_tree.tree.clone()) Some(syntax_tree.tree.clone())
} else { } else {
None None
@ -899,7 +876,7 @@ impl Buffer {
if let Some(language) = self.language.clone() { if let Some(language) = self.language.clone() {
let old_tree = self.syntax_tree.lock().as_mut().map(|tree| { let old_tree = self.syntax_tree.lock().as_mut().map(|tree| {
tree.interpolate(self); self.interpolate_tree(tree);
tree.clone() tree.clone()
}); });
let text = self.visible_text.clone(); let text = self.visible_text.clone();
@ -935,7 +912,7 @@ impl Buffer {
}); });
let parse_again = this.version > parsed_version || language_changed; let parse_again = this.version > parsed_version || language_changed;
let old_tree = old_tree.map(|mut old_tree| { let old_tree = old_tree.map(|mut old_tree| {
old_tree.interpolate(this); this.interpolate_tree(&mut old_tree);
old_tree.tree old_tree.tree
}); });
this.parsing_in_background = false; this.parsing_in_background = false;
@ -979,6 +956,27 @@ impl Buffer {
}) })
} }
fn interpolate_tree(&self, tree: &mut SyntaxTree) {
let mut delta = 0_isize;
for edit in self.edits_since(tree.version.clone()) {
let start_offset = (edit.old_bytes.start as isize + delta) as usize;
let start_point = self.visible_text.to_point(start_offset);
tree.tree.edit(&InputEdit {
start_byte: start_offset,
old_end_byte: start_offset + edit.deleted_bytes(),
new_end_byte: start_offset + edit.inserted_bytes(),
start_position: start_point.into(),
old_end_position: (start_point + edit.deleted_lines()).into(),
new_end_position: self
.visible_text
.to_point(start_offset + edit.inserted_bytes())
.into(),
});
delta += edit.inserted_bytes() as isize - edit.deleted_bytes() as isize;
}
tree.version = self.version();
}
fn did_finish_parsing( fn did_finish_parsing(
&mut self, &mut self,
old_tree: Option<Tree>, old_tree: Option<Tree>,
@ -1167,10 +1165,8 @@ impl Buffer {
if range.start.row == prev_row && prev_row < row && range.end > row_start { if range.start.row == prev_row && prev_row < row && range.end > row_start {
eprintln!(" indent because of {} {:?}", node_kind, range); eprintln!(" indent because of {} {:?}", node_kind, range);
increase_from_prev_row = true; increase_from_prev_row = true;
break;
} }
if range.start.row < row
if range.start.row < prev_row
&& (Point::new(prev_row, 0)..=row_start).contains(&range.end) && (Point::new(prev_row, 0)..=row_start).contains(&range.end)
{ {
eprintln!(" outdent because of {} {:?}", node_kind, range); eprintln!(" outdent because of {} {:?}", node_kind, range);
@ -1179,10 +1175,12 @@ impl Buffer {
} }
let mut indent_column = prev_indent_column; let mut indent_column = prev_indent_column;
if increase_from_prev_row { if dedent_to_row < row {
if !increase_from_prev_row {
indent_column = self.indent_column_for_line(dedent_to_row);
}
} else if increase_from_prev_row {
indent_column += request.indent_size as u32; indent_column += request.indent_size as u32;
} else if dedent_to_row < row {
indent_column = self.indent_column_for_line(dedent_to_row);
} }
prev_indent_column = indent_column; prev_indent_column = indent_column;