Fix keybindings on tab and workbench.action.quickTextSearch (#1916)

whitphx · May 20, 2024 · b10e944 · b10e944
1 parent f3549a4
commit b10e944
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/keybindings.json b/keybindings.json
@@ -392,8 +392,7 @@
     // VSCode's quick search is like Emacs' Occur mode. Quick search is available since VSCode 1.89 (https://code.visualstudio.com/updates/v1_89#_quick-search).
     {
       "key": "meta+s o",
-      "command": "workbench.action.quickTextSearch",
-      "when": "editorFocus"
+      "command": "workbench.action.quickTextSearch"
     },
     // addSelectionToNext/PreviousFindMatch
     {
@@ -984,9 +983,11 @@
       "command": "workbench.action.togglePanel",
       "when": "!terminalFocus"
     },
+    // Assign `ctrl+i` to `tab` with the same condition as the VSCode default keybinding on `tab`.
     {
       "key": "ctrl+i",
-      "command": "tab"
+      "command": "tab",
+      "when": "editorTextFocus && !editorReadonly && !editorTabMovesFocus"
     },
     {
       "keys": ["ctrl+i", "tab"],

diff --git a/package.json b/package.json
@@ -3062,13 +3062,13 @@
       {
         "key": "alt+s o",
         "command": "workbench.action.quickTextSearch",
-        "when": "editorFocus && !config.emacs-mcx.useMetaPrefixMacCmd"
+        "when": "!config.emacs-mcx.useMetaPrefixMacCmd"
       },
       {
         "key": "alt+s o",
         "mac": "cmd+s o",
         "command": "workbench.action.quickTextSearch",
-        "when": "editorFocus && config.emacs-mcx.useMetaPrefixMacCmd"
+        "when": "config.emacs-mcx.useMetaPrefixMacCmd"
       },
       {
         "key": "ctrl+alt+n",
@@ -5688,7 +5688,8 @@
       },
       {
         "key": "ctrl+i",
-        "command": "tab"
+        "command": "tab",
+        "when": "editorTextFocus && !editorReadonly && !editorTabMovesFocus"
       },
       {
         "key": "ctrl+i",