From bb9ade5b6fe030bde1b61b2d116d5c7c16541e40 Mon Sep 17 00:00:00 2001 From: Kirill Bulatov Date: Tue, 27 Jun 2023 12:12:11 +0300 Subject: [PATCH] Fix wrap map test Co-Authored-By: Antonio Scandurra --- crates/editor/src/display_map/wrap_map.rs | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/crates/editor/src/display_map/wrap_map.rs b/crates/editor/src/display_map/wrap_map.rs index fe4723abeea2cffbea6b790d0ea996da6cdf2fe0..f21c7151ad695b2567dc9cea7da5a5007be1696f 100644 --- a/crates/editor/src/display_map/wrap_map.rs +++ b/crates/editor/src/display_map/wrap_map.rs @@ -760,25 +760,18 @@ impl WrapSnapshot { } let text = language::Rope::from(self.text().as_str()); - let input_buffer_rows = self.buffer_snapshot().buffer_rows(0).collect::>(); + let mut input_buffer_rows = self.tab_snapshot.buffer_rows(0); 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() { 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 fold_point.row() == prev_fold_row && display_row != 0 { + if tab_point.row() == prev_tab_row && display_row != 0 { expected_buffer_rows.push(None); } else { - let inlay_point = fold_point.to_inlay_point(&self.tab_snapshot.fold_snapshot); - 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(); + expected_buffer_rows.push(input_buffer_rows.next().unwrap()); } + prev_tab_row = tab_point.row(); assert_eq!(self.line_len(display_row), text.line_len(display_row)); }