Merge pull request #339 from kasecato/#335/copilot

Fixed #335 that shortcut keys conflict with copilot
kasecato · Apr 1, 2024 · 5b159f0 · 5b159f0
2 parents 8eb266f + bbca0b3
commit 5b159f0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -386,14 +386,14 @@
                 "key": "ctrl+[ArrowRight]",
                 "mac": "alt+[ArrowRight]",
                 "command": "cursorWordRight",
-                "when": "editorTextFocus && !config.intellij-idea-keybindings.useCamelHumpsWords",
+                "when": "editorTextFocus && !inlineSuggestionVisible && !config.intellij-idea-keybindings.useCamelHumpsWords",
                 "intellij": "Cursor to word end"
             },
             {
                 "key": "ctrl+[ArrowRight]",
                 "mac": "alt+[ArrowRight]",
                 "command": "cursorWordPartRight",
-                "when": "editorTextFocus && config.intellij-idea-keybindings.useCamelHumpsWords",
+                "when": "editorTextFocus && !inlineSuggestionVisible && config.intellij-idea-keybindings.useCamelHumpsWords",
                 "intellij": "Cursor to hump end"
             },
             {

diff --git a/src/package-with-comment.json b/src/package-with-comment.json
@@ -518,14 +518,14 @@
                 "key": "ctrl+[ArrowRight]",
                 "mac": "alt+[ArrowRight]",
                 "command": "cursorWordRight",
-                "when": "editorTextFocus && !config.intellij-idea-keybindings.useCamelHumpsWords",
+                "when": "editorTextFocus && !inlineSuggestionVisible && !config.intellij-idea-keybindings.useCamelHumpsWords",
                 "intellij": "Cursor to word end"
             },
             {
                 "key": "ctrl+[ArrowRight]",
                 "mac": "alt+[ArrowRight]",
                 "command": "cursorWordPartRight",
-                "when": "editorTextFocus && config.intellij-idea-keybindings.useCamelHumpsWords",
+                "when": "editorTextFocus && !inlineSuggestionVisible && config.intellij-idea-keybindings.useCamelHumpsWords",
                 "intellij": "Cursor to hump end"
             },
             {