From c385866b0cc729babafa9718d0d373ddb33bdd42 Mon Sep 17 00:00:00 2001 From: gh-workflow Date: Fri, 10 Jun 2022 17:02:46 +0000 Subject: [PATCH 1/3] Update for VSCode 1.68.0 --- generator/default-keybindings-linux.json | 32 ++++++++++++++++-------- generator/default-keybindings-mac.json | 30 ++++++++++++++-------- generator/default-keybindings-win.json | 30 ++++++++++++++-------- package.json | 24 +++++++++--------- 4 files changed, 73 insertions(+), 43 deletions(-) diff --git a/generator/default-keybindings-linux.json b/generator/default-keybindings-linux.json index 4bc34e51..3a7b8d29 100644 --- 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 index 05034c7a..06717348 100644 --- 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 diff --git a/generator/default-keybindings-win.json b/generator/default-keybindings-win.json index 69648276..1757a549 100644 --- a/generator/default-keybindings-win.json +++ b/generator/default-keybindings-win.json @@ -1,4 +1,4 @@ -// Default Keybindings of Visual Studio Code 1.67.2 for Windows +// Default Keybindings of Visual Studio Code 1.68.0 for Windows // Override key bindings by placing them into your key bindings file. [ { "key": "escape escape", "command": "workbench.action.exitZenMode", @@ -383,11 +383,11 @@ { "key": "shift+pageup", "command": "notebook.cell.cursorPageUpSelect", "when": "editorTextFocus && inputFocus && notebookEditorFocused" }, { "key": "ctrl+alt+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", @@ -545,7 +545,7 @@ { "key": "ctrl+shift+;", "command": "breadcrumbs.focus", "when": "breadcrumbsPossible" }, { "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", @@ -615,13 +615,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", @@ -1323,7 +1323,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", @@ -1593,6 +1593,7 @@ // - getContextKeyInfo // - git-base.api.getRemoteSources // - git._syncAll +// - git.acceptMerge // - git.addRemote // - git.api.getRemoteSources // - git.api.getRepositories @@ -1660,6 +1661,9 @@ // - git.rename // - git.renameBranch // - git.restoreCommitTemplate +// - git.revealFileInOS.linux +// - git.revealFileInOS.mac +// - git.revealFileInOS.windows // - git.revealInExplorer // - git.revertChange // - git.setLogLevel @@ -1741,6 +1745,9 @@ // - merge-conflict.compare // - merge-conflict.next // - merge-conflict.previous +// - merge.dev.copyContents +// - merge.dev.openContents +// - merge.toggleLayout // - noop // - notebook.cancelExecution // - notebook.cell.cancelExecution @@ -1955,6 +1962,7 @@ // - workbench.action.blur // - workbench.action.clearCommandHistory // - workbench.action.clearEditorHistory +// - workbench.action.clearLocalePreference // - workbench.action.clearRecentFiles // - workbench.action.closeActivePinnedEditor // - workbench.action.closeAuxiliaryBar @@ -2294,6 +2302,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/package.json b/package.json index b087885f..bf7be939 100644 --- a/package.json +++ b/package.json @@ -795,7 +795,7 @@ "args": { "command": "history.showNext" }, - "when": "kb-macro.recording && historyNavigationForwardsEnabled && historyNavigationWidget && !suggestWidgetVisible" + "when": "kb-macro.recording && historyNavigationForwardsEnabled && historyNavigationWidgetFocus && !suggestWidgetVisible" }, { "key": "down", @@ -1449,7 +1449,7 @@ "args": { "command": "history.showPrevious" }, - "when": "kb-macro.recording && historyNavigationBackwardsEnabled && historyNavigationWidget && !suggestWidgetVisible" + "when": "kb-macro.recording && historyNavigationBackwardsEnabled && historyNavigationWidgetFocus && !suggestWidgetVisible" }, { "key": "up", @@ -2200,7 +2200,7 @@ "args": { "command": "notebook.cell.executeAndSelectBelow" }, - "when": "kb-macro.recording && notebookCellListFocused && notebookCellType == 'markup' || kb-macro.recording && notebookCellListFocused && notebookMissingKernelExtension && !notebookCellExecuting && notebookCellType == 'code' || kb-macro.recording && notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelCount > 0" + "when": "kb-macro.recording && notebookCellListFocused && notebookCellType == 'markup' || kb-macro.recording && notebookCellListFocused && notebookMissingKernelExtension && !notebookCellExecuting && notebookCellType == 'code' || kb-macro.recording && notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelCount > 0 || kb-macro.recording && notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelSourceCount > 0" }, { "key": "shift+enter", @@ -2257,7 +2257,7 @@ "args": { "command": "notebook.cell.executeAndInsertBelow" }, - "when": "kb-macro.recording && notebookCellListFocused && notebookCellType == 'markup' || kb-macro.recording && notebookCellListFocused && notebookMissingKernelExtension && !notebookCellExecuting && notebookCellType == 'code' || kb-macro.recording && notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelCount > 0" + "when": "kb-macro.recording && notebookCellListFocused && notebookCellType == 'markup' || kb-macro.recording && notebookCellListFocused && notebookMissingKernelExtension && !notebookCellExecuting && notebookCellType == 'code' || kb-macro.recording && notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelCount > 0 || kb-macro.recording && notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelSourceCount > 0" }, { "key": "alt+enter", @@ -2362,7 +2362,7 @@ "args": { "command": "notebook.cell.execute" }, - "when": "kb-macro.recording && isWindows && notebookCellListFocused && notebookMissingKernelExtension && !notebookCellExecuting && notebookCellType == 'code' || kb-macro.recording && isWindows && notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelCount > 0" + "when": "kb-macro.recording && isWindows && notebookCellListFocused && notebookMissingKernelExtension && !notebookCellExecuting && notebookCellType == 'code' || kb-macro.recording && isWindows && notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelCount > 0 || kb-macro.recording && isWindows && notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelSourceCount > 0" }, { "key": "ctrl+alt+enter", @@ -3241,7 +3241,7 @@ "args": { "command": "breadcrumbs.focusAndSelect" }, - "when": "kb-macro.recording && breadcrumbsPossible" + "when": "kb-macro.recording && breadcrumbsPossible && breadcrumbsVisible" }, { "key": "ctrl+shift+.", @@ -3326,7 +3326,7 @@ "args": { "command": "notebook.cell.execute" }, - "when": "kb-macro.recording && isMac && notebookCellListFocused && notebookMissingKernelExtension && !notebookCellExecuting && notebookCellType == 'code' || kb-macro.recording && isMac && notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelCount > 0" + "when": "kb-macro.recording && isMac && notebookCellListFocused && notebookMissingKernelExtension && !notebookCellExecuting && notebookCellType == 'code' || kb-macro.recording && isMac && notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelCount > 0 || kb-macro.recording && isMac && notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelSourceCount > 0" }, { "key": "ctrl+enter", @@ -3547,7 +3547,7 @@ "args": { "command": "history.showNext" }, - "when": "kb-macro.recording && historyNavigationForwardsEnabled && historyNavigationWidget && !suggestWidgetVisible" + "when": "kb-macro.recording && historyNavigationForwardsEnabled && historyNavigationWidgetFocus && !suggestWidgetVisible" }, { "key": "alt+down", @@ -3601,7 +3601,7 @@ "args": { "command": "history.showPrevious" }, - "when": "kb-macro.recording && historyNavigationBackwardsEnabled && historyNavigationWidget && !suggestWidgetVisible" + "when": "kb-macro.recording && historyNavigationBackwardsEnabled && historyNavigationWidgetFocus && !suggestWidgetVisible" }, { "key": "alt+up", @@ -6190,7 +6190,7 @@ "args": { "command": "extension.node-debug.startWithStopOnEntry" }, - "when": "kb-macro.recording && !inDebugMode && debugConfigurationType == 'node' || kb-macro.recording && !inDebugMode && debugConfigurationType == 'pwa-extensionHost' || kb-macro.recording && !inDebugMode && debugConfigurationType == 'pwa-node'" + "when": "kb-macro.recording && !inDebugMode && activeViewlet == 'workbench.view.debug' && debugConfigurationType == 'node' || kb-macro.recording && !inDebugMode && activeViewlet == 'workbench.view.debug' && debugConfigurationType == 'pwa-extensionHost' || kb-macro.recording && !inDebugMode && activeViewlet == 'workbench.view.debug' && debugConfigurationType == 'pwa-node'" }, { "key": "ctrl+j", @@ -7142,7 +7142,7 @@ "args": { "command": "notebook.cell.execute" }, - "when": "kb-macro.recording && notebookCellListFocused && notebookMissingKernelExtension && !notebookCellExecuting && notebookCellType == 'code' || kb-macro.recording && notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelCount > 0" + "when": "kb-macro.recording && notebookCellListFocused && notebookMissingKernelExtension && !notebookCellExecuting && notebookCellType == 'code' || kb-macro.recording && notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelCount > 0 || kb-macro.recording && notebookCellListFocused && !notebookCellExecuting && notebookCellType == 'code' && notebookKernelSourceCount > 0" }, { "key": "shift+alt+[IntlBackslash]", @@ -7182,7 +7182,7 @@ "args": { "command": "breadcrumbs.focusAndSelect" }, - "when": "kb-macro.recording && isLinux && breadcrumbsPossible" + "when": "kb-macro.recording && isLinux && breadcrumbsPossible && breadcrumbsVisible" }, { "key": "ctrl+shift+[IntlBackslash]", From 1fc11edf6c37b959466a323ec9ae5d982e690c09 Mon Sep 17 00:00:00 2001 From: tshino Date: Sat, 11 Jun 2022 14:10:01 +0900 Subject: [PATCH 2/3] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b46c00c..cf793dc0 100644 --- 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. [#108](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. From c62aec5bb6bc55d14fc8343ea7ca3308552924b2 Mon Sep 17 00:00:00 2001 From: tshino Date: Sat, 11 Jun 2022 14:11:03 +0900 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf793dc0..51b4cae3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +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. [#108](https://github.com/tshino/vscode-kb-macro/pull/117) + - 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.