Merge pull request #117 from tshino/update-default-keybinding-2022-06…

…-10-17-02 Update wrappers based on VS Code 1.68.0
tshino · Jun 11, 2022 · 9c12d93 · 9c12d93
2 parents aeb80cb + c62aec5
commit 9c12d93
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 43 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to the Keyboard Macro Bata extension will be documented in t
 - Update
   - Update default keybindings wrappers based on vscode 1.67.1. [#106](https://github.com/tshino/vscode-kb-macro/pull/106)
   - Update default keybindings wrappers based on vscode 1.67.2. [#108](https://github.com/tshino/vscode-kb-macro/pull/108)
+  - Update default keybindings wrappers based on vscode 1.68.0. [#117](https://github.com/tshino/vscode-kb-macro/pull/117)
 - Internal
   - Added summary output for the automated workflow. [#102](https://github.com/tshino/vscode-kb-macro/pull/102)
   - Enabled github-actions version updates with Dependabot.

diff --git a/generator/default-keybindings-linux.json b/generator/default-keybindings-linux.json
@@ -1,4 +1,4 @@
-// Default Keybindings of Visual Studio Code 1.67.2 for Linux
+// Default Keybindings of Visual Studio Code 1.68.0 for Linux
 // Override key bindings by placing them into your key bindings file.
 [
 { "key": "escape escape",         "command": "workbench.action.exitZenMode",
@@ -376,11 +376,11 @@
 { "key": "shift+pageup",          "command": "notebook.cell.cursorPageUpSelect",
                                      "when": "editorTextFocus && inputFocus && notebookEditorFocused" },
 { "key": "meta+enter",            "command": "notebook.cell.execute",
-                                     "when": "notebookCellListFocused && notebookMissingKernelExtension && !notebookCellExecuting && notebookCellType == 'code' || notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelCount > 0" },
+                                     "when": "notebookCellListFocused && notebookMissingKernelExtension && !notebookCellExecuting && notebookCellType == 'code' || notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelCount > 0 || notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelSourceCount > 0" },
 { "key": "alt+enter",             "command": "notebook.cell.executeAndInsertBelow",
-                                     "when": "notebookCellListFocused && notebookCellType == 'markup' || notebookCellListFocused && notebookMissingKernelExtension && !notebookCellExecuting && notebookCellType == 'code' || notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelCount > 0" },
+                                     "when": "notebookCellListFocused && notebookCellType == 'markup' || notebookCellListFocused && notebookMissingKernelExtension && !notebookCellExecuting && notebookCellType == 'code' || notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelCount > 0 || notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelSourceCount > 0" },
 { "key": "shift+enter",           "command": "notebook.cell.executeAndSelectBelow",
-                                     "when": "notebookCellListFocused && notebookCellType == 'markup' || notebookCellListFocused && notebookMissingKernelExtension && !notebookCellExecuting && notebookCellType == 'code' || notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelCount > 0" },
+                                     "when": "notebookCellListFocused && notebookCellType == 'markup' || notebookCellListFocused && notebookMissingKernelExtension && !notebookCellExecuting && notebookCellType == 'code' || notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelCount > 0 || notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelSourceCount > 0" },
 { "key": "ctrl+shift+v",          "command": "notebook.cell.pasteAbove",
                                      "when": "notebookEditorFocused && !inputFocus" },
 { "key": "down",                  "command": "notebook.focusNextEditor",
@@ -538,9 +538,9 @@
 { "key": "ctrl+shift+;",          "command": "breadcrumbs.focus",
                                      "when": "breadcrumbsPossible" },
 { "key": "ctrl+shift+[IntlBackslash]", "command": "breadcrumbs.focusAndSelect",
-                                     "when": "breadcrumbsPossible" },
+                                     "when": "breadcrumbsPossible && breadcrumbsVisible" },
 { "key": "ctrl+shift+.",          "command": "breadcrumbs.focusAndSelect",
-                                     "when": "breadcrumbsPossible" },
+                                     "when": "breadcrumbsPossible && breadcrumbsVisible" },
 { "key": "ctrl+right",            "command": "breadcrumbs.focusNext",
                                      "when": "breadcrumbsActive && breadcrumbsVisible" },
 { "key": "right",                 "command": "breadcrumbs.focusNext",
@@ -612,13 +612,13 @@
 { "key": "shift+alt+f",           "command": "filesExplorer.findInFolder",
                                      "when": "explorerResourceIsFolder && explorerViewletVisible && filesExplorerFocus && !inputFocus" },
 { "key": "alt+down",              "command": "history.showNext",
-                                     "when": "historyNavigationForwardsEnabled && historyNavigationWidget && !suggestWidgetVisible" },
+                                     "when": "historyNavigationForwardsEnabled && historyNavigationWidgetFocus && !suggestWidgetVisible" },
 { "key": "down",                  "command": "history.showNext",
-                                     "when": "historyNavigationForwardsEnabled && historyNavigationWidget && !suggestWidgetVisible" },
+                                     "when": "historyNavigationForwardsEnabled && historyNavigationWidgetFocus && !suggestWidgetVisible" },
 { "key": "alt+up",                "command": "history.showPrevious",
-                                     "when": "historyNavigationBackwardsEnabled && historyNavigationWidget && !suggestWidgetVisible" },
+                                     "when": "historyNavigationBackwardsEnabled && historyNavigationWidgetFocus && !suggestWidgetVisible" },
 { "key": "up",                    "command": "history.showPrevious",
-                                     "when": "historyNavigationBackwardsEnabled && historyNavigationWidget && !suggestWidgetVisible" },
+                                     "when": "historyNavigationBackwardsEnabled && historyNavigationWidgetFocus && !suggestWidgetVisible" },
 { "key": "alt+=",                 "command": "increaseSearchEditorContextLines",
                                      "when": "inSearchEditor" },
 { "key": "down",                  "command": "interactive.history.next",
@@ -1305,7 +1305,7 @@
 { "key": "shift+alt+f12",         "command": "references-view.findReferences",
                                      "when": "editorHasReferenceProvider" },
 { "key": "f11",                   "command": "extension.node-debug.startWithStopOnEntry",
-                                     "when": "!inDebugMode && debugConfigurationType == 'node' || !inDebugMode && debugConfigurationType == 'pwa-extensionHost' || !inDebugMode && debugConfigurationType == 'pwa-node'" },
+                                     "when": "!inDebugMode && activeViewlet == 'workbench.view.debug' && debugConfigurationType == 'node' || !inDebugMode && activeViewlet == 'workbench.view.debug' && debugConfigurationType == 'pwa-extensionHost' || !inDebugMode && activeViewlet == 'workbench.view.debug' && debugConfigurationType == 'pwa-node'" },
 { "key": "ctrl+k ctrl+n",         "command": "git.unstageSelectedRanges",
                                      "when": "isInDiffEditor" },
 { "key": "ctrl+k v",              "command": "markdown.showPreviewToSide",
@@ -1576,6 +1576,7 @@
 // - getContextKeyInfo
 // - git-base.api.getRemoteSources
 // - git._syncAll
+// - git.acceptMerge
 // - git.addRemote
 // - git.api.getRemoteSources
 // - git.api.getRepositories
@@ -1643,6 +1644,9 @@
 // - git.rename
 // - git.renameBranch
 // - git.restoreCommitTemplate
+// - git.revealFileInOS.linux
+// - git.revealFileInOS.mac
+// - git.revealFileInOS.windows
 // - git.revealInExplorer
 // - git.revertChange
 // - git.setLogLevel
@@ -1724,6 +1728,9 @@
 // - merge-conflict.compare
 // - merge-conflict.next
 // - merge-conflict.previous
+// - merge.dev.copyContents
+// - merge.dev.openContents
+// - merge.toggleLayout
 // - noop
 // - notebook.cancelExecution
 // - notebook.cell.cancelExecution
@@ -1937,6 +1944,7 @@
 // - workbench.action.blur
 // - workbench.action.clearCommandHistory
 // - workbench.action.clearEditorHistory
+// - workbench.action.clearLocalePreference
 // - workbench.action.clearRecentFiles
 // - workbench.action.closeActivePinnedEditor
 // - workbench.action.closeAuxiliaryBar
@@ -2276,6 +2284,8 @@
 // - workbench.actions.sync.resolveResource
 // - workbench.actions.sync.turnOffSyncOnMachine
 // - workbench.actions.syncData.reset
+// - workbench.actions.table.workbench.panel.markers.view.viewAsTable
+// - workbench.actions.table.workbench.panel.markers.view.viewAsTree
 // - workbench.actions.treeView.jsBrowserBreakpoints.collapseAll
 // - workbench.actions.treeView.jsBrowserBreakpoints.refresh
 // - workbench.actions.treeView.jsExcludedCallers.collapseAll

diff --git a/generator/default-keybindings-mac.json b/generator/default-keybindings-mac.json
@@ -1,4 +1,4 @@
-// Default Keybindings of Visual Studio Code 1.67.2 for macOS
+// Default Keybindings of Visual Studio Code 1.68.0 for macOS
 // Override key bindings by placing them into your key bindings file.
 [
 { "key": "escape escape",         "command": "workbench.action.exitZenMode",
@@ -447,11 +447,11 @@
 { "key": "shift+pageup",          "command": "notebook.cell.cursorPageUpSelect",
                                      "when": "editorTextFocus && inputFocus && notebookEditorFocused" },
 { "key": "ctrl+enter",            "command": "notebook.cell.execute",
-                                     "when": "notebookCellListFocused && notebookMissingKernelExtension && !notebookCellExecuting && notebookCellType == 'code' || notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelCount > 0" },
+                                     "when": "notebookCellListFocused && notebookMissingKernelExtension && !notebookCellExecuting && notebookCellType == 'code' || notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelCount > 0 || notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelSourceCount > 0" },
 { "key": "alt+enter",             "command": "notebook.cell.executeAndInsertBelow",
-                                     "when": "notebookCellListFocused && notebookCellType == 'markup' || notebookCellListFocused && notebookMissingKernelExtension && !notebookCellExecuting && notebookCellType == 'code' || notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelCount > 0" },
+                                     "when": "notebookCellListFocused && notebookCellType == 'markup' || notebookCellListFocused && notebookMissingKernelExtension && !notebookCellExecuting && notebookCellType == 'code' || notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelCount > 0 || notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelSourceCount > 0" },
 { "key": "shift+enter",           "command": "notebook.cell.executeAndSelectBelow",
-                                     "when": "notebookCellListFocused && notebookCellType == 'markup' || notebookCellListFocused && notebookMissingKernelExtension && !notebookCellExecuting && notebookCellType == 'code' || notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelCount > 0" },
+                                     "when": "notebookCellListFocused && notebookCellType == 'markup' || notebookCellListFocused && notebookMissingKernelExtension && !notebookCellExecuting && notebookCellType == 'code' || notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelCount > 0 || notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelSourceCount > 0" },
 { "key": "shift+cmd+v",           "command": "notebook.cell.pasteAbove",
                                      "when": "notebookEditorFocused && !inputFocus" },
 { "key": "down",                  "command": "notebook.focusNextEditor",
@@ -619,7 +619,7 @@
 { "key": "shift+cmd+;",           "command": "breadcrumbs.focus",
                                      "when": "breadcrumbsPossible" },
 { "key": "shift+cmd+.",           "command": "breadcrumbs.focusAndSelect",
-                                     "when": "breadcrumbsPossible" },
+                                     "when": "breadcrumbsPossible && breadcrumbsVisible" },
 { "key": "alt+right",             "command": "breadcrumbs.focusNext",
                                      "when": "breadcrumbsActive && breadcrumbsVisible" },
 { "key": "right",                 "command": "breadcrumbs.focusNext",
@@ -689,13 +689,13 @@
 { "key": "shift+alt+f",           "command": "filesExplorer.findInFolder",
                                      "when": "explorerResourceIsFolder && explorerViewletVisible && filesExplorerFocus && !inputFocus" },
 { "key": "alt+down",              "command": "history.showNext",
-                                     "when": "historyNavigationForwardsEnabled && historyNavigationWidget && !suggestWidgetVisible" },
+                                     "when": "historyNavigationForwardsEnabled && historyNavigationWidgetFocus && !suggestWidgetVisible" },
 { "key": "down",                  "command": "history.showNext",
-                                     "when": "historyNavigationForwardsEnabled && historyNavigationWidget && !suggestWidgetVisible" },
+                                     "when": "historyNavigationForwardsEnabled && historyNavigationWidgetFocus && !suggestWidgetVisible" },
 { "key": "alt+up",                "command": "history.showPrevious",
-                                     "when": "historyNavigationBackwardsEnabled && historyNavigationWidget && !suggestWidgetVisible" },
+                                     "when": "historyNavigationBackwardsEnabled && historyNavigationWidgetFocus && !suggestWidgetVisible" },
 { "key": "up",                    "command": "history.showPrevious",
-                                     "when": "historyNavigationBackwardsEnabled && historyNavigationWidget && !suggestWidgetVisible" },
+                                     "when": "historyNavigationBackwardsEnabled && historyNavigationWidgetFocus && !suggestWidgetVisible" },
 { "key": "alt+=",                 "command": "increaseSearchEditorContextLines",
                                      "when": "inSearchEditor" },
 { "key": "down",                  "command": "interactive.history.next",
@@ -1437,7 +1437,7 @@
 { "key": "shift+alt+f12",         "command": "references-view.findReferences",
                                      "when": "editorHasReferenceProvider" },
 { "key": "f11",                   "command": "extension.node-debug.startWithStopOnEntry",
-                                     "when": "!inDebugMode && debugConfigurationType == 'node' || !inDebugMode && debugConfigurationType == 'pwa-extensionHost' || !inDebugMode && debugConfigurationType == 'pwa-node'" },
+                                     "when": "!inDebugMode && activeViewlet == 'workbench.view.debug' && debugConfigurationType == 'node' || !inDebugMode && activeViewlet == 'workbench.view.debug' && debugConfigurationType == 'pwa-extensionHost' || !inDebugMode && activeViewlet == 'workbench.view.debug' && debugConfigurationType == 'pwa-node'" },
 { "key": "cmd+k cmd+n",           "command": "git.unstageSelectedRanges",
                                      "when": "isInDiffEditor" },
 { "key": "cmd+k v",               "command": "markdown.showPreviewToSide",
@@ -1692,6 +1692,7 @@
 // - getContextKeyInfo
 // - git-base.api.getRemoteSources
 // - git._syncAll
+// - git.acceptMerge
 // - git.addRemote
 // - git.api.getRemoteSources
 // - git.api.getRepositories
@@ -1759,6 +1760,9 @@
 // - git.rename
 // - git.renameBranch
 // - git.restoreCommitTemplate
+// - git.revealFileInOS.linux
+// - git.revealFileInOS.mac
+// - git.revealFileInOS.windows
 // - git.revealInExplorer
 // - git.revertChange
 // - git.setLogLevel
@@ -1839,6 +1843,9 @@
 // - merge-conflict.compare
 // - merge-conflict.next
 // - merge-conflict.previous
+// - merge.dev.copyContents
+// - merge.dev.openContents
+// - merge.toggleLayout
 // - noop
 // - notebook.cancelExecution
 // - notebook.cell.cancelExecution
@@ -2051,6 +2058,7 @@
 // - workbench.action.blur
 // - workbench.action.clearCommandHistory
 // - workbench.action.clearEditorHistory
+// - workbench.action.clearLocalePreference
 // - workbench.action.clearRecentFiles
 // - workbench.action.closeActivePinnedEditor
 // - workbench.action.closeAuxiliaryBar
@@ -2387,6 +2395,8 @@
 // - workbench.actions.sync.resolveResource
 // - workbench.actions.sync.turnOffSyncOnMachine
 // - workbench.actions.syncData.reset
+// - workbench.actions.table.workbench.panel.markers.view.viewAsTable
+// - workbench.actions.table.workbench.panel.markers.view.viewAsTree
 // - workbench.actions.treeView.jsBrowserBreakpoints.collapseAll
 // - workbench.actions.treeView.jsBrowserBreakpoints.refresh
 // - workbench.actions.treeView.jsExcludedCallers.collapseAll