mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-11 12:46:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Fix wrap map test

Browse source 
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
This commit is contained in:
Kirill Bulatov 2023-06-27 12:12:11 +03:00
parent 2b59f27c3b
commit bb9ade5b6f
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
crates/editor/src/display_map/wrap_map.rs
View file

@ -760,25 +760,18 @@ impl WrapSnapshot {
} }
let text = language::Rope::from(self.text().as_str()); let text = language::Rope::from(self.text().as_str());
let input_buffer_rows = self.buffer_snapshot().buffer_rows(0).collect::<Vec<_>>(); let mut input_buffer_rows = self.tab_snapshot.buffer_rows(0);
let mut expected_buffer_rows = Vec::new(); let mut expected_buffer_rows = Vec::new();
let mut prev_fold_row = 0; let mut prev_tab_row = 0;
for display_row in 0..=self.max_point().row() { for display_row in 0..=self.max_point().row() {
let tab_point = self.to_tab_point(WrapPoint::new(display_row, 0)); let tab_point = self.to_tab_point(WrapPoint::new(display_row, 0));
let fold_point = self.tab_snapshot.to_fold_point(tab_point, Bias::Left).0; if tab_point.row() == prev_tab_row && display_row != 0 {
if fold_point.row() == prev_fold_row && display_row != 0 {
expected_buffer_rows.push(None); expected_buffer_rows.push(None);
} else { } else {
let inlay_point = fold_point.to_inlay_point(&self.tab_snapshot.fold_snapshot); expected_buffer_rows.push(input_buffer_rows.next().unwrap());
let buffer_point = self
.tab_snapshot
.fold_snapshot
.inlay_snapshot
.to_buffer_point(inlay_point);
expected_buffer_rows.push(input_buffer_rows[buffer_point.row as usize]);
prev_fold_row = fold_point.row();
} }
prev_tab_row = tab_point.row();
assert_eq!(self.line_len(display_row), text.line_len(display_row)); assert_eq!(self.line_len(display_row), text.line_len(display_row));
} }