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

Expand edit to end of the line when old/new row exceeds max expansion

Browse source
This commit is contained in:
Antonio Scandurra 2023-03-29 16:31:12 +02:00
parent 719d0f0abf
commit b86f8188d1
1 changed files with 22 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

22
crates/editor/src/display_map/tab_map.rs
View file

@ -52,6 +52,28 @@ impl TabMap {
if old_snapshot.tab_size == new_snapshot.tab_size { if old_snapshot.tab_size == new_snapshot.tab_size {
for suggestion_edit in &mut suggestion_edits { for suggestion_edit in &mut suggestion_edits {
let old_end = old_snapshot
.suggestion_snapshot
.to_point(suggestion_edit.old.end);
let old_end_row_len = old_snapshot.suggestion_snapshot.line_len(old_end.row());
let old_end_row_exceeds_max_expansion =
old_end_row_len > old_snapshot.max_expansion_column;
let new_end = new_snapshot
.suggestion_snapshot
.to_point(suggestion_edit.new.end);
let new_end_row_len = new_snapshot.suggestion_snapshot.line_len(new_end.row());
let new_end_row_exceeds_max_expansion =
new_end_row_len > new_snapshot.max_expansion_column;
if old_end_row_exceeds_max_expansion || new_end_row_exceeds_max_expansion {
suggestion_edit.old.end = old_snapshot
.suggestion_snapshot
.to_offset(SuggestionPoint::new(old_end.row(), old_end_row_len));
suggestion_edit.new.end = new_snapshot
.suggestion_snapshot
.to_offset(SuggestionPoint::new(new_end.row(), new_end_row_len));
continue;
}
let mut delta = 0; let mut delta = 0;
for chunk in old_snapshot.suggestion_snapshot.chunks( for chunk in old_snapshot.suggestion_snapshot.chunks(
suggestion_edit.old.end..old_max_offset, suggestion_edit.old.end..old_max_offset,