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

Fix switched input + output rows in BlockSnapshot::buffer_rows

Browse source
This commit is contained in:
Max Brunsfeld 2021-11-18 12:41:58 -08:00
parent bef09696f6
commit 6aa346dec8
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
crates/editor/src/display_map/block_map.rs
View file

@ -522,7 +522,7 @@ impl BlockSnapshot {
pub fn buffer_rows(&self, start_row: u32) -> BufferRows { pub fn buffer_rows(&self, start_row: u32) -> BufferRows {
let mut cursor = self.transforms.cursor::<(BlockRow, WrapRow)>(); let mut cursor = self.transforms.cursor::<(BlockRow, WrapRow)>();
cursor.seek(&BlockRow(start_row), Bias::Right, &()); cursor.seek(&BlockRow(start_row), Bias::Right, &());
let (input_start, output_start) = cursor.start(); let (output_start, input_start) = cursor.start();
let overshoot = if cursor.item().map_or(false, |t| t.is_isomorphic()) { let overshoot = if cursor.item().map_or(false, |t| t.is_isomorphic()) {
start_row - output_start.0 start_row - output_start.0
} else { } else {
@ -1478,6 +1478,12 @@ mod tests {
"incorrect text starting from row {}", "incorrect text starting from row {}",
start_row start_row
); );
assert_eq!(
blocks_snapshot
.buffer_rows(start_row as u32)
.collect::<Vec<_>>(),
&expected_buffer_rows[start_row..]
);
} }
let mut expected_longest_rows = Vec::new(); let mut expected_longest_rows = Vec::new();
@ -1519,10 +1525,6 @@ mod tests {
let block_point = blocks_snapshot.to_block_point(wrap_point); let block_point = blocks_snapshot.to_block_point(wrap_point);
assert_eq!(blocks_snapshot.to_wrap_point(block_point), wrap_point); assert_eq!(blocks_snapshot.to_wrap_point(block_point), wrap_point);
} }
assert_eq!(
blocks_snapshot.buffer_rows(0).collect::<Vec<_>>(),
expected_buffer_rows
);
let mut block_point = BlockPoint::new(0, 0); let mut block_point = BlockPoint::new(0, 0);
for c in expected_text.chars() { for c in expected_text.chars() {