Fixed #211 Ctrl+F12 keybinding is not working

kasecato · Mar 5, 2021 · da207fb · da207fb
1 parent 80682fc
commit da207fb
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 44 deletions.
diff --git a/package.json b/package.json
@@ -59,12 +59,15 @@
     ],
     "main": "./out/extension",
     "contributes": {
-        "commands": [{
-            "command": "intellij.importKeyMapsSchema",
-            "title": "Import IntelliJ Keybindngs (XML)",
-            "category": "IntelliJ Keybindings"
-        }],
-        "keybindings": [{
+        "commands": [
+            {
+                "command": "intellij.importKeyMapsSchema",
+                "title": "Import IntelliJ Keybindngs (XML)",
+                "category": "IntelliJ Keybindings"
+            }
+        ],
+        "keybindings": [
+            {
                 "key": "enter",
                 "mac": "enter",
                 "command": "acceptSelectedSuggestion",
@@ -645,7 +648,6 @@
                 "key": "ctrl+b",
                 "mac": "cmd+b",
                 "command": "editor.action.goToDeclaration",
-                "when": "editorHasDefinitionProvider && editorTextFocus",
                 "intellij": "Go to declaration"
             },
             {
@@ -659,21 +661,18 @@
                 "key": "ctrl+shift+i",
                 "mac": "alt+space",
                 "command": "editor.action.previewDeclaration",
-                "when": "editorHasDefinitionProvider && editorTextFocus && !inReferenceSearchEditor",
                 "intellij": "Open quick definition lookup"
             },
             {
                 "key": "",
                 "mac": "cmd+y",
                 "command": "editor.action.previewDeclaration",
-                "when": "editorHasDefinitionProvider && editorTextFocus && !inReferenceSearchEditor",
                 "intellij": "Open quick definition lookup"
             },
             {
                 "key": "ctrl+shift+b",
                 "mac": "ctrl+shift+b",
                 "command": "editor.action.goToTypeDefinition",
-                "when": "editorHasDefinitionProvider && editorTextFocus",
                 "intellij": "Go to type declaration",
                 "todo": "not working"
             },
@@ -687,7 +686,6 @@
                 "key": "ctrl+f12",
                 "mac": "cmd+f12",
                 "command": "workbench.action.gotoSymbol",
-                "when": "editorHasDefinitionProvider && editorTextFocus",
                 "intellij": "File structure popup"
             },
             {
@@ -713,14 +711,12 @@
                 "key": "f4",
                 "mac": "f4",
                 "command": "editor.action.goToDeclaration",
-                "when": "editorHasDefinitionProvider && editorTextFocus",
                 "intellij": "Edit source"
             },
             {
                 "key": "ctrl+enter",
                 "mac": "cmd+down",
                 "command": "editor.action.goToDeclaration",
-                "when": "editorHasDefinitionProvider && editorTextFocus",
                 "intellij": "View source"
             },
             {

diff --git a/resource/default/Linux/VSCode.json b/resource/default/Linux/VSCode.json
@@ -343,8 +343,7 @@
     },
     {
         "key": "",
-        "command": "editor.action.goToDeclaration",
-        "when": "editorHasDefinitionProvider && editorTextFocus"
+        "command": "editor.action.goToDeclaration"
     },
     {
         "key": "ctrl+f12",
@@ -353,22 +352,19 @@
     },
     {
         "key": "",
-        "command": "editor.action.previewDeclaration",
-        "when": "editorHasDefinitionProvider && editorTextFocus && !inReferenceSearchEditor"
+        "command": "editor.action.previewDeclaration"
     },
     {
         "key": "",
-        "command": "editor.action.goToTypeDefinition",
-        "when": "editorHasDefinitionProvider && editorTextFocus"
+        "command": "editor.action.goToTypeDefinition"
     },
     {
         "key": "",
         "command": "outline.focus"
     },
     {
         "key": "ctrl+shift+o",
-        "command": "workbench.action.gotoSymbol",
-        "when": "editorHasDefinitionProvider && editorTextFocus"
+        "command": "workbench.action.gotoSymbol"
     },
     {
         "key": "alt+f8",

diff --git a/resource/default/Mac/VSCode.json b/resource/default/Mac/VSCode.json
@@ -363,8 +363,7 @@
     },
     {
         "key": "",
-        "command": "editor.action.goToDeclaration",
-        "when": "editorHasDefinitionProvider && editorTextFocus"
+        "command": "editor.action.goToDeclaration"
     },
     {
         "key": "cmd+f12",
@@ -373,22 +372,19 @@
     },
     {
         "key": "",
-        "command": "editor.action.previewDeclaration",
-        "when": "editorHasDefinitionProvider && editorTextFocus && !inReferenceSearchEditor"
+        "command": "editor.action.previewDeclaration"
     },
     {
         "key": "",
-        "command": "editor.action.goToTypeDefinition",
-        "when": "editorHasDefinitionProvider && editorTextFocus"
+        "command": "editor.action.goToTypeDefinition"
     },
     {
         "key": "",
         "command": "outline.focus"
     },
     {
         "key": "shift+cmd+o",
-        "command": "workbench.action.gotoSymbol",
-        "when": "editorHasDefinitionProvider && editorTextFocus"
+        "command": "workbench.action.gotoSymbol"
     },
     {
         "key": "alt+f8",

diff --git a/resource/default/Windows/VSCode.json b/resource/default/Windows/VSCode.json
@@ -351,8 +351,7 @@
       },
       {
         "key": "",
-        "command": "editor.action.goToDeclaration",
-        "when": "editorHasDefinitionProvider && editorTextFocus"
+        "command": "editor.action.goToDeclaration"
       },
       {
         "key": "ctrl+f12",
@@ -361,22 +360,19 @@
       },
       {
         "key": "",
-        "command": "editor.action.previewDeclaration",
-        "when": "editorHasDefinitionProvider && editorTextFocus && !inReferenceSearchEditor"
+        "command": "editor.action.previewDeclaration"
       },
       {
         "key": "",
-        "command": "editor.action.goToTypeDefinition",
-        "when": "editorHasDefinitionProvider && editorTextFocus"
+        "command": "editor.action.goToTypeDefinition"
       },
       {
         "key": "",
         "command": "outline.focus"
       },
       {
         "key": "ctrl+shift+o",
-        "command": "workbench.action.gotoSymbol",
-        "when": "editorHasDefinitionProvider && editorTextFocus"
+        "command": "workbench.action.gotoSymbol"
       },
       {
         "key": "alt+f8",

diff --git a/src/package-with-comment.json b/src/package-with-comment.json
@@ -1000,7 +1000,6 @@
                 "key": "ctrl+b",
                 "mac": "cmd+b",
                 "command": "editor.action.goToDeclaration",
-                "when": "editorHasDefinitionProvider && editorTextFocus",
                 "intellij": "Go to declaration"
             },
             {
@@ -1014,21 +1013,18 @@
                 "key": "ctrl+shift+i",
                 "mac": "alt+space",
                 "command": "editor.action.previewDeclaration",
-                "when": "editorHasDefinitionProvider && editorTextFocus && !inReferenceSearchEditor",
                 "intellij": "Open quick definition lookup"
             },
             {
                 "key": "",
                 "mac": "cmd+y",
                 "command": "editor.action.previewDeclaration",
-                "when": "editorHasDefinitionProvider && editorTextFocus && !inReferenceSearchEditor",
                 "intellij": "Open quick definition lookup"
             },
             {
                 "key": "ctrl+shift+b",
                 "mac": "ctrl+shift+b",
                 "command": "editor.action.goToTypeDefinition",
-                "when": "editorHasDefinitionProvider && editorTextFocus",
                 "intellij": "Go to type declaration",
                 "todo": "not working"
             },
@@ -1092,7 +1088,6 @@
                 "key": "ctrl+f12",
                 "mac": "cmd+f12",
                 "command": "workbench.action.gotoSymbol",
-                "when": "editorHasDefinitionProvider && editorTextFocus",
                 "intellij": "File structure popup"
             },
             /*
@@ -1148,14 +1143,12 @@
                 "key": "f4",
                 "mac": "f4",
                 "command": "editor.action.goToDeclaration",
-                "when": "editorHasDefinitionProvider && editorTextFocus",
                 "intellij": "Edit source"
             },
             {
                 "key": "ctrl+enter",
                 "mac": "cmd+down",
                 "command": "editor.action.goToDeclaration",
-                "when": "editorHasDefinitionProvider && editorTextFocus",
                 "intellij": "View source"
             },
             {