Merge pull request #215 from kasecato/#213/regression

Fix regression in recent files
kasecato · Mar 18, 2021 · 38018d1 · 38018d1
2 parents 7bcfda1 + 289663d
commit 38018d1
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 18 deletions.
diff --git a/package.json b/package.json
@@ -59,15 +59,12 @@
     ],
     "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",
@@ -606,14 +603,14 @@
             {
                 "key": "ctrl+e",
                 "mac": "cmd+e",
-                "command": "workbench.action.quickOpenNavigateNext",
+                "command": "workbench.action.openPreviousEditorFromHistory",
                 "when": "inQuickOpen"
             },
             {
                 "key": "ctrl+e",
                 "mac": "cmd+e",
                 "when": "!inQuickOpen",
-                "command": "workbench.action.quickOpen",
+                "command": "workbench.action.openRecent",
                 "intellij": "Recent files popup"
             },
             {

diff --git a/resource/ActionIdCommandMapping.json b/resource/ActionIdCommandMapping.json
@@ -405,7 +405,11 @@
     },
     {
         "intellij": "RecentFiles",
-        "vscode": "workbench.action.quickOpen"
+        "vscode": "workbench.action.openRecent"
+    },
+    {
+        "intellij": "RecentFiles",
+        "vscode": "workbench.action.openPreviousEditorFromHistory"
     },
     {
         "intellij": "ReformatCode",

diff --git a/resource/default/Linux/VSCode.json b/resource/default/Linux/VSCode.json
@@ -286,7 +286,13 @@
     },
     {
         "key": "ctrl+e",
-        "command": "workbench.action.quickOpen"
+        "command": "workbench.action.openPreviousEditorFromHistory",
+        "when": "inQuickOpen"
+    },
+    {
+        "key": "ctrl+e",
+        "command": "workbench.action.openRecent",
+        "when": "!inQuickOpen"
     },
     {
         "key": "ctrl+p",

diff --git a/resource/default/Mac/VSCode.json b/resource/default/Mac/VSCode.json
@@ -343,12 +343,13 @@
     },
     {
         "key": "",
-        "command": "workbench.action.quickOpenNavigateNext",
+        "command": "workbench.action.openPreviousEditorFromHistory",
         "when": "inQuickOpen"
     },
     {
         "key": "cmd+e",
-        "command": "workbench.action.quickOpen"
+        "command": "workbench.action.openRecent",
+        "when": "!inQuickOpen"
     },
     {
         "key": "ctrl+-",

diff --git a/resource/default/Windows/VSCode.json b/resource/default/Windows/VSCode.json
@@ -294,7 +294,13 @@
       },
       {
         "key": "ctrl+e",
-        "command": "workbench.action.quickOpen"
+        "command": "workbench.action.openPreviousEditorFromHistory",
+        "when": "inQuickOpen"
+      },
+      {
+        "key": "ctrl+e",
+        "command": "workbench.action.openRecent",
+        "when": "!inQuickOpen"
       },
       {
         "key": "ctrl+p",

diff --git a/src/package-with-comment.json b/src/package-with-comment.json
@@ -948,14 +948,14 @@
             {
                 "key": "ctrl+e",
                 "mac": "cmd+e",
-                "command": "workbench.action.quickOpenNavigateNext",
+                "command": "workbench.action.openPreviousEditorFromHistory",
                 "when": "inQuickOpen"
             },
             {
                 "key": "ctrl+e",
                 "mac": "cmd+e",
                 "when": "!inQuickOpen",
-                "command": "workbench.action.quickOpen",
+                "command": "workbench.action.openRecent",
                 "intellij": "Recent files popup"
             },
             {