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

Simplify tab cursor code

Browse source
This commit is contained in:
Anthony 2025-06-09 17:06:04 -04:00
parent 5463fc44bc
commit 3f3125d206
1 changed files with 9 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -396,7 +396,6 @@ impl TabSnapshot {
// The count of bytes at this point in the iteration while considering tab_count and previous expansions // The count of bytes at this point in the iteration while considering tab_count and previous expansions
let expanded_bytes = tab_stop.byte_offset - tab_count + expanded_tab_len; let expanded_bytes = tab_stop.byte_offset - tab_count + expanded_tab_len;
dbg!(expanded_bytes, column);
// Did we expand past the search target? // Did we expand past the search target?
if expanded_bytes > column { if expanded_bytes > column {
@ -1244,31 +1243,6 @@ impl<'a> TabStopCursor<'a> {
debug_assert!(distance == 0, "Can't seek backwards: {distance}"); debug_assert!(distance == 0, "Can't seek backwards: {distance}");
return None; return None;
} }
if let Some((mut chunk, chunk_position)) = self.current_chunk.take() {
let tab_position = chunk.tabs.trailing_zeros() + 1;
if tab_position - chunk_position > distance {
self.bytes_offset += distance;
self.current_chunk = Some((chunk, distance));
return None;
} else {
self.bytes_offset += tab_position - chunk_position;
let tabstop = TabStop {
char_offset: self.bytes_offset,
byte_offset: self.bytes_offset,
};
chunk.tabs = (chunk.tabs - 1) & chunk.tabs;
if chunk.tabs > 0 {
self.current_chunk = Some((chunk, tab_position));
} else {
self.end_of_chunk = Some(chunk.text.len() as u32 - tab_position);
}
return Some(tabstop);
}
}
let past_chunk = self.end_of_chunk.take().unwrap_or_default(); let past_chunk = self.end_of_chunk.take().unwrap_or_default();
let mut distance_traversed = 0; let mut distance_traversed = 0;
@ -1281,29 +1255,32 @@ impl<'a> TabStopCursor<'a> {
distance_traversed += past_chunk; distance_traversed += past_chunk;
} }
while let Some(mut chunk) = self.chunks.next() { while let Some((mut chunk, chunk_position)) = self
.current_chunk
.take()
.or_else(|| self.chunks.next().zip(Some(0)))
{
if chunk.tabs == 0 { if chunk.tabs == 0 {
let chunk_distance = chunk.text.len() as u32; let chunk_distance = chunk.text.len() as u32;
if chunk_distance + distance_traversed >= distance { if chunk_distance + distance_traversed - chunk_position >= distance {
let overshoot = chunk_distance + distance_traversed - distance; let overshoot = chunk_distance + distance_traversed - distance;
self.bytes_offset += distance_traversed.abs_diff(distance); self.bytes_offset += distance_traversed.abs_diff(distance);
self.end_of_chunk = Some(overshoot); self.end_of_chunk = Some(overshoot); // todo! this should be a chunk position
return None; return None;
} }
self.bytes_offset += chunk.text.len() as u32; self.bytes_offset += chunk.text.len() as u32;
distance_traversed += chunk.text.len() as u32; distance_traversed += chunk.text.len() as u32;
continue; continue;
} }
let tab_position = chunk.tabs.trailing_zeros() + 1; let tab_position = chunk.tabs.trailing_zeros() + 1;
if distance_traversed + tab_position > distance { if distance_traversed + tab_position - chunk_position > distance {
let cursor_position = distance_traversed.abs_diff(distance); let cursor_position = distance_traversed.abs_diff(distance);
self.current_chunk = Some((chunk, cursor_position)); self.current_chunk = Some((chunk, cursor_position));
self.bytes_offset += cursor_position; self.bytes_offset += cursor_position;
return None; return None;
} }
self.bytes_offset += tab_position; self.bytes_offset += tab_position - chunk_position;
let tabstop = TabStop { let tabstop = TabStop {
char_offset: self.bytes_offset, char_offset: self.bytes_offset,