diff --git a/CHANGELOG.md b/CHANGELOG.md index dd813d39..f2c6ffe0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to the Keyboard Macro Bata extension will be documented in this file. +### [Unreleased] +- Update + - Updated keymap wrapper for Vz Keymap (v0.19.12). [#345](https://github.com/tshino/vscode-kb-macro/pull/345) + ### [0.13.13] - 2024-03-04 - Update - Updated default keybindings wrappers based on vscode 1.87.0. [#343](https://github.com/tshino/vscode-kb-macro/pull/343) diff --git a/keymap-wrapper/README.md b/keymap-wrapper/README.md index 13821031..0271757d 100644 --- a/keymap-wrapper/README.md +++ b/keymap-wrapper/README.md @@ -22,7 +22,7 @@ Click the keymap wrapper link in the table below, which opens a JSON file. Copy | [Notepad++ Keymap](https://marketplace.visualstudio.com/items?itemName=ms-vscode.notepadplusplus-keybindings) | [link](ms-vscode.notepadplusplus-keybindings.json) | 2023-01-08 | `Ctrl+Shift+R` | `Ctrl+Shift+R` | `Ctrl+Shift+P` | | [Sublime Text Keymap](https://marketplace.visualstudio.com/items?itemName=ms-vscode.sublime-keybindings) | [link](ms-vscode.sublime-keybindings.json) | 2024-02-14 | `Ctrl/Cmd+Q` | `Ctrl/Cmd+Q` | `Ctrl/Cmd+Shift+Q` | | [Visual Studio Keymap](https://marketplace.visualstudio.com/items?itemName=ms-vscode.vs-keybindings) | [link](ms-vscode.vs-keybindings.json) | 2023-01-08 | `Ctrl+M R` | `Ctrl+M R` | `Ctrl+M Enter` | -| [Vz Keymap](https://marketplace.visualstudio.com/items?itemName=tshino.vz-like-keymap) | [link](tshino.vz-like-keymap.json) | 2023-11-13 | `Ctrl+_` | `Ctrl+^` | `Ctrl+^` | +| [Vz Keymap](https://marketplace.visualstudio.com/items?itemName=tshino.vz-like-keymap) | [link](tshino.vz-like-keymap.json) | 2024-03-10 | `Ctrl+_` | `Ctrl+^` | `Ctrl+^` | - Each keyboard shortcut for start/stop recording and playback is assigned to the same ones that the original editor is using, as much as possible. - You can find the definitions of them at the bottom of each keymap wrapper file (find the `startRecording` command etc.). You can customize them as you like. diff --git a/keymap-wrapper/tshino.vz-like-keymap.json b/keymap-wrapper/tshino.vz-like-keymap.json index 443d5000..dce24e29 100644 --- a/keymap-wrapper/tshino.vz-like-keymap.json +++ b/keymap-wrapper/tshino.vz-like-keymap.json @@ -1,5 +1,5 @@ [ - // Keymap wrapper for Vz Keymap v0.19.11 + // Keymap wrapper for Vz Keymap v0.19.12 // (required by Keyboard Macro Beta) // The latest version can be found at: // https://github.com/tshino/vscode-kb-macro/blob/main/keymap-wrapper/README.md @@ -454,31 +454,31 @@ { "key": "ctrl+x", "command": "kb-macro.wrap", "args": { "command": "history.showNext", "await": "selection" }, "when": "kb-macro.active && historyNavigationForwardsEnabled && historyNavigationWidgetFocus && !isComposing && !suggestWidgetVisible" }, { "key": "ctrl+e", "command": "kb-macro.wrap", "args": { "command": "list.focusUp" }, - "when": "kb-macro.active && listFocus && !inputFocus && config.vzKeymap.listViewKeys" }, + "when": "kb-macro.active && listFocus && !inputFocus && !treestickyScrollFocused && config.vzKeymap.listViewKeys" }, { "key": "ctrl+x", "command": "kb-macro.wrap", "args": { "command": "list.focusDown" }, - "when": "kb-macro.active && listFocus && !inputFocus && config.vzKeymap.listViewKeys" }, + "when": "kb-macro.active && listFocus && !inputFocus && !treestickyScrollFocused && config.vzKeymap.listViewKeys" }, { "key": "ctrl+s", "command": "kb-macro.wrap", "args": { "command": "list.collapse" }, - "when": "kb-macro.active && listFocus && treeElementCanCollapse && !inputFocus && config.vzKeymap.listViewKeys || kb-macro.active && listFocus && treeElementHasParent && !inputFocus && config.vzKeymap.listViewKeys" }, + "when": "kb-macro.active && listFocus && treeElementCanCollapse && !inputFocus && !treestickyScrollFocused && config.vzKeymap.listViewKeys || kb-macro.active && listFocus && treeElementHasParent && !inputFocus && !treestickyScrollFocused && config.vzKeymap.listViewKeys" }, { "key": "ctrl+d", "command": "kb-macro.wrap", "args": { "command": "list.expand" }, - "when": "kb-macro.active && listFocus && treeElementCanExpand && !inputFocus && config.vzKeymap.listViewKeys || kb-macro.active && listFocus && treeElementHasChild && !inputFocus && config.vzKeymap.listViewKeys" }, + "when": "kb-macro.active && listFocus && treeElementCanExpand && !inputFocus && !treestickyScrollFocused && config.vzKeymap.listViewKeys || kb-macro.active && listFocus && treeElementHasChild && !inputFocus && !treestickyScrollFocused && config.vzKeymap.listViewKeys" }, { "key": "ctrl+r", "command": "kb-macro.wrap", "args": { "command": "list.focusPageUp" }, - "when": "kb-macro.active && listFocus && !inputFocus && config.vzKeymap.listViewKeys" }, + "when": "kb-macro.active && listFocus && !inputFocus && !treestickyScrollFocused && config.vzKeymap.listViewKeys" }, { "key": "ctrl+c", "command": "kb-macro.wrap", "args": { "command": "list.focusPageDown" }, - "when": "kb-macro.active && listFocus && !inputFocus && config.vzKeymap.listViewKeys" }, + "when": "kb-macro.active && listFocus && !inputFocus && !treestickyScrollFocused && config.vzKeymap.listViewKeys" }, { "key": "ctrl+q ctrl+r", "command": "kb-macro.wrap", "args": { "command": "list.focusFirst" }, - "when": "kb-macro.active && listFocus && !inputFocus && config.vzKeymap.listViewKeys" }, + "when": "kb-macro.active && listFocus && !inputFocus && !treestickyScrollFocused && config.vzKeymap.listViewKeys" }, { "key": "ctrl+q r", "command": "kb-macro.wrap", "args": { "command": "list.focusFirst" }, - "when": "kb-macro.active && listFocus && !inputFocus && config.vzKeymap.listViewKeys" }, + "when": "kb-macro.active && listFocus && !inputFocus && !treestickyScrollFocused && config.vzKeymap.listViewKeys" }, { "key": "ctrl+q ctrl+c", "command": "kb-macro.wrap", "args": { "command": "list.focusLast" }, - "when": "kb-macro.active && listFocus && !inputFocus && config.vzKeymap.listViewKeys" }, + "when": "kb-macro.active && listFocus && !inputFocus && !treestickyScrollFocused && config.vzKeymap.listViewKeys" }, { "key": "ctrl+q c", "command": "kb-macro.wrap", "args": { "command": "list.focusLast" }, - "when": "kb-macro.active && listFocus && !inputFocus && config.vzKeymap.listViewKeys" }, + "when": "kb-macro.active && listFocus && !inputFocus && !treestickyScrollFocused && config.vzKeymap.listViewKeys" }, { "key": "ctrl+w", "command": "kb-macro.wrap", "args": { "command": "list.scrollUp" }, - "when": "kb-macro.active && listFocus && !inputFocus && config.vzKeymap.listViewKeys && config.vzKeymap.ctrl+W" }, + "when": "kb-macro.active && listFocus && !inputFocus && !treestickyScrollFocused && config.vzKeymap.listViewKeys && config.vzKeymap.ctrl+W" }, { "key": "ctrl+z", "command": "kb-macro.wrap", "args": { "command": "list.scrollDown" }, - "when": "kb-macro.active && listFocus && !inputFocus && config.vzKeymap.listViewKeys && config.vzKeymap.ctrl+Z" }, + "when": "kb-macro.active && listFocus && !inputFocus && !treestickyScrollFocused && config.vzKeymap.listViewKeys && config.vzKeymap.ctrl+Z" }, { "key": "ctrl+m", "command": "kb-macro.wrap", "args": { "command": "list.select" }, - "when": "kb-macro.active && listFocus && !inputFocus && config.vzKeymap.listViewKeys" }, + "when": "kb-macro.active && listFocus && !inputFocus && !treestickyScrollFocused && config.vzKeymap.listViewKeys" }, { "key": "ctrl+s", "command": "kb-macro.wrap", "args": { "command": "notification.collapse" }, "when": "kb-macro.active && notificationFocus && config.vzKeymap.notificationKeys" }, { "key": "ctrl+d", "command": "kb-macro.wrap", "args": { "command": "notification.expand" }, @@ -500,9 +500,9 @@ { "key": "ctrl+m", "command": "kb-macro.wrap", "args": { "command": "settings.action.focusSettingControl" }, "when": "kb-macro.active && inSettingsEditor && settingRowFocus && config.vzKeymap.settingsPageKeys" }, { "key": "ctrl+w", "command": "kb-macro.wrap", "args": { "command": "widgetNavigation.focusPrevious" }, - "when": "kb-macro.active && inputFocus && navigableContainerFocused && config.vzKeymap.widgetNavigationKeys && config.vzKeymap.ctrl+W || kb-macro.active && navigableContainerFocused && !listFocus && config.vzKeymap.widgetNavigationKeys && config.vzKeymap.ctrl+W || kb-macro.active && navigableContainerFocused && listScrollAtBoundary == 'both' && config.vzKeymap.widgetNavigationKeys && config.vzKeymap.ctrl+W || kb-macro.active && navigableContainerFocused && listScrollAtBoundary == 'top' && config.vzKeymap.widgetNavigationKeys && config.vzKeymap.ctrl+W" }, + "when": "kb-macro.active && inputFocus && navigableContainerFocused && config.vzKeymap.widgetNavigationKeys && config.vzKeymap.ctrl+W || kb-macro.active && navigableContainerFocused && treestickyScrollFocused && config.vzKeymap.widgetNavigationKeys && config.vzKeymap.ctrl+W || kb-macro.active && navigableContainerFocused && !listFocus && config.vzKeymap.widgetNavigationKeys && config.vzKeymap.ctrl+W || kb-macro.active && navigableContainerFocused && listScrollAtBoundary == 'both' && config.vzKeymap.widgetNavigationKeys && config.vzKeymap.ctrl+W || kb-macro.active && navigableContainerFocused && listScrollAtBoundary == 'top' && config.vzKeymap.widgetNavigationKeys && config.vzKeymap.ctrl+W" }, { "key": "ctrl+z", "command": "kb-macro.wrap", "args": { "command": "widgetNavigation.focusNext" }, - "when": "kb-macro.active && inputFocus && navigableContainerFocused && config.vzKeymap.widgetNavigationKeys && config.vzKeymap.ctrl+Z || kb-macro.active && navigableContainerFocused && !listFocus && config.vzKeymap.widgetNavigationKeys && config.vzKeymap.ctrl+Z || kb-macro.active && navigableContainerFocused && listScrollAtBoundary == 'both' && config.vzKeymap.widgetNavigationKeys && config.vzKeymap.ctrl+Z || kb-macro.active && navigableContainerFocused && listScrollAtBoundary == 'bottom' && config.vzKeymap.widgetNavigationKeys && config.vzKeymap.ctrl+Z" }, + "when": "kb-macro.active && inputFocus && navigableContainerFocused && config.vzKeymap.widgetNavigationKeys && config.vzKeymap.ctrl+Z || kb-macro.active && navigableContainerFocused && treestickyScrollFocused && config.vzKeymap.widgetNavigationKeys && config.vzKeymap.ctrl+Z || kb-macro.active && navigableContainerFocused && !listFocus && config.vzKeymap.widgetNavigationKeys && config.vzKeymap.ctrl+Z || kb-macro.active && navigableContainerFocused && listScrollAtBoundary == 'both' && config.vzKeymap.widgetNavigationKeys && config.vzKeymap.ctrl+Z || kb-macro.active && navigableContainerFocused && listScrollAtBoundary == 'bottom' && config.vzKeymap.widgetNavigationKeys && config.vzKeymap.ctrl+Z" }, { "key": "ctrl+e", "command": "kb-macro.wrap", "args": { "command": "workbench.action.interactivePlayground.arrowUp" }, "when": "kb-macro.active && interactivePlaygroundFocus && !editorTextFocus && config.vzKeymap.interactivePlaygroundKeys" }, { "key": "ctrl+x", "command": "kb-macro.wrap", "args": { "command": "workbench.action.interactivePlayground.arrowDown" }, @@ -528,9 +528,13 @@ { "key": "ctrl+q d", "command": "kb-macro.wrap", "args": { "command": "workbench.statusBar.focusLast" }, "when": "kb-macro.active && statusBarFocused && config.vzKeymap.statusBarKeys" }, { "key": "ctrl+f", "command": "kb-macro.wrap", "args": { "command": "breadcrumbs.focusNextWithPicker" }, - "when": "kb-macro.active && breadcrumbsActive && breadcrumbsVisible && listFocus && !inputFocus && config.vzKeymap.breadcrumbsKeys" }, + "when": "kb-macro.active && breadcrumbsActive && breadcrumbsVisible && listFocus && !inputFocus && !treestickyScrollFocused && config.vzKeymap.breadcrumbsKeys" }, { "key": "ctrl+a", "command": "kb-macro.wrap", "args": { "command": "breadcrumbs.focusPreviousWithPicker" }, - "when": "kb-macro.active && breadcrumbsActive && breadcrumbsVisible && listFocus && !inputFocus && config.vzKeymap.breadcrumbsKeys" }, + "when": "kb-macro.active && breadcrumbsActive && breadcrumbsVisible && listFocus && !inputFocus && !treestickyScrollFocused && config.vzKeymap.breadcrumbsKeys" }, + { "key": "ctrl+s", "command": "kb-macro.wrap", "args": { "command": "list.stickyScroll.collapse" }, + "when": "kb-macro.active && treestickyScrollFocused && config.vzKeymap.listViewKeys" }, + { "key": "ctrl+m", "command": "kb-macro.wrap", "args": { "command": "list.stickyScrollselect" }, + "when": "kb-macro.active && treestickyScrollFocused && config.vzKeymap.listViewKeys" }, { "key": "ctrl+e", "command": "selectPrevCodeAction", "when": "kb-macro.active && codeActionMenuVisible && config.vzKeymap.codeActionKeys" }, { "key": "ctrl+x", "command": "selectNextCodeAction",