Revert "Keep selection in SwitchToHelixNormalMode (#41583)" (#42892)

Closes #ISSUE

Release Notes:

- Fixes vim "go to definition" making a selection

Author: ConradIrwin

assets/keymaps/vim.json

@@ -421,12 +421,6 @@
       "ctrl-[": "editor::Cancel"
     }
   },
-  {
-    "context": "vim_mode == helix_select && !menu",
-    "bindings": {
-      "escape": "vim::SwitchToHelixNormalMode"
-    }
-  },
   {
     "context": "(vim_mode == helix_normal || vim_mode == helix_select) && !menu",
     "bindings": {

crates/agent_ui/src/text_thread_editor.rs

@@ -2626,12 +2626,11 @@ impl SearchableItem for TextThreadEditor {
         &mut self,
         index: usize,
         matches: &[Self::Match],
-        collapse: bool,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
         self.editor.update(cx, |editor, cx| {
-            editor.activate_match(index, matches, collapse, window, cx);
+            editor.activate_match(index, matches, window, cx);
         });
     }
 

crates/debugger_tools/src/dap_log.rs

@@ -1029,13 +1029,11 @@ impl SearchableItem for DapLogView {
         &mut self,
         index: usize,
         matches: &[Self::Match],
-        collapse: bool,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        self.editor.update(cx, |e, cx| {
-            e.activate_match(index, matches, collapse, window, cx)
-        })
+        self.editor
+            .update(cx, |e, cx| e.activate_match(index, matches, window, cx))
     }
 
     fn select_matches(

crates/editor/src/editor.rs

@@ -1099,6 +1099,7 @@ pub struct Editor {
     searchable: bool,
     cursor_shape: CursorShape,
     current_line_highlight: Option<CurrentLineHighlight>,
+    collapse_matches: bool,
     autoindent_mode: Option<AutoindentMode>,
     workspace: Option<(WeakEntity<Workspace>, Option<WorkspaceId>)>,
     input_enabled: bool,
@@ -2211,7 +2212,7 @@ impl Editor {
                 .unwrap_or_default(),
             current_line_highlight: None,
             autoindent_mode: Some(AutoindentMode::EachLine),
-
+            collapse_matches: false,
             workspace: None,
             input_enabled: !is_minimap,
             use_modal_editing: full_mode,
@@ -2384,7 +2385,10 @@ impl Editor {
                     }
                 }
                 EditorEvent::Edited { .. } => {
-                    if vim_flavor(cx).is_none() {
+                    let vim_mode = vim_mode_setting::VimModeSetting::try_get(cx)
+                        .map(|vim_mode| vim_mode.0)
+                        .unwrap_or(false);
+                    if !vim_mode {
                         let display_map = editor.display_snapshot(cx);
                         let selections = editor.selections.all_adjusted_display(&display_map);
                         let pop_state = editor
@@ -3013,12 +3017,12 @@ impl Editor {
         self.current_line_highlight = current_line_highlight;
     }
 
-    pub fn range_for_match<T: std::marker::Copy>(
-        &self,
-        range: &Range<T>,
-        collapse: bool,
-    ) -> Range<T> {
-        if collapse {
+    pub fn set_collapse_matches(&mut self, collapse_matches: bool) {
+        self.collapse_matches = collapse_matches;
+    }
+
+    pub fn range_for_match<T: std::marker::Copy>(&self, range: &Range<T>) -> Range<T> {
+        if self.collapse_matches {
             return range.start..range.start;
         }
         range.clone()
@@ -16921,7 +16925,7 @@ impl Editor {
 
                 editor.update_in(cx, |editor, window, cx| {
                     let range = target_range.to_point(target_buffer.read(cx));
-                    let range = editor.range_for_match(&range, false);
+                    let range = editor.range_for_match(&range);
                     let range = collapse_multiline_range(range);
 
                     if !split
@@ -21761,7 +21765,9 @@ impl Editor {
             .and_then(|e| e.to_str())
             .map(|a| a.to_string()));
 
-        let vim_mode = vim_flavor(cx).is_some();
+        let vim_mode = vim_mode_setting::VimModeSetting::try_get(cx)
+            .map(|vim_mode| vim_mode.0)
+            .unwrap_or(false);
 
         let edit_predictions_provider = all_language_settings(file, cx).edit_predictions.provider;
         let copilot_enabled = edit_predictions_provider
@@ -22396,28 +22402,6 @@ fn edit_for_markdown_paste<'a>(
     (range, new_text)
 }
 
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum VimFlavor {
-    Vim,
-    Helix,
-}
-
-pub fn vim_flavor(cx: &App) -> Option<VimFlavor> {
-    if vim_mode_setting::HelixModeSetting::try_get(cx)
-        .map(|helix_mode| helix_mode.0)
-        .unwrap_or(false)
-    {
-        Some(VimFlavor::Helix)
-    } else if vim_mode_setting::VimModeSetting::try_get(cx)
-        .map(|vim_mode| vim_mode.0)
-        .unwrap_or(false)
-    {
-        Some(VimFlavor::Vim)
-    } else {
-        None // neither vim nor helix mode
-    }
-}
-
 fn process_completion_for_edit(
     completion: &Completion,
     intent: CompletionIntent,

crates/editor/src/items.rs

@@ -1586,12 +1586,11 @@ impl SearchableItem for Editor {
         &mut self,
         index: usize,
         matches: &[Range<Anchor>],
-        collapse: bool,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
         self.unfold_ranges(&[matches[index].clone()], false, true, cx);
-        let range = self.range_for_match(&matches[index], collapse);
+        let range = self.range_for_match(&matches[index]);
         let autoscroll = if EditorSettings::get_global(cx).search.center_on_match {
             Autoscroll::center()
         } else {

crates/language_tools/src/lsp_log_view.rs

@@ -812,13 +812,11 @@ impl SearchableItem for LspLogView {
         &mut self,
         index: usize,
         matches: &[Self::Match],
-        collapse: bool,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        self.editor.update(cx, |e, cx| {
-            e.activate_match(index, matches, collapse, window, cx)
-        })
+        self.editor
+            .update(cx, |e, cx| e.activate_match(index, matches, window, cx))
     }
 
     fn select_matches(

crates/search/src/buffer_search.rs

@@ -10,9 +10,8 @@ use any_vec::AnyVec;
 use anyhow::Context as _;
 use collections::HashMap;
 use editor::{
-    DisplayPoint, Editor, EditorSettings, VimFlavor,
+    DisplayPoint, Editor, EditorSettings,
     actions::{Backtab, Tab},
-    vim_flavor,
 };
 use futures::channel::oneshot;
 use gpui::{
@@ -828,8 +827,7 @@ impl BufferSearchBar {
                 .searchable_items_with_matches
                 .get(&active_searchable_item.downgrade())
         {
-            let collapse = editor::vim_flavor(cx) == Some(VimFlavor::Vim);
-            active_searchable_item.activate_match(match_ix, matches, collapse, window, cx)
+            active_searchable_item.activate_match(match_ix, matches, window, cx)
         }
     }
 
@@ -976,8 +974,7 @@ impl BufferSearchBar {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let collapse = vim_flavor(cx) == Some(VimFlavor::Vim);
-        self.select_match(Direction::Next, 1, collapse, window, cx);
+        self.select_match(Direction::Next, 1, window, cx);
     }
 
     fn select_prev_match(
@@ -986,8 +983,7 @@ impl BufferSearchBar {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let collapse = vim_flavor(cx) == Some(VimFlavor::Vim);
-        self.select_match(Direction::Prev, 1, collapse, window, cx);
+        self.select_match(Direction::Prev, 1, window, cx);
     }
 
     pub fn select_all_matches(
@@ -1012,7 +1008,6 @@ impl BufferSearchBar {
         &mut self,
         direction: Direction,
         count: usize,
-        collapse: bool,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
@@ -1035,7 +1030,7 @@ impl BufferSearchBar {
                 .match_index_for_direction(matches, index, direction, count, window, cx);
 
             searchable_item.update_matches(matches, window, cx);
-            searchable_item.activate_match(new_match_index, matches, collapse, window, cx);
+            searchable_item.activate_match(new_match_index, matches, window, cx);
         }
     }
 
@@ -1049,8 +1044,7 @@ impl BufferSearchBar {
                 return;
             }
             searchable_item.update_matches(matches, window, cx);
-            let collapse = vim_flavor(cx) == Some(VimFlavor::Vim);
-            searchable_item.activate_match(0, matches, collapse, window, cx);
+            searchable_item.activate_match(0, matches, window, cx);
         }
     }
 
@@ -1065,8 +1059,7 @@ impl BufferSearchBar {
             }
             let new_match_index = matches.len() - 1;
             searchable_item.update_matches(matches, window, cx);
-            let collapse = vim_flavor(cx) == Some(VimFlavor::Vim);
-            searchable_item.activate_match(new_match_index, matches, collapse, window, cx);
+            searchable_item.activate_match(new_match_index, matches, window, cx);
         }
     }
 

crates/search/src/project_search.rs

@@ -9,12 +9,11 @@ use anyhow::Context as _;
 use collections::HashMap;
 use editor::{
     Anchor, Editor, EditorEvent, EditorSettings, MAX_TAB_TITLE_LEN, MultiBuffer, PathKey,
-    SelectionEffects, VimFlavor,
+    SelectionEffects,
     actions::{Backtab, SelectAll, Tab},
     items::active_match_index,
     multibuffer_context_lines,
     scroll::Autoscroll,
-    vim_flavor,
 };
 use futures::{StreamExt, stream::FuturesOrdered};
 use gpui::{
@@ -1431,8 +1430,7 @@ impl ProjectSearchView {
 
             let range_to_select = match_ranges[new_index].clone();
             self.results_editor.update(cx, |editor, cx| {
-                let collapse = vim_flavor(cx) == Some(VimFlavor::Vim);
-                let range_to_select = editor.range_for_match(&range_to_select, collapse);
+                let range_to_select = editor.range_for_match(&range_to_select);
                 let autoscroll = if EditorSettings::get_global(cx).search.center_on_match {
                     Autoscroll::center()
                 } else {
@@ -1509,10 +1507,9 @@ impl ProjectSearchView {
             let is_new_search = self.search_id != prev_search_id;
             self.results_editor.update(cx, |editor, cx| {
                 if is_new_search {
-                    let collapse = vim_flavor(cx) == Some(VimFlavor::Vim);
                     let range_to_select = match_ranges
                         .first()
-                        .map(|range| editor.range_for_match(range, collapse));
+                        .map(|range| editor.range_for_match(range));
                     editor.change_selections(Default::default(), window, cx, |s| {
                         s.select_ranges(range_to_select)
                     });

crates/terminal_view/src/terminal_view.rs

@@ -1452,7 +1452,6 @@ impl SearchableItem for TerminalView {
         &mut self,
         index: usize,
         _: &[Self::Match],
-        _collapse: bool,
         _window: &mut Window,
         cx: &mut Context<Self>,
     ) {

crates/vim/src/helix.rs

@@ -450,7 +450,7 @@ impl Vim {
                         prior_selections,
                         prior_operator: self.operator_stack.last().cloned(),
                         prior_mode: self.mode,
-                        is_helix_regex_search: true,
+                        helix_select: true,
                     }
                 });
             }
@@ -1278,24 +1278,6 @@ mod test {
         cx.assert_state("«one ˇ»two", Mode::HelixSelect);
     }
 
-    #[gpui::test]
-    async fn test_exit_visual_mode(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state("ˇone two", Mode::Normal);
-        cx.simulate_keystrokes("v w");
-        cx.assert_state("«one tˇ»wo", Mode::Visual);
-        cx.simulate_keystrokes("escape");
-        cx.assert_state("one ˇtwo", Mode::Normal);
-
-        cx.enable_helix();
-        cx.set_state("ˇone two", Mode::HelixNormal);
-        cx.simulate_keystrokes("v w");
-        cx.assert_state("«one ˇ»two", Mode::HelixSelect);
-        cx.simulate_keystrokes("escape");
-        cx.assert_state("«one ˇ»two", Mode::HelixNormal);
-    }
-
     #[gpui::test]
     async fn test_helix_select_regex(cx: &mut gpui::TestAppContext) {
         let mut cx = VimTestContext::new(cx, true).await;
@@ -1315,47 +1297,9 @@ mod test {
         cx.simulate_keystrokes("enter");
         cx.assert_state("«oneˇ» two «oneˇ»", Mode::HelixNormal);
 
-        // TODO: change "search_in_selection" to not perform any search when in helix select mode with no selection
-        // cx.set_state("ˇstuff one two one", Mode::HelixNormal);
-        // cx.simulate_keystrokes("s o n e enter");
-        // cx.assert_state("ˇstuff one two one", Mode::HelixNormal);
-    }
-
-    #[gpui::test]
-    async fn test_helix_select_next_match(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state("ˇhello two one two one two one", Mode::Visual);
-        cx.simulate_keystrokes("/ o n e");
-        cx.simulate_keystrokes("enter");
-        cx.simulate_keystrokes("n n");
-        cx.assert_state("«hello two one two one two oˇ»ne", Mode::Visual);
-
-        cx.set_state("ˇhello two one two one two one", Mode::Normal);
-        cx.simulate_keystrokes("/ o n e");
-        cx.simulate_keystrokes("enter");
-        cx.simulate_keystrokes("n n");
-        cx.assert_state("hello two one two one two ˇone", Mode::Normal);
-
-        cx.set_state("ˇhello two one two one two one", Mode::Normal);
-        cx.simulate_keystrokes("/ o n e");
-        cx.simulate_keystrokes("enter");
-        cx.simulate_keystrokes("n g n g n");
-        cx.assert_state("hello two one two «one two oneˇ»", Mode::Visual);
-
-        cx.enable_helix();
-
-        cx.set_state("ˇhello two one two one two one", Mode::HelixNormal);
-        cx.simulate_keystrokes("/ o n e");
-        cx.simulate_keystrokes("enter");
-        cx.simulate_keystrokes("n n");
-        cx.assert_state("hello two one two one two «oneˇ»", Mode::HelixNormal);
-
-        cx.set_state("ˇhello two one two one two one", Mode::HelixSelect);
-        cx.simulate_keystrokes("/ o n e");
-        cx.simulate_keystrokes("enter");
-        cx.simulate_keystrokes("n n");
-        cx.assert_state("ˇhello two «oneˇ» two «oneˇ» two «oneˇ»", Mode::HelixSelect);
+        cx.set_state("ˇone two one", Mode::HelixNormal);
+        cx.simulate_keystrokes("s o n e enter");
+        cx.assert_state("ˇone two one", Mode::HelixNormal);
     }
 
     #[gpui::test]