diff --git a/CHANGELOG.md b/CHANGELOG.md index 88b4c485..24850e6e 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.8). [#271](https://github.com/tshino/vscode-kb-macro/pull/271) + ### [0.13.6] - 2023-07-09 - Update - Updated default keybindings wrappers based on vscode 1.80.0. [#269](https://github.com/tshino/vscode-kb-macro/pull/269) diff --git a/keymap-wrapper/README.md b/keymap-wrapper/README.md index 0625a7c7..eaa8a8eb 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) | 2023-01-08 | `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-07-09 | `Ctrl+_` | `Ctrl+^` | `Ctrl+^` | +| [Vz Keymap](https://marketplace.visualstudio.com/items?itemName=tshino.vz-like-keymap) | [link](tshino.vz-like-keymap.json) | 2023-07-15 | `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 e2c895a2..c3b9f18c 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.7 + // Keymap wrapper for Vz Keymap v0.19.8 // (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 @@ -190,9 +190,9 @@ { "key": "ctrl+m", "command": "", "when": "kb-macro.active && editorFocus" }, { "key": "ctrl+m", "command": "kb-macro.wrap", "args": { "command": "vz.enter", "await": "document selection" }, - "when": "kb-macro.active && editorTextFocus && !editorReadonly && !suggestWidgetVisible && !renameInputVisible && !codeActionMenuVisible" }, + "when": "kb-macro.active && editorTextFocus && !editorReadonly && !renameInputVisible && !codeActionMenuVisible && !suggestWidgetHasFocusedSuggestion || kb-macro.active && editorTextFocus && !editorReadonly && !renameInputVisible && !codeActionMenuVisible && suggestWidgetHasFocusedSuggestion && !acceptSuggestionOnEnter" }, { "key": "enter", "command": "kb-macro.wrap", "args": { "command": "vz.enter", "await": "document selection" }, - "when": "kb-macro.active && editorTextFocus && !editorReadonly && !suggestWidgetVisible && !renameInputVisible && !codeActionMenuVisible" }, + "when": "kb-macro.active && editorTextFocus && !editorReadonly && !renameInputVisible && !codeActionMenuVisible && !suggestWidgetHasFocusedSuggestion || kb-macro.active && editorTextFocus && !editorReadonly && !renameInputVisible && !codeActionMenuVisible && suggestWidgetHasFocusedSuggestion && !acceptSuggestionOnEnter" }, { "key": "ctrl+n", "command": "", "when": "kb-macro.active && editorFocus && config.vzKeymap.ctrl+N" }, { "key": "ctrl+n", "command": "kb-macro.wrap", "args": { "command": "vz.insertLineBefore", "await": "document selection" }, @@ -378,9 +378,9 @@ { "key": "ctrl+k b", "command": "kb-macro.wrap", "args": { "command": "vz.findStartCancelSelection", "await": "selection" }, "when": "kb-macro.active && editorFocus && findInputFocussed || kb-macro.active && editorFocus && replaceInputFocussed" }, { "key": "ctrl+m", "command": "kb-macro.wrap", "args": { "command": "vz.findStartEnter", "await": "document selection" }, - "when": "kb-macro.active && editorTextFocus && findWidgetVisible && !editorReadonly && !suggestWidgetVisible && !renameInputVisible" }, + "when": "kb-macro.active && editorTextFocus && findWidgetVisible && !editorReadonly && !renameInputVisible && !suggestWidgetHasFocusedSuggestion || kb-macro.active && editorTextFocus && findWidgetVisible && !editorReadonly && !renameInputVisible && suggestWidgetHasFocusedSuggestion && !acceptSuggestionOnEnter" }, { "key": "enter", "command": "kb-macro.wrap", "args": { "command": "vz.findStartEnter", "await": "document selection" }, - "when": "kb-macro.active && editorTextFocus && findWidgetVisible && !editorReadonly && !suggestWidgetVisible && !renameInputVisible" }, + "when": "kb-macro.active && editorTextFocus && findWidgetVisible && !editorReadonly && !renameInputVisible && !suggestWidgetHasFocusedSuggestion || kb-macro.active && editorTextFocus && findWidgetVisible && !editorReadonly && !renameInputVisible && suggestWidgetHasFocusedSuggestion && !acceptSuggestionOnEnter" }, { "key": "escape", "command": "kb-macro.wrap", "args": { "command": "vz.closeFindWidget", "await": "selection" }, "when": "kb-macro.active && editorFocus && !suggestWidgetVisible && !parameterHintsVisible && !accessibilityHelpWidgetVisible && !breakpointWidgetVisible && findWidgetVisible" }, { "key": "alt+y", "command": "kb-macro.wrap", "args": { "command": "workbench.action.moveEditorToNextGroup" }, @@ -399,14 +399,30 @@ "when": "kb-macro.active" }, { "key": "ctrl+alt+j", "command": "kb-macro.wrap", "args": { "command": "workbench.action.togglePanel" }, "when": "kb-macro.active" }, + { "key": "ctrl+f", "command": "kb-macro.wrap", "args": { "command": "breadcrumbs.focusNext" }, + "when": "kb-macro.active && breadcrumbsActive && breadcrumbsVisible && config.vzKeymap.breadcrumbsKeys" }, + { "key": "ctrl+d", "command": "kb-macro.wrap", "args": { "command": "breadcrumbs.focusNext" }, + "when": "kb-macro.active && breadcrumbsActive && breadcrumbsVisible && config.vzKeymap.breadcrumbsKeys" }, + { "key": "ctrl+a", "command": "kb-macro.wrap", "args": { "command": "breadcrumbs.focusPrevious" }, + "when": "kb-macro.active && breadcrumbsActive && breadcrumbsVisible && config.vzKeymap.breadcrumbsKeys" }, + { "key": "ctrl+s", "command": "kb-macro.wrap", "args": { "command": "breadcrumbs.focusPrevious" }, + "when": "kb-macro.active && breadcrumbsActive && breadcrumbsVisible && config.vzKeymap.breadcrumbsKeys" }, + { "key": "ctrl+x", "command": "kb-macro.wrap", "args": { "command": "breadcrumbs.selectFocused" }, + "when": "kb-macro.active && breadcrumbsActive && breadcrumbsVisible && config.vzKeymap.breadcrumbsKeys" }, + { "key": "ctrl+m", "command": "kb-macro.wrap", "args": { "command": "breadcrumbs.selectFocused" }, + "when": "kb-macro.active && breadcrumbsActive && breadcrumbsVisible && config.vzKeymap.breadcrumbsKeys" }, + { "key": "ctrl+f", "command": "kb-macro.wrap", "args": { "command": "breadcrumbs.focusNextWithPicker" }, + "when": "kb-macro.active && breadcrumbsActive && breadcrumbsVisible && listFocus && !inputFocus && 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" }, { "key": "ctrl+e", "command": "kb-macro.wrap", "args": { "command": "list.focusUp" }, "when": "kb-macro.active && listFocus && !inputFocus && config.vzKeymap.listViewKeys" }, { "key": "ctrl+x", "command": "kb-macro.wrap", "args": { "command": "list.focusDown" }, "when": "kb-macro.active && listFocus && !inputFocus && config.vzKeymap.listViewKeys" }, { "key": "ctrl+s", "command": "kb-macro.wrap", "args": { "command": "list.collapse" }, - "when": "kb-macro.active && listFocus && !inputFocus && config.vzKeymap.listViewKeys" }, + "when": "kb-macro.active && listFocus && treeElementCanCollapse && !inputFocus && config.vzKeymap.listViewKeys || kb-macro.active && listFocus && treeElementHasParent && !inputFocus && config.vzKeymap.listViewKeys" }, { "key": "ctrl+d", "command": "kb-macro.wrap", "args": { "command": "list.expand" }, - "when": "kb-macro.active && listFocus && !inputFocus && config.vzKeymap.listViewKeys" }, + "when": "kb-macro.active && listFocus && treeElementCanExpand && !inputFocus && config.vzKeymap.listViewKeys || kb-macro.active && listFocus && treeElementHasChild && !inputFocus && config.vzKeymap.listViewKeys" }, { "key": "ctrl+r", "command": "kb-macro.wrap", "args": { "command": "list.focusPageUp" }, "when": "kb-macro.active && listFocus && !inputFocus && config.vzKeymap.listViewKeys" }, { "key": "ctrl+c", "command": "kb-macro.wrap", "args": { "command": "list.focusPageDown" }, @@ -422,13 +438,13 @@ { "key": "ctrl+m", "command": "kb-macro.wrap", "args": { "command": "list.select" }, "when": "kb-macro.active && listFocus && !inputFocus && config.vzKeymap.listViewKeys" }, { "key": "ctrl+e", "command": "kb-macro.wrap", "args": { "command": "selectPrevSuggestion", "record": "side-effect" }, - "when": "kb-macro.active && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus && config.vzKeymap.suggestionWidgetKeys" }, + "when": "kb-macro.active && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus && config.vzKeymap.suggestionWidgetKeys || kb-macro.active && suggestWidgetVisible && textInputFocus && !suggestWidgetHasFocusedSuggestion && config.vzKeymap.suggestionWidgetKeys" }, { "key": "ctrl+x", "command": "kb-macro.wrap", "args": { "command": "selectNextSuggestion", "record": "side-effect" }, - "when": "kb-macro.active && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus && config.vzKeymap.suggestionWidgetKeys" }, + "when": "kb-macro.active && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus && config.vzKeymap.suggestionWidgetKeys || kb-macro.active && suggestWidgetVisible && textInputFocus && !suggestWidgetHasFocusedSuggestion && config.vzKeymap.suggestionWidgetKeys" }, { "key": "ctrl+r", "command": "kb-macro.wrap", "args": { "command": "selectPrevPageSuggestion", "record": "side-effect" }, - "when": "kb-macro.active && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus && config.vzKeymap.suggestionWidgetKeys" }, + "when": "kb-macro.active && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus && config.vzKeymap.suggestionWidgetKeys || kb-macro.active && suggestWidgetVisible && textInputFocus && !suggestWidgetHasFocusedSuggestion && config.vzKeymap.suggestionWidgetKeys" }, { "key": "ctrl+c", "command": "kb-macro.wrap", "args": { "command": "selectNextPageSuggestion", "record": "side-effect" }, - "when": "kb-macro.active && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus && config.vzKeymap.suggestionWidgetKeys" }, + "when": "kb-macro.active && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus && config.vzKeymap.suggestionWidgetKeys || kb-macro.active && suggestWidgetVisible && textInputFocus && !suggestWidgetHasFocusedSuggestion && config.vzKeymap.suggestionWidgetKeys" }, { "key": "ctrl+q ctrl+r", "command": "kb-macro.wrap", "args": { "command": "selectFirstSuggestion", "record": "side-effect" }, "when": "kb-macro.active && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus && config.vzKeymap.suggestionWidgetKeys" }, { "key": "ctrl+q r", "command": "kb-macro.wrap", "args": { "command": "selectFirstSuggestion", "record": "side-effect" },