mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-24 19:10:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix creation of anchors for the inserted portion of an edit

Browse source
This commit is contained in:
Antonio Scandurra 2021-10-11 13:08:50 +02:00
parent b43c78053b
commit 7f5d454b2d
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1051,7 +1051,6 @@ impl Buffer {
)
.collect::<Vec<_>>();
for (new_row, suggestion) in new_edited_row_range.zip(suggestions) {
dbg!(&suggestion);
let delta = if suggestion.indent { INDENT_SIZE } else { 0 };
let new_indentation = self.indent_column_for_line(suggestion.basis_row) + delta;
if old_suggestions
@ -1067,10 +1066,9 @@ impl Buffer {
let inserted_row_ranges = contiguous_ranges(
inserted
.to_point_ranges(self.content())
.flat_map(|range| dbg!(range.start.row..range.end.row + 1)),
.flat_map(|range| range.start.row..range.end.row + 1),
)
.collect::<Vec<_>>();
dbg!(&inserted_row_ranges);
for inserted_row_range in inserted_row_ranges {
let suggestions = self
.content()
@ -1083,7 +1081,6 @@ impl Buffer {
.collect::<Vec<_>>();
for (row, suggestion) in inserted_row_range.zip(suggestions) {
dbg!(&suggestion);
let delta = if suggestion.indent { INDENT_SIZE } else { 0 };
let new_indentation =
self.indent_column_for_line(suggestion.basis_row) + delta;
@ -1485,15 +1482,10 @@ impl Buffer {
if let Some((before_edit, edited)) = autoindent_request {
let mut inserted = None;
if let Some(first_newline_ix) = first_newline_ix {
inserted = Some(
self.content()
.anchor_range_set(edit.ranges.iter().map(|range| {
dbg!(
(range.start + first_newline_ix + 1, Bias::Left)
..(range.start + new_text_len, Bias::Right)
)
})),
);
inserted = Some(self.content().anchor_range_set(ranges.iter().map(|range| {
(range.start + first_newline_ix + 1, Bias::Left)
..(range.start + new_text_len, Bias::Right)
})));
}
self.autoindent_requests.push_back(AutoindentRequest {