From c23feeab3ae6b8e6c3c7106cda953041f8a4e487 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Tue, 28 Mar 2023 14:10:43 -0700 Subject: [PATCH 1/8] :art: Make expand_tabs and collapse_tabs instance methods on TabSnapshot --- crates/editor/src/display_map.rs | 5 ++- crates/editor/src/display_map/tab_map.rs | 43 +++++++++++------------- 2 files changed, 21 insertions(+), 27 deletions(-) diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs index f49b9e34b8e221a3cf0e79af20c88a472fd7bd4d..cdf4b7e3ad2c1ad28bb34c8e5a4c60d1fd29f4dd 100644 --- a/crates/editor/src/display_map.rs +++ b/crates/editor/src/display_map.rs @@ -19,7 +19,7 @@ use std::{any::TypeId, fmt::Debug, num::NonZeroU32, ops::Range, sync::Arc}; pub use suggestion_map::Suggestion; use suggestion_map::SuggestionMap; use sum_tree::{Bias, TreeMap}; -use tab_map::{TabMap, TabSnapshot}; +use tab_map::TabMap; use wrap_map::WrapMap; pub use block_map::{ @@ -637,7 +637,7 @@ impl DisplaySnapshot { let chars = buffer.chars_at(Point::new(range.start.row, 0)); let mut is_blank = false; - let indent_size = TabSnapshot::expand_tabs( + let indent_size = self.tab_snapshot.expand_tabs( chars.take_while(|c| { if *c == ' ' || *c == '\t' { true @@ -649,7 +649,6 @@ impl DisplaySnapshot { } }), buffer.line_len(buffer_row) as usize, // Never collapse - self.tab_snapshot.tab_size, ); (indent_size as u32, is_blank) diff --git a/crates/editor/src/display_map/tab_map.rs b/crates/editor/src/display_map/tab_map.rs index 45c92ea7b84ec0809213a6dc80238030d4bd1d79..29dca3b1fb359dc231fcc98ee7222ac0082b3e49 100644 --- a/crates/editor/src/display_map/tab_map.rs +++ b/crates/editor/src/display_map/tab_map.rs @@ -245,7 +245,7 @@ impl TabSnapshot { let chars = self .suggestion_snapshot .chars_at(SuggestionPoint::new(input.row(), 0)); - let expanded = Self::expand_tabs(chars, input.column() as usize, self.tab_size); + let expanded = self.expand_tabs(chars, input.column() as usize); TabPoint::new(input.row(), expanded as u32) } @@ -259,7 +259,7 @@ impl TabSnapshot { .chars_at(SuggestionPoint::new(output.row(), 0)); let expanded = output.column() as usize; let (collapsed, expanded_char_column, to_next_stop) = - Self::collapse_tabs(chars, expanded, bias, self.tab_size); + self.collapse_tabs(chars, expanded, bias); ( SuggestionPoint::new(output.row(), collapsed as u32), expanded_char_column, @@ -282,11 +282,9 @@ impl TabSnapshot { fold_point.to_buffer_point(&self.suggestion_snapshot.fold_snapshot) } - pub fn expand_tabs( - chars: impl Iterator, - column: usize, - tab_size: NonZeroU32, - ) -> usize { + pub fn expand_tabs(&self, chars: impl Iterator, column: usize) -> usize { + let tab_size = self.tab_size.get() as usize; + let mut expanded_chars = 0; let mut expanded_bytes = 0; let mut collapsed_bytes = 0; @@ -295,7 +293,6 @@ impl TabSnapshot { break; } if c == '\t' { - let tab_size = tab_size.get() as usize; let tab_len = tab_size - expanded_chars % tab_size; expanded_bytes += tab_len; expanded_chars += tab_len; @@ -309,11 +306,13 @@ impl TabSnapshot { } fn collapse_tabs( + &self, chars: impl Iterator, column: usize, bias: Bias, - tab_size: NonZeroU32, ) -> (usize, usize, usize) { + let tab_size = self.tab_size.get() as usize; + let mut expanded_bytes = 0; let mut expanded_chars = 0; let mut collapsed_bytes = 0; @@ -323,7 +322,6 @@ impl TabSnapshot { } if c == '\t' { - let tab_size = tab_size.get() as usize; let tab_len = tab_size - (expanded_chars % tab_size); expanded_chars += tab_len; expanded_bytes += tab_len; @@ -508,20 +506,17 @@ mod tests { }; use rand::{prelude::StdRng, Rng}; - #[test] - fn test_expand_tabs() { - assert_eq!( - TabSnapshot::expand_tabs("\t".chars(), 0, 4.try_into().unwrap()), - 0 - ); - assert_eq!( - TabSnapshot::expand_tabs("\t".chars(), 1, 4.try_into().unwrap()), - 4 - ); - assert_eq!( - TabSnapshot::expand_tabs("\ta".chars(), 2, 4.try_into().unwrap()), - 5 - ); + #[gpui::test] + fn test_expand_tabs(cx: &mut gpui::MutableAppContext) { + let buffer = MultiBuffer::build_simple("", cx); + let buffer_snapshot = buffer.read(cx).snapshot(cx); + let (_, fold_snapshot) = FoldMap::new(buffer_snapshot.clone()); + let (_, suggestion_snapshot) = SuggestionMap::new(fold_snapshot); + let (_, tabs_snapshot) = TabMap::new(suggestion_snapshot, 4.try_into().unwrap()); + + assert_eq!(tabs_snapshot.expand_tabs("\t".chars(), 0), 0); + assert_eq!(tabs_snapshot.expand_tabs("\t".chars(), 1), 4); + assert_eq!(tabs_snapshot.expand_tabs("\ta".chars(), 2), 5); } #[gpui::test(iterations = 100)] From 08e93e93219da400c2412a1acb6f0964a3210624 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Tue, 28 Mar 2023 16:00:56 -0700 Subject: [PATCH 2/8] Only expand tabs up until a limited column --- crates/editor/src/display_map.rs | 2 +- .../editor/src/display_map/suggestion_map.rs | 26 +++ crates/editor/src/display_map/tab_map.rs | 178 ++++++++++++++---- crates/editor/src/display_map/wrap_map.rs | 3 +- 4 files changed, 166 insertions(+), 43 deletions(-) diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs index cdf4b7e3ad2c1ad28bb34c8e5a4c60d1fd29f4dd..cdad986b4976b20d19d6c3621892f7737cb90a0b 100644 --- a/crates/editor/src/display_map.rs +++ b/crates/editor/src/display_map.rs @@ -648,7 +648,7 @@ impl DisplaySnapshot { false } }), - buffer.line_len(buffer_row) as usize, // Never collapse + buffer.line_len(buffer_row), // Never collapse ); (indent_size as u32, is_blank) diff --git a/crates/editor/src/display_map/suggestion_map.rs b/crates/editor/src/display_map/suggestion_map.rs index 2d0225644fbbb77d8037976c602b92e32792cf02..5be4f6f0df9e2e5ebebeac2706199baa6245e719 100644 --- a/crates/editor/src/display_map/suggestion_map.rs +++ b/crates/editor/src/display_map/suggestion_map.rs @@ -210,6 +210,32 @@ impl SuggestionSnapshot { } } + pub fn line_len(&self, row: u32) -> u32 { + if let Some(suggestion) = &self.suggestion { + let suggestion_start = suggestion.position.to_point(&self.fold_snapshot).0; + let suggestion_end = suggestion_start + suggestion.text.max_point(); + + if row < suggestion_start.row { + self.fold_snapshot.line_len(row) + } else if row > suggestion_end.row { + self.fold_snapshot + .line_len(suggestion_start.row + (row - suggestion_end.row)) + } else { + let mut result = suggestion.text.line_len(row - suggestion_start.row); + if row == suggestion_start.row { + result += suggestion_start.column; + } + if row == suggestion_end.row { + result += + self.fold_snapshot.line_len(suggestion_start.row) - suggestion_start.column; + } + result + } + } else { + self.fold_snapshot.line_len(row) + } + } + pub fn clip_point(&self, point: SuggestionPoint, bias: Bias) -> SuggestionPoint { if let Some(suggestion) = self.suggestion.as_ref() { let suggestion_start = suggestion.position.to_point(&self.fold_snapshot).0; diff --git a/crates/editor/src/display_map/tab_map.rs b/crates/editor/src/display_map/tab_map.rs index 29dca3b1fb359dc231fcc98ee7222ac0082b3e49..55b3425b248d1ec7ffaffabdd76f29c146e56117 100644 --- a/crates/editor/src/display_map/tab_map.rs +++ b/crates/editor/src/display_map/tab_map.rs @@ -8,6 +8,8 @@ use parking_lot::Mutex; use std::{cmp, mem, num::NonZeroU32, ops::Range}; use sum_tree::Bias; +const MAX_EXPANSION_COLUMN: u32 = 256; + pub struct TabMap(Mutex); impl TabMap { @@ -15,11 +17,18 @@ impl TabMap { let snapshot = TabSnapshot { suggestion_snapshot: input, tab_size, + max_expansion_column: MAX_EXPANSION_COLUMN, version: 0, }; (Self(Mutex::new(snapshot.clone())), snapshot) } + #[cfg(test)] + pub fn set_max_expansion_column(&self, column: u32) -> TabSnapshot { + self.0.lock().max_expansion_column = column; + self.0.lock().clone() + } + pub fn sync( &self, suggestion_snapshot: SuggestionSnapshot, @@ -30,6 +39,7 @@ impl TabMap { let mut new_snapshot = TabSnapshot { suggestion_snapshot, tab_size, + max_expansion_column: old_snapshot.max_expansion_column, version: old_snapshot.version, }; @@ -111,6 +121,7 @@ impl TabMap { pub struct TabSnapshot { pub suggestion_snapshot: SuggestionSnapshot, pub tab_size: NonZeroU32, + pub max_expansion_column: u32, pub version: usize, } @@ -122,14 +133,12 @@ impl TabSnapshot { pub fn line_len(&self, row: u32) -> u32 { let max_point = self.max_point(); if row < max_point.row() { - self.chunks( - TabPoint::new(row, 0)..TabPoint::new(row + 1, 0), - false, - None, - ) - .map(|chunk| chunk.text.len() as u32) - .sum::() - - 1 + self.to_tab_point(SuggestionPoint::new( + row, + self.suggestion_snapshot.line_len(row), + )) + .0 + .column } else { max_point.column() } @@ -191,12 +200,13 @@ impl TabSnapshot { ) -> TabChunks<'a> { let (input_start, expanded_char_column, to_next_stop) = self.to_suggestion_point(range.start, Bias::Left); + let input_column = input_start.column(); let input_start = self.suggestion_snapshot.to_offset(input_start); let input_end = self .suggestion_snapshot .to_offset(self.to_suggestion_point(range.end, Bias::Right).0); - let to_next_stop = if range.start.0 + Point::new(0, to_next_stop as u32) > range.end.0 { - (range.end.column() - range.start.column()) as usize + let to_next_stop = if range.start.0 + Point::new(0, to_next_stop) > range.end.0 { + range.end.column() - range.start.column() } else { to_next_stop }; @@ -207,12 +217,14 @@ impl TabSnapshot { language_aware, text_highlights, ), + input_column, column: expanded_char_column, + max_expansion_column: self.max_expansion_column, output_position: range.start.0, max_output_position: range.end.0, tab_size: self.tab_size, chunk: Chunk { - text: &SPACES[0..to_next_stop], + text: &SPACES[0..(to_next_stop as usize)], ..Default::default() }, skip_leading_tab: to_next_stop > 0, @@ -245,19 +257,15 @@ impl TabSnapshot { let chars = self .suggestion_snapshot .chars_at(SuggestionPoint::new(input.row(), 0)); - let expanded = self.expand_tabs(chars, input.column() as usize); - TabPoint::new(input.row(), expanded as u32) + let expanded = self.expand_tabs(chars, input.column()); + TabPoint::new(input.row(), expanded) } - pub fn to_suggestion_point( - &self, - output: TabPoint, - bias: Bias, - ) -> (SuggestionPoint, usize, usize) { + pub fn to_suggestion_point(&self, output: TabPoint, bias: Bias) -> (SuggestionPoint, u32, u32) { let chars = self .suggestion_snapshot .chars_at(SuggestionPoint::new(output.row(), 0)); - let expanded = output.column() as usize; + let expanded = output.column(); let (collapsed, expanded_char_column, to_next_stop) = self.collapse_tabs(chars, expanded, bias); ( @@ -282,14 +290,15 @@ impl TabSnapshot { fold_point.to_buffer_point(&self.suggestion_snapshot.fold_snapshot) } - pub fn expand_tabs(&self, chars: impl Iterator, column: usize) -> usize { - let tab_size = self.tab_size.get() as usize; + pub fn expand_tabs(&self, chars: impl Iterator, column: u32) -> u32 { + let tab_size = self.tab_size.get(); let mut expanded_chars = 0; let mut expanded_bytes = 0; let mut collapsed_bytes = 0; + let end_column = column.min(self.max_expansion_column); for c in chars { - if collapsed_bytes == column { + if collapsed_bytes >= end_column { break; } if c == '\t' { @@ -297,21 +306,21 @@ impl TabSnapshot { expanded_bytes += tab_len; expanded_chars += tab_len; } else { - expanded_bytes += c.len_utf8(); + expanded_bytes += c.len_utf8() as u32; expanded_chars += 1; } - collapsed_bytes += c.len_utf8(); + collapsed_bytes += c.len_utf8() as u32; } - expanded_bytes + expanded_bytes + column.saturating_sub(collapsed_bytes) } fn collapse_tabs( &self, chars: impl Iterator, - column: usize, + column: u32, bias: Bias, - ) -> (usize, usize, usize) { - let tab_size = self.tab_size.get() as usize; + ) -> (u32, u32, u32) { + let tab_size = self.tab_size.get(); let mut expanded_bytes = 0; let mut expanded_chars = 0; @@ -320,6 +329,9 @@ impl TabSnapshot { if expanded_bytes >= column { break; } + if collapsed_bytes >= self.max_expansion_column { + break; + } if c == '\t' { let tab_len = tab_size - (expanded_chars % tab_size); @@ -334,7 +346,7 @@ impl TabSnapshot { } } else { expanded_chars += 1; - expanded_bytes += c.len_utf8(); + expanded_bytes += c.len_utf8() as u32; } if expanded_bytes > column && matches!(bias, Bias::Left) { @@ -342,9 +354,13 @@ impl TabSnapshot { break; } - collapsed_bytes += c.len_utf8(); + collapsed_bytes += c.len_utf8() as u32; } - (collapsed_bytes, expanded_chars, 0) + ( + collapsed_bytes + column.saturating_sub(expanded_bytes), + expanded_chars, + 0, + ) } } @@ -432,8 +448,10 @@ const SPACES: &str = " "; pub struct TabChunks<'a> { suggestion_chunks: SuggestionChunks<'a>, chunk: Chunk<'a>, - column: usize, + column: u32, + max_expansion_column: u32, output_position: Point, + input_column: u32, max_output_position: Point, tab_size: NonZeroU32, skip_leading_tab: bool, @@ -467,14 +485,19 @@ impl<'a> Iterator for TabChunks<'a> { }); } else { self.chunk.text = &self.chunk.text[1..]; - let tab_size = self.tab_size.get() as u32; - let mut len = tab_size - self.column as u32 % tab_size; + let tab_size = if self.input_column < self.max_expansion_column { + self.tab_size.get() as u32 + } else { + 1 + }; + let mut len = tab_size - self.column % tab_size; let next_output_position = cmp::min( self.output_position + Point::new(0, len), self.max_output_position, ); len = next_output_position.column - self.output_position.column; - self.column += len as usize; + self.column += len; + self.input_column += 1; self.output_position = next_output_position; return Some(Chunk { text: &SPACES[0..len as usize], @@ -484,10 +507,12 @@ impl<'a> Iterator for TabChunks<'a> { } '\n' => { self.column = 0; + self.input_column = 0; self.output_position += Point::new(1, 0); } _ => { self.column += 1; + self.input_column += c.len_utf8() as u32; self.output_position.column += c.len_utf8() as u32; } } @@ -512,11 +537,76 @@ mod tests { let buffer_snapshot = buffer.read(cx).snapshot(cx); let (_, fold_snapshot) = FoldMap::new(buffer_snapshot.clone()); let (_, suggestion_snapshot) = SuggestionMap::new(fold_snapshot); - let (_, tabs_snapshot) = TabMap::new(suggestion_snapshot, 4.try_into().unwrap()); + let (_, tab_snapshot) = TabMap::new(suggestion_snapshot, 4.try_into().unwrap()); - assert_eq!(tabs_snapshot.expand_tabs("\t".chars(), 0), 0); - assert_eq!(tabs_snapshot.expand_tabs("\t".chars(), 1), 4); - assert_eq!(tabs_snapshot.expand_tabs("\ta".chars(), 2), 5); + assert_eq!(tab_snapshot.expand_tabs("\t".chars(), 0), 0); + assert_eq!(tab_snapshot.expand_tabs("\t".chars(), 1), 4); + assert_eq!(tab_snapshot.expand_tabs("\ta".chars(), 2), 5); + } + + #[gpui::test] + fn test_long_lines(cx: &mut gpui::MutableAppContext) { + let max_expansion_column = 12; + let input = "A\tBC\tDEF\tG\tHI\tJ\tK\tL\tM"; + let output = "A BC DEF G HI J K L M"; + + let buffer = MultiBuffer::build_simple(input, cx); + let buffer_snapshot = buffer.read(cx).snapshot(cx); + let (_, fold_snapshot) = FoldMap::new(buffer_snapshot.clone()); + let (_, suggestion_snapshot) = SuggestionMap::new(fold_snapshot); + let (_, mut tab_snapshot) = TabMap::new(suggestion_snapshot, 4.try_into().unwrap()); + + tab_snapshot.max_expansion_column = max_expansion_column; + assert_eq!(tab_snapshot.text(), output); + + for (ix, c) in input.char_indices() { + assert_eq!( + tab_snapshot + .chunks( + TabPoint::new(0, ix as u32)..tab_snapshot.max_point(), + false, + None + ) + .map(|c| c.text) + .collect::(), + &output[ix..], + "text from index {ix}" + ); + + if c != '\t' { + let input_point = Point::new(0, ix as u32); + let output_point = Point::new(0, output.find(c).unwrap() as u32); + assert_eq!( + tab_snapshot.to_tab_point(SuggestionPoint(input_point)), + TabPoint(output_point), + "to_tab_point({input_point:?})" + ); + assert_eq!( + tab_snapshot + .to_suggestion_point(TabPoint(output_point), Bias::Left) + .0, + SuggestionPoint(input_point), + "to_suggestion_point({output_point:?})" + ); + } + } + } + + #[gpui::test] + fn test_long_lines_with_character_spanning_max_expansion_column( + cx: &mut gpui::MutableAppContext, + ) { + let max_expansion_column = 8; + let input = "abcdefg⋯hij"; + + let buffer = MultiBuffer::build_simple(input, cx); + let buffer_snapshot = buffer.read(cx).snapshot(cx); + let (_, fold_snapshot) = FoldMap::new(buffer_snapshot.clone()); + let (_, suggestion_snapshot) = SuggestionMap::new(fold_snapshot); + let (_, mut tab_snapshot) = TabMap::new(suggestion_snapshot, 4.try_into().unwrap()); + + tab_snapshot.max_expansion_column = max_expansion_column; + assert_eq!(tab_snapshot.text(), input); } #[gpui::test(iterations = 100)] @@ -542,7 +632,9 @@ mod tests { let (suggestion_snapshot, _) = suggestion_map.randomly_mutate(&mut rng); log::info!("SuggestionMap text: {:?}", suggestion_snapshot.text()); - let (_, tabs_snapshot) = TabMap::new(suggestion_snapshot.clone(), tab_size); + let (tab_map, _) = TabMap::new(suggestion_snapshot.clone(), tab_size); + let tabs_snapshot = tab_map.set_max_expansion_column(32); + let text = text::Rope::from(tabs_snapshot.text().as_str()); log::info!( "TabMap text (tab size: {}): {:?}", @@ -586,7 +678,11 @@ mod tests { } for row in 0..=text.max_point().row { - assert_eq!(tabs_snapshot.line_len(row), text.line_len(row)); + assert_eq!( + tabs_snapshot.line_len(row), + text.line_len(row), + "line_len({row})" + ); } } } diff --git a/crates/editor/src/display_map/wrap_map.rs b/crates/editor/src/display_map/wrap_map.rs index f0d10ad42339eb37a7e6ae292ee675c4990e8ad8..311233850d44a37643a2be8d7ca2d924f7c0745d 100644 --- a/crates/editor/src/display_map/wrap_map.rs +++ b/crates/editor/src/display_map/wrap_map.rs @@ -1089,7 +1089,8 @@ mod tests { log::info!("FoldMap text: {:?}", fold_snapshot.text()); let (suggestion_map, suggestion_snapshot) = SuggestionMap::new(fold_snapshot.clone()); log::info!("SuggestionMap text: {:?}", suggestion_snapshot.text()); - let (tab_map, tabs_snapshot) = TabMap::new(suggestion_snapshot.clone(), tab_size); + let (tab_map, _) = TabMap::new(suggestion_snapshot.clone(), tab_size); + let tabs_snapshot = tab_map.set_max_expansion_column(32); log::info!("TabMap text: {:?}", tabs_snapshot.text()); let mut line_wrapper = LineWrapper::new(font_id, font_size, font_system); From 5c1f82ae3da9c15de1f74023bbae30a0c2115d33 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Tue, 28 Mar 2023 17:37:57 -0700 Subject: [PATCH 3/8] Don't use TabMap::expand_tabs in line_indent_for_buffer_row --- crates/editor/src/display_map.rs | 25 +++++++++++------------- crates/editor/src/display_map/tab_map.rs | 2 +- crates/editor/src/editor_tests.rs | 2 +- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs index cdad986b4976b20d19d6c3621892f7737cb90a0b..4d8313520587a669919a0a540302162502bfa42e 100644 --- a/crates/editor/src/display_map.rs +++ b/crates/editor/src/display_map.rs @@ -634,24 +634,21 @@ impl DisplaySnapshot { .buffer_snapshot .buffer_line_for_row(buffer_row) .unwrap(); - let chars = buffer.chars_at(Point::new(range.start.row, 0)); + let mut indent_size = 0; let mut is_blank = false; - let indent_size = self.tab_snapshot.expand_tabs( - chars.take_while(|c| { - if *c == ' ' || *c == '\t' { - true - } else { - if *c == '\n' { - is_blank = true; - } - false + for c in buffer.chars_at(Point::new(range.start.row, 0)) { + if c == ' ' || c == '\t' { + indent_size += 1; + } else { + if c == '\n' { + is_blank = true; } - }), - buffer.line_len(buffer_row), // Never collapse - ); + break; + } + } - (indent_size as u32, is_blank) + (indent_size, is_blank) } pub fn line_len(&self, row: u32) -> u32 { diff --git a/crates/editor/src/display_map/tab_map.rs b/crates/editor/src/display_map/tab_map.rs index 55b3425b248d1ec7ffaffabdd76f29c146e56117..50dc691a60eace0e843aae140e7949f3dd998d52 100644 --- a/crates/editor/src/display_map/tab_map.rs +++ b/crates/editor/src/display_map/tab_map.rs @@ -290,7 +290,7 @@ impl TabSnapshot { fold_point.to_buffer_point(&self.suggestion_snapshot.fold_snapshot) } - pub fn expand_tabs(&self, chars: impl Iterator, column: u32) -> u32 { + fn expand_tabs(&self, chars: impl Iterator, column: u32) -> u32 { let tab_size = self.tab_size.get(); let mut expanded_chars = 0; diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs index 4f61bde39877bb0fb7ba40c0000077cf75c9fe82..292c24f79a506b9300e336df64c50afa519d059e 100644 --- a/crates/editor/src/editor_tests.rs +++ b/crates/editor/src/editor_tests.rs @@ -630,7 +630,7 @@ fn test_cancel(cx: &mut gpui::MutableAppContext) { } #[gpui::test] -fn test_fold(cx: &mut gpui::MutableAppContext) { +fn test_fold_action(cx: &mut gpui::MutableAppContext) { cx.set_global(Settings::test(cx)); let buffer = MultiBuffer::build_simple( &" From 813f722925515bf8899fcf8842b6a7e33c426d88 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Wed, 29 Mar 2023 14:52:50 +0200 Subject: [PATCH 4/8] Increment `input_column` correctly when inside the leading tab --- crates/editor/src/display_map/tab_map.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/crates/editor/src/display_map/tab_map.rs b/crates/editor/src/display_map/tab_map.rs index 50dc691a60eace0e843aae140e7949f3dd998d52..13263d642abbe03d225190a03c06b018c08ff4d9 100644 --- a/crates/editor/src/display_map/tab_map.rs +++ b/crates/editor/src/display_map/tab_map.rs @@ -467,6 +467,7 @@ impl<'a> Iterator for TabChunks<'a> { if self.skip_leading_tab { self.chunk.text = &self.chunk.text[1..]; self.skip_leading_tab = false; + self.input_column += 1; } } else { return None; @@ -500,7 +501,7 @@ impl<'a> Iterator for TabChunks<'a> { self.input_column += 1; self.output_position = next_output_position; return Some(Chunk { - text: &SPACES[0..len as usize], + text: &SPACES[..len as usize], ..self.chunk }); } @@ -512,7 +513,9 @@ impl<'a> Iterator for TabChunks<'a> { } _ => { self.column += 1; - self.input_column += c.len_utf8() as u32; + if !self.skip_leading_tab { + self.input_column += c.len_utf8() as u32; + } self.output_position.column += c.len_utf8() as u32; } } @@ -659,11 +662,11 @@ mod tests { .collect::(); let expected_summary = TextSummary::from(expected_text.as_str()); assert_eq!( - expected_text, tabs_snapshot .chunks(start..end, false, None) .map(|c| c.text) .collect::(), + expected_text, "chunks({:?}..{:?})", start, end From 719d0f0abf59003fea7d6aaa045a53b5297291e3 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Wed, 29 Mar 2023 14:53:28 +0200 Subject: [PATCH 5/8] Rename `skip_leading_tab` to `inside_leading_tab` --- crates/editor/src/display_map/tab_map.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/editor/src/display_map/tab_map.rs b/crates/editor/src/display_map/tab_map.rs index 13263d642abbe03d225190a03c06b018c08ff4d9..85f7acb2dd3510522db54ab46771d1925d191936 100644 --- a/crates/editor/src/display_map/tab_map.rs +++ b/crates/editor/src/display_map/tab_map.rs @@ -227,7 +227,7 @@ impl TabSnapshot { text: &SPACES[0..(to_next_stop as usize)], ..Default::default() }, - skip_leading_tab: to_next_stop > 0, + inside_leading_tab: to_next_stop > 0, } } @@ -454,7 +454,7 @@ pub struct TabChunks<'a> { input_column: u32, max_output_position: Point, tab_size: NonZeroU32, - skip_leading_tab: bool, + inside_leading_tab: bool, } impl<'a> Iterator for TabChunks<'a> { @@ -464,9 +464,9 @@ impl<'a> Iterator for TabChunks<'a> { if self.chunk.text.is_empty() { if let Some(chunk) = self.suggestion_chunks.next() { self.chunk = chunk; - if self.skip_leading_tab { + if self.inside_leading_tab { self.chunk.text = &self.chunk.text[1..]; - self.skip_leading_tab = false; + self.inside_leading_tab = false; self.input_column += 1; } } else { @@ -513,7 +513,7 @@ impl<'a> Iterator for TabChunks<'a> { } _ => { self.column += 1; - if !self.skip_leading_tab { + if !self.inside_leading_tab { self.input_column += c.len_utf8() as u32; } self.output_position.column += c.len_utf8() as u32; From b86f8188d13cbd333ea5e44e19cc70504eba4daf Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Wed, 29 Mar 2023 16:31:12 +0200 Subject: [PATCH 6/8] Expand edit to end of the line when old/new row exceeds max expansion --- crates/editor/src/display_map/tab_map.rs | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/crates/editor/src/display_map/tab_map.rs b/crates/editor/src/display_map/tab_map.rs index 85f7acb2dd3510522db54ab46771d1925d191936..7dd4d763e19afb3aa0c4ac3536531a6d3d0cfcf1 100644 --- a/crates/editor/src/display_map/tab_map.rs +++ b/crates/editor/src/display_map/tab_map.rs @@ -52,6 +52,28 @@ impl TabMap { if old_snapshot.tab_size == new_snapshot.tab_size { for suggestion_edit in &mut suggestion_edits { + let old_end = old_snapshot + .suggestion_snapshot + .to_point(suggestion_edit.old.end); + let old_end_row_len = old_snapshot.suggestion_snapshot.line_len(old_end.row()); + let old_end_row_exceeds_max_expansion = + old_end_row_len > old_snapshot.max_expansion_column; + let new_end = new_snapshot + .suggestion_snapshot + .to_point(suggestion_edit.new.end); + let new_end_row_len = new_snapshot.suggestion_snapshot.line_len(new_end.row()); + let new_end_row_exceeds_max_expansion = + new_end_row_len > new_snapshot.max_expansion_column; + if old_end_row_exceeds_max_expansion || new_end_row_exceeds_max_expansion { + suggestion_edit.old.end = old_snapshot + .suggestion_snapshot + .to_offset(SuggestionPoint::new(old_end.row(), old_end_row_len)); + suggestion_edit.new.end = new_snapshot + .suggestion_snapshot + .to_offset(SuggestionPoint::new(new_end.row(), new_end_row_len)); + continue; + } + let mut delta = 0; for chunk in old_snapshot.suggestion_snapshot.chunks( suggestion_edit.old.end..old_max_offset, From 49447128a9e0b2943890e5cf8cc5cac6ff19e709 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Wed, 29 Mar 2023 21:40:37 +0200 Subject: [PATCH 7/8] Make edits smaller when tab expansion changes on a line --- crates/editor/src/display_map/tab_map.rs | 64 +++++++++++++++--------- 1 file changed, 39 insertions(+), 25 deletions(-) diff --git a/crates/editor/src/display_map/tab_map.rs b/crates/editor/src/display_map/tab_map.rs index 7dd4d763e19afb3aa0c4ac3536531a6d3d0cfcf1..3b24579ae6bf7593b3f6e98134fdac848c539704 100644 --- a/crates/editor/src/display_map/tab_map.rs +++ b/crates/editor/src/display_map/tab_map.rs @@ -52,45 +52,59 @@ impl TabMap { if old_snapshot.tab_size == new_snapshot.tab_size { for suggestion_edit in &mut suggestion_edits { - let old_end = old_snapshot + let mut old_column = old_snapshot .suggestion_snapshot - .to_point(suggestion_edit.old.end); - let old_end_row_len = old_snapshot.suggestion_snapshot.line_len(old_end.row()); - let old_end_row_exceeds_max_expansion = - old_end_row_len > old_snapshot.max_expansion_column; - let new_end = new_snapshot + .to_point(suggestion_edit.old.end) + .column(); + let mut new_column = new_snapshot .suggestion_snapshot - .to_point(suggestion_edit.new.end); - let new_end_row_len = new_snapshot.suggestion_snapshot.line_len(new_end.row()); - let new_end_row_exceeds_max_expansion = - new_end_row_len > new_snapshot.max_expansion_column; - if old_end_row_exceeds_max_expansion || new_end_row_exceeds_max_expansion { - suggestion_edit.old.end = old_snapshot - .suggestion_snapshot - .to_offset(SuggestionPoint::new(old_end.row(), old_end_row_len)); - suggestion_edit.new.end = new_snapshot - .suggestion_snapshot - .to_offset(SuggestionPoint::new(new_end.row(), new_end_row_len)); - continue; - } + .to_point(suggestion_edit.new.end) + .column(); let mut delta = 0; - for chunk in old_snapshot.suggestion_snapshot.chunks( + let mut first_tab_ix = None; + let mut last_tab_ix_with_changed_expansion = None; + 'outer: for chunk in old_snapshot.suggestion_snapshot.chunks( suggestion_edit.old.end..old_max_offset, false, None, ) { let patterns: &[_] = &['\t', '\n']; - if let Some(ix) = chunk.text.find(patterns) { - if &chunk.text[ix..ix + 1] == "\t" { - suggestion_edit.old.end.0 += delta + ix + 1; - suggestion_edit.new.end.0 += delta + ix + 1; + for (ix, mat) in chunk.text.match_indices(patterns) { + match mat { + "\t" => { + if first_tab_ix.is_none() { + first_tab_ix = Some(delta + ix); + } + + let old_column = old_column + ix as u32; + let new_column = new_column + ix as u32; + let was_expanded = old_column < old_snapshot.max_expansion_column; + let is_expanded = new_column < new_snapshot.max_expansion_column; + if was_expanded != is_expanded { + last_tab_ix_with_changed_expansion = Some(delta + ix); + } else if !was_expanded && !is_expanded { + break 'outer; + } + } + "\n" => break 'outer, + _ => unreachable!(), } + } + delta += chunk.text.len(); + old_column += chunk.text.len() as u32; + new_column += chunk.text.len() as u32; + if old_column >= old_snapshot.max_expansion_column + && new_column >= new_snapshot.max_expansion_column + { break; } + } - delta += chunk.text.len(); + if let Some(tab_ix) = last_tab_ix_with_changed_expansion.or(first_tab_ix) { + suggestion_edit.old.end.0 += tab_ix + 1; + suggestion_edit.new.end.0 += tab_ix + 1; } } From 0c07a373a8db79167c2b563950726eb552864bc7 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Wed, 29 Mar 2023 14:42:17 -0700 Subject: [PATCH 8/8] :art: --- crates/editor/src/display_map/tab_map.rs | 42 +++++++++++++----------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/crates/editor/src/display_map/tab_map.rs b/crates/editor/src/display_map/tab_map.rs index 3b24579ae6bf7593b3f6e98134fdac848c539704..f5776270a0ff343b19558da2611256d715b41a5f 100644 --- a/crates/editor/src/display_map/tab_map.rs +++ b/crates/editor/src/display_map/tab_map.rs @@ -51,38 +51,41 @@ impl TabMap { let mut tab_edits = Vec::with_capacity(suggestion_edits.len()); if old_snapshot.tab_size == new_snapshot.tab_size { + // Expand each edit to include the next tab on the same line as the edit, + // and any subsequent tabs on that line that moved across the tab expansion + // boundary. for suggestion_edit in &mut suggestion_edits { - let mut old_column = old_snapshot + let old_end_column = old_snapshot .suggestion_snapshot .to_point(suggestion_edit.old.end) .column(); - let mut new_column = new_snapshot + let new_end_column = new_snapshot .suggestion_snapshot .to_point(suggestion_edit.new.end) .column(); - let mut delta = 0; - let mut first_tab_ix = None; - let mut last_tab_ix_with_changed_expansion = None; + let mut offset_from_edit = 0; + let mut first_tab_offset = None; + let mut last_tab_with_changed_expansion_offset = None; 'outer: for chunk in old_snapshot.suggestion_snapshot.chunks( suggestion_edit.old.end..old_max_offset, false, None, ) { - let patterns: &[_] = &['\t', '\n']; - for (ix, mat) in chunk.text.match_indices(patterns) { + for (ix, mat) in chunk.text.match_indices(&['\t', '\n']) { + let offset_from_edit = offset_from_edit + (ix as u32); match mat { "\t" => { - if first_tab_ix.is_none() { - first_tab_ix = Some(delta + ix); + if first_tab_offset.is_none() { + first_tab_offset = Some(offset_from_edit); } - let old_column = old_column + ix as u32; - let new_column = new_column + ix as u32; + let old_column = old_end_column + offset_from_edit; + let new_column = new_end_column + offset_from_edit; let was_expanded = old_column < old_snapshot.max_expansion_column; let is_expanded = new_column < new_snapshot.max_expansion_column; if was_expanded != is_expanded { - last_tab_ix_with_changed_expansion = Some(delta + ix); + last_tab_with_changed_expansion_offset = Some(offset_from_edit); } else if !was_expanded && !is_expanded { break 'outer; } @@ -92,22 +95,21 @@ impl TabMap { } } - delta += chunk.text.len(); - old_column += chunk.text.len() as u32; - new_column += chunk.text.len() as u32; - if old_column >= old_snapshot.max_expansion_column - && new_column >= new_snapshot.max_expansion_column + offset_from_edit += chunk.text.len() as u32; + if old_end_column + offset_from_edit >= old_snapshot.max_expansion_column + && new_end_column | offset_from_edit >= new_snapshot.max_expansion_column { break; } } - if let Some(tab_ix) = last_tab_ix_with_changed_expansion.or(first_tab_ix) { - suggestion_edit.old.end.0 += tab_ix + 1; - suggestion_edit.new.end.0 += tab_ix + 1; + if let Some(offset) = last_tab_with_changed_expansion_offset.or(first_tab_offset) { + suggestion_edit.old.end.0 += offset as usize + 1; + suggestion_edit.new.end.0 += offset as usize + 1; } } + // Combine any edits that overlap due to the expansion. let mut ix = 1; while ix < suggestion_edits.len() { let (prev_edits, next_edits) = suggestion_edits.split_at_mut(ix);