Merge pull request #224 from aioutecism/feature/mimic-vim-search-beha…

…vior-config Add `amVim.mimicVimSearchBehavior` configuration
aioutecism · Jul 8, 2018 · a45a5c3 · a45a5c3
2 parents e95995b + b2ec711
commit a45a5c3
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -48,6 +48,12 @@ Set to `true` to start in Insert mode when opening files.
 
 Set to `true` to will make line numbers relative when not in Insert mode.
 
+#### `amVim.mimicVimSearchBehavior`
+
+`Boolean`, Default: `true`
+
+Set to `false` to keep VSCode's keybinding when searching.
+
 #### `amVim.vimStyleNavigationInListView`
 
 `Boolean`, Default: `true`

diff --git a/package.json b/package.json
@@ -55,6 +55,11 @@
                     "default": false,
                     "description": "Set to `true` to will make line numbers relative when not in Insert mode."
                 },
+                "amVim.mimicVimSearchBehavior": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "Set to `false` to keep VSCode's keybinding when searching."
+                },
                 "amVim.vimStyleNavigationInListView": {
                     "type": "boolean",
                     "default": true,
@@ -80,7 +85,7 @@
             { "command": "amVim.ctrl+f", "key": "ctrl+f", "when": "editorTextFocus && amVim.configuration.shouldBindCtrlCommands && amVim.mode != 'INSERT'" },
             { "command": "amVim.ctrl+b", "key": "ctrl+b", "when": "editorTextFocus && amVim.configuration.shouldBindCtrlCommands && amVim.mode != 'INSERT'" },
 
-            { "key": "enter", "command": "amVim.executeNativeFind", "when": "editorFocus && findInputFocussed && findWidgetVisible" },
+            { "key": "enter", "command": "amVim.executeNativeFind", "when": "amVim.configuration.shouldMimicVimSearchBehavior && editorFocus && findInputFocussed && findWidgetVisible" },
 
             { "key": "j", "command": "list.focusDown", "when": "amVim.configuration.shouldUseVimStyleNavigationInListView && listFocus && !inputFocus" },
             { "key": "k", "command": "list.focusUp", "when": "amVim.configuration.shouldUseVimStyleNavigationInListView && listFocus && !inputFocus" },

diff --git a/src/Configuration.ts b/src/Configuration.ts
@@ -46,9 +46,17 @@ export class Configuration {
 
     private static updateKeybindingContexts(): void {
         commands.executeCommand('setContext',
-            'amVim.configuration.shouldBindCtrlCommands', this.getExtensionSetting<boolean>('bindCtrlCommands', true));
+            'amVim.configuration.shouldBindCtrlCommands',
+            this.getExtensionSetting<boolean>('bindCtrlCommands', true)
+        );
+        commands.executeCommand('setContext',
+            'amVim.configuration.shouldMimicVimSearchBehavior',
+            this.getExtensionSetting<boolean>('mimicVimSearchBehavior', true)
+        );
         commands.executeCommand('setContext',
-            'amVim.configuration.shouldUseVimStyleNavigationInListView', this.getExtensionSetting<boolean>('vimStyleNavigationInListView', true));
+            'amVim.configuration.shouldUseVimStyleNavigationInListView',
+            this.getExtensionSetting<boolean>('vimStyleNavigationInListView', true)
+        );
     }
 
     static getExtensionSetting<T>(section: string, defaultValue: T): T {