diff --git a/crates/editor/src/lib.rs b/crates/editor/src/lib.rs index 0404c72508..453747e83f 100644 --- a/crates/editor/src/lib.rs +++ b/crates/editor/src/lib.rs @@ -88,7 +88,7 @@ action!(SelectLine); action!(SplitSelectionIntoLines); action!(AddSelectionAbove); action!(AddSelectionBelow); -action!(SelectNext); +action!(SelectNext, bool); action!(ToggleComments); action!(SelectLargerSyntaxNode); action!(SelectSmallerSyntaxNode); @@ -193,7 +193,8 @@ pub fn init(cx: &mut MutableAppContext, entry_openers: &mut Vec) { + pub fn select_next(&mut self, action: &SelectNext, cx: &mut ViewContext) { + let replace_newest = action.0; let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx)); let buffer = &display_map.buffer_snapshot; let mut selections = self.selections::(cx).collect::>(); @@ -2552,6 +2554,13 @@ impl Editor { } if let Some(next_selected_range) = next_selected_range { + if replace_newest { + if let Some(newest_id) = + selections.iter().max_by_key(|s| s.id).map(|s| s.id) + { + selections.retain(|s| s.id != newest_id); + } + } selections.push(Selection { id: post_inc(&mut self.next_selection_id), start: next_selected_range.start, @@ -2598,7 +2607,7 @@ impl Editor { wordwise: false, done: false, }); - self.select_next(&SelectNext, cx); + self.select_next(action, cx); } } }