diff --git a/generator/config.json b/generator/config.json index b18c0739..6f5ee0dc 100644 --- a/generator/config.json +++ b/generator/config.json @@ -14,22 +14,6 @@ } ], "exclusion": [ - "editor.action.triggerSuggest", - "hideSuggestWidget", - "selectNextSuggestion", - "selectPrevSuggestion", - "selectNextPageSuggestion", - "selectPrevPageSuggestion", - "toggleExplainMode", - "toggleSuggestionDetails", - "toggleSuggestionFocus", - "acceptSelectedSuggestion", - "acceptAlternativeSelectedSuggestion", - "insertSnippet", - "leaveSnippet", - "editor.action.insertSnippet", - "jumpToNextSnippetPlaceholder", - "jumpToPrevSnippetPlaceholder", "workbench.action.showCommands", "showPrevParameterHint", "showNextParameterHint" @@ -39,6 +23,39 @@ [ "editor.action.clipboardCutAction", "document [!kb-macro.headOfLine]selection clipboard" ], [ "editor.action.clipboardPasteAction", "document selection" ] ], + "recordOptions": [ + [ "editor.action.inlineSuggest.showNext", "side-effect" ], + [ "editor.action.inlineSuggest.showPrevious", "side-effect" ], + [ "editor.action.inlineSuggest.commit", "side-effect" ], + [ "editor.action.inlineSuggest.hide", "side-effect" ], + [ "editor.action.inlineSuggest.trigger", "side-effect" ], + + [ "editor.action.triggerSuggest", "side-effect" ], + [ "hideSuggestWidget", "side-effect" ], + [ "insertNextSuggestion", "side-effect" ], + [ "insertPrevSuggestion", "side-effect" ], + [ "selectFirstSuggestion", "side-effect" ], + [ "selectLastSuggestion", "side-effect" ], + [ "selectNextSuggestion", "side-effect" ], + [ "selectPrevSuggestion", "side-effect" ], + [ "selectNextPageSuggestion", "side-effect" ], + [ "selectPrevPageSuggestion", "side-effect" ], + [ "toggleExplainMode", "side-effect" ], + [ "toggleSuggestionDetails", "side-effect" ], + [ "toggleSuggestionFocus", "side-effect" ], + [ "acceptSelectedSuggestion", "side-effect" ], + [ "acceptSelectedSuggestionOnEnter", "side-effect" ], + [ "acceptAlternativeSelectedSuggestion", "side-effect" ], + [ "editor.action.resetSuggestSize", "side-effect" ], + + [ "insertSnippet", "side-effect" ], + [ "acceptSnippet", "side-effect" ], + [ "leaveSnippet", "side-effect" ], + [ "editor.action.insertSnippet", "side-effect" ], + [ "editor.action.showSnippets", "side-effect" ], + [ "jumpToNextSnippetPlaceholder", "side-effect" ], + [ "jumpToPrevSnippetPlaceholder", "side-effect" ] + ], "header": [ { "key": "enter", diff --git a/keymap-wrapper/README.md b/keymap-wrapper/README.md index af9fc181..6c1e6ebd 100644 --- a/keymap-wrapper/README.md +++ b/keymap-wrapper/README.md @@ -16,13 +16,13 @@ Click the keymap wrapper link in the table below, which opens a JSON file. Copy | Keymap extension | Keymap wrapper | Last updated | Start recording | Stop recording | Playback | | ---------------- | -------------- | ------------ | ---------- | --------- | -------- | -| [Atom Keymap](https://marketplace.visualstudio.com/items?itemName=ms-vscode.atom-keybindings) | [link](ms-vscode.atom-keybindings.json) | 2021-12-24 | `Ctrl+Alt+R` | `Ctrl+Alt+R` | `Ctrl+Alt+P` | -| [Awesome Emacs Keymap](https://marketplace.visualstudio.com/items?itemName=tuttieee.emacs-mcx) | [link](tuttieee.emacs-mcx.json) | 2022-04-04 | `C-x S-9` | `C-x S-0` | `C-x e` | -| [Delphi Keymap](https://marketplace.visualstudio.com/items?itemName=alefragnani.delphi-keybindings) | [link](alefragnani.delphi-keybindings.json) | 2022-04-04 | `Ctrl/Cmd+Shift+R` | `Ctrl/Cmd+Shift+R` | `Ctrl/Cmd+Shift+P` | +| [Atom Keymap](https://marketplace.visualstudio.com/items?itemName=ms-vscode.atom-keybindings) | [link](ms-vscode.atom-keybindings.json) | 2022-04-05 | `Ctrl+Alt+R` | `Ctrl+Alt+R` | `Ctrl+Alt+P` | +| [Awesome Emacs Keymap](https://marketplace.visualstudio.com/items?itemName=tuttieee.emacs-mcx) | [link](tuttieee.emacs-mcx.json) | 2022-04-05 | `C-x S-9` | `C-x S-0` | `C-x e` | +| [Delphi Keymap](https://marketplace.visualstudio.com/items?itemName=alefragnani.delphi-keybindings) | [link](alefragnani.delphi-keybindings.json) | 2022-04-05 | `Ctrl/Cmd+Shift+R` | `Ctrl/Cmd+Shift+R` | `Ctrl/Cmd+Shift+P` | | [Notepad++ Keymap](https://marketplace.visualstudio.com/items?itemName=ms-vscode.notepadplusplus-keybindings) | [link](ms-vscode.notepadplusplus-keybindings.json) | 2021-12-26 | `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) | 2021-12-21 | `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) | 2021-12-29 | `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) | 2022-01-27 | `Ctrl+_` | `Ctrl+^` | `Ctrl+^` | +| [Visual Studio Keymap](https://marketplace.visualstudio.com/items?itemName=ms-vscode.vs-keybindings) | [link](ms-vscode.vs-keybindings.json) | 2022-04-05 | `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) | 2022-04-05 | `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/alefragnani.delphi-keybindings.json b/keymap-wrapper/alefragnani.delphi-keybindings.json index 6ec55d15..c897f4ff 100644 --- a/keymap-wrapper/alefragnani.delphi-keybindings.json +++ b/keymap-wrapper/alefragnani.delphi-keybindings.json @@ -95,9 +95,9 @@ "when": "kb-macro.recording && isMac && editorTextFocus" }, { "key": "ctrl+alt+shift+home", "command": "kb-macro.wrap", "args": { "command": "cursorTopSelect" }, "when": "kb-macro.recording && !isMac && editorTextFocus" }, - { "key": "cmd+j", "command": "kb-macro.wrap", "args": { "command": "editor.action.showSnippets" }, + { "key": "cmd+j", "command": "kb-macro.wrap", "args": { "command": "editor.action.showSnippets", "record": "side-effect" }, "when": "kb-macro.recording && isMac && editorTextFocus" }, - { "key": "ctrl+j", "command": "kb-macro.wrap", "args": { "command": "editor.action.showSnippets" }, + { "key": "ctrl+j", "command": "kb-macro.wrap", "args": { "command": "editor.action.showSnippets", "record": "side-effect" }, "when": "kb-macro.recording && !isMac && editorTextFocus" }, { "key": "cmd+right", "command": "kb-macro.wrap", "args": { "command": "cursorWordRight" }, "when": "kb-macro.recording && isMac && editorTextFocus" }, diff --git a/keymap-wrapper/ms-vscode.atom-keybindings.json b/keymap-wrapper/ms-vscode.atom-keybindings.json index e7628c1a..053249ec 100644 --- a/keymap-wrapper/ms-vscode.atom-keybindings.json +++ b/keymap-wrapper/ms-vscode.atom-keybindings.json @@ -85,7 +85,7 @@ "when": "kb-macro.recording && isMac" }, { "key": "ctrl+alt+i", "command": "kb-macro.wrap", "args": { "command": "workbench.action.toggleDevTools" }, "when": "kb-macro.recording && !isMac" }, - { "key": "alt+shift+s", "command": "kb-macro.wrap", "args": { "command": "editor.action.showSnippets" }, + { "key": "alt+shift+s", "command": "kb-macro.wrap", "args": { "command": "editor.action.showSnippets", "record": "side-effect" }, "when": "kb-macro.recording" }, { "key": "ctrl+shift+o", "command": "kb-macro.wrap", "args": { "command": "workbench.action.files.openFolder" }, "when": "kb-macro.recording" }, diff --git a/keymap-wrapper/ms-vscode.vs-keybindings.json b/keymap-wrapper/ms-vscode.vs-keybindings.json index f0c94bd2..90bfaf88 100644 --- a/keymap-wrapper/ms-vscode.vs-keybindings.json +++ b/keymap-wrapper/ms-vscode.vs-keybindings.json @@ -15,7 +15,7 @@ "when": "kb-macro.recording && inDebugMode" }, { "key": "ctrl+k ctrl+d", "command": "kb-macro.wrap", "args": { "command": "editor.action.formatDocument" }, "when": "kb-macro.recording" }, - { "key": "ctrl+k ctrl+x", "command": "insertSnippet", + { "key": "ctrl+k ctrl+x", "command": "kb-macro.wrap", "args": { "command": "insertSnippet", "record": "side-effect" }, "when": "kb-macro.recording" }, { "key": "ctrl+shift+l", "command": "kb-macro.wrap", "args": { "command": "editor.action.deleteLines" }, "when": "kb-macro.recording && editorTextFocus && !editorReadonly" }, @@ -33,7 +33,7 @@ "when": "kb-macro.recording && editorTextFocus" }, { "key": "shift+alt+.", "command": "kb-macro.wrap", "args": { "command": "editor.action.addSelectionToNextFindMatch" }, "when": "kb-macro.recording && editorFocus" }, - { "key": "ctrl+alt+space", "command": "editor.action.triggerSuggest", + { "key": "ctrl+alt+space", "command": "kb-macro.wrap", "args": { "command": "editor.action.triggerSuggest", "record": "side-effect" }, "when": "kb-macro.recording && editorHasCompletionItemProvider && editorTextFocus && !editorReadonly" }, { "key": "alt+space", "command": "kb-macro.wrap", "args": { "command": "undo" }, "when": "kb-macro.recording" }, diff --git a/keymap-wrapper/tshino.vz-like-keymap.json b/keymap-wrapper/tshino.vz-like-keymap.json index e0b7af0f..17f1c0fa 100644 --- a/keymap-wrapper/tshino.vz-like-keymap.json +++ b/keymap-wrapper/tshino.vz-like-keymap.json @@ -419,23 +419,23 @@ "when": "kb-macro.recording && listFocus && !inputFocus && config.vzKeymap.listViewKeys" }, { "key": "ctrl+m", "command": "kb-macro.wrap", "args": { "command": "list.select" }, "when": "kb-macro.recording && listFocus && !inputFocus && config.vzKeymap.listViewKeys" }, - { "key": "ctrl+e", "command": "selectPrevSuggestion", + { "key": "ctrl+e", "command": "kb-macro.wrap", "args": { "command": "selectPrevSuggestion", "record": "side-effect" }, "when": "kb-macro.recording && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus && config.vzKeymap.suggestionWidgetKeys" }, - { "key": "ctrl+x", "command": "selectNextSuggestion", + { "key": "ctrl+x", "command": "kb-macro.wrap", "args": { "command": "selectNextSuggestion", "record": "side-effect" }, "when": "kb-macro.recording && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus && config.vzKeymap.suggestionWidgetKeys" }, - { "key": "ctrl+r", "command": "selectPrevPageSuggestion", + { "key": "ctrl+r", "command": "kb-macro.wrap", "args": { "command": "selectPrevPageSuggestion", "record": "side-effect" }, "when": "kb-macro.recording && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus && config.vzKeymap.suggestionWidgetKeys" }, - { "key": "ctrl+c", "command": "selectNextPageSuggestion", + { "key": "ctrl+c", "command": "kb-macro.wrap", "args": { "command": "selectNextPageSuggestion", "record": "side-effect" }, "when": "kb-macro.recording && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus && config.vzKeymap.suggestionWidgetKeys" }, - { "key": "ctrl+q ctrl+r", "command": "kb-macro.wrap", "args": { "command": "selectFirstSuggestion" }, + { "key": "ctrl+q ctrl+r", "command": "kb-macro.wrap", "args": { "command": "selectFirstSuggestion", "record": "side-effect" }, "when": "kb-macro.recording && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus && config.vzKeymap.suggestionWidgetKeys" }, - { "key": "ctrl+q r", "command": "kb-macro.wrap", "args": { "command": "selectFirstSuggestion" }, + { "key": "ctrl+q r", "command": "kb-macro.wrap", "args": { "command": "selectFirstSuggestion", "record": "side-effect" }, "when": "kb-macro.recording && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus && config.vzKeymap.suggestionWidgetKeys" }, - { "key": "ctrl+q ctrl+c", "command": "kb-macro.wrap", "args": { "command": "selectLastSuggestion" }, + { "key": "ctrl+q ctrl+c", "command": "kb-macro.wrap", "args": { "command": "selectLastSuggestion", "record": "side-effect" }, "when": "kb-macro.recording && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus && config.vzKeymap.suggestionWidgetKeys" }, - { "key": "ctrl+q c", "command": "kb-macro.wrap", "args": { "command": "selectLastSuggestion" }, + { "key": "ctrl+q c", "command": "kb-macro.wrap", "args": { "command": "selectLastSuggestion", "record": "side-effect" }, "when": "kb-macro.recording && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus && config.vzKeymap.suggestionWidgetKeys" }, - { "key": "ctrl+m", "command": "acceptSelectedSuggestion", + { "key": "ctrl+m", "command": "kb-macro.wrap", "args": { "command": "acceptSelectedSuggestion", "record": "side-effect" }, "when": "kb-macro.recording && acceptSuggestionOnEnter && suggestWidgetVisible && suggestionMakesTextEdit && textInputFocus && config.vzKeymap.suggestionWidgetKeys" }, { "key": "ctrl+x", "command": "kb-macro.wrap", "args": { "command": "settings.action.focusSettingsFromSearch" }, "when": "kb-macro.recording && inSettingsSearch && !suggestWidgetVisible && config.vzKeymap.settingsPageKeys" }, diff --git a/keymap-wrapper/tuttieee.emacs-mcx.json b/keymap-wrapper/tuttieee.emacs-mcx.json index 53c41cc4..ae0fd326 100644 --- a/keymap-wrapper/tuttieee.emacs-mcx.json +++ b/keymap-wrapper/tuttieee.emacs-mcx.json @@ -461,9 +461,9 @@ "when": "kb-macro.recording && terminalFocus" }, { "key": "ctrl+p", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.previousLine", "await": "selection" }, "when": "kb-macro.recording && terminalFocus" }, - { "key": "up", "command": "selectPrevSuggestion", + { "key": "up", "command": "kb-macro.wrap", "args": { "command": "selectPrevSuggestion", "record": "side-effect" }, "when": "kb-macro.recording && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus" }, - { "key": "ctrl+p", "command": "selectPrevSuggestion", + { "key": "ctrl+p", "command": "kb-macro.wrap", "args": { "command": "selectPrevSuggestion", "record": "side-effect" }, "when": "kb-macro.recording && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus" }, { "key": "up", "command": "showPrevParameterHint", "when": "kb-macro.recording && parameterHintsMultipleSignatures && parameterHintsVisible && textInputFocus" }, @@ -481,9 +481,9 @@ "when": "kb-macro.recording && terminalFocus" }, { "key": "ctrl+n", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.nextLine", "await": "selection" }, "when": "kb-macro.recording && terminalFocus" }, - { "key": "down", "command": "selectNextSuggestion", + { "key": "down", "command": "kb-macro.wrap", "args": { "command": "selectNextSuggestion", "record": "side-effect" }, "when": "kb-macro.recording && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus" }, - { "key": "ctrl+n", "command": "selectNextSuggestion", + { "key": "ctrl+n", "command": "kb-macro.wrap", "args": { "command": "selectNextSuggestion", "record": "side-effect" }, "when": "kb-macro.recording && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus" }, { "key": "down", "command": "showNextParameterHint", "when": "kb-macro.recording && parameterHintsMultipleSignatures && parameterHintsVisible && textInputFocus" }, @@ -1103,7 +1103,7 @@ "when": "kb-macro.recording && inputFocus && notebookEditorFocused && !editorHasMultipleSelections && !editorHasSelection && !editorHoverVisible" }, { "key": "ctrl+g", "command": "kb-macro.wrap", "args": { "command": "closeBreakpointWidget" }, "when": "kb-macro.recording && breakpointWidgetVisible && textInputFocus" }, - { "key": "ctrl+g", "command": "kb-macro.wrap", "args": { "command": "editor.action.inlineSuggest.hide" }, + { "key": "ctrl+g", "command": "kb-macro.wrap", "args": { "command": "editor.action.inlineSuggest.hide", "record": "side-effect" }, "when": "kb-macro.recording && inlineSuggestionVisible" }, { "key": "ctrl+g", "command": "kb-macro.wrap", "args": { "command": "editor.action.webvieweditor.hideFind" }, "when": "kb-macro.recording && webviewFindWidgetVisible && !editorFocus && activeEditor == 'WebviewEditor'" }, @@ -1123,7 +1123,7 @@ "when": "kb-macro.recording && commentEditorFocused" }, { "key": "ctrl+g", "command": "kb-macro.wrap", "args": { "command": "leaveEditorMessage" }, "when": "kb-macro.recording && messageVisible" }, - { "key": "ctrl+g", "command": "leaveSnippet", + { "key": "ctrl+g", "command": "kb-macro.wrap", "args": { "command": "leaveSnippet", "record": "side-effect" }, "when": "kb-macro.recording && editorTextFocus && inSnippetMode" }, { "key": "ctrl+g", "command": "kb-macro.wrap", "args": { "command": "closeDirtyDiff" }, "when": "kb-macro.recording && dirtyDiffVisible" }, @@ -1133,7 +1133,7 @@ "when": "kb-macro.recording && notificationToastsVisible" }, { "key": "ctrl+g", "command": "kb-macro.wrap", "args": { "command": "closeParameterHints" }, "when": "kb-macro.recording && editorFocus && parameterHintsVisible" }, - { "key": "ctrl+g", "command": "hideSuggestWidget", + { "key": "ctrl+g", "command": "kb-macro.wrap", "args": { "command": "hideSuggestWidget", "record": "side-effect" }, "when": "kb-macro.recording && suggestWidgetVisible && textInputFocus" }, { "key": "ctrl+g", "command": "kb-macro.wrap", "args": { "command": "cancelLinkedEditingInput" }, "when": "kb-macro.recording && LinkedEditingInputVisible && editorTextFocus" }, @@ -1415,29 +1415,29 @@ "when": "kb-macro.recording && emacs-mcx.inRectMarkMode && editorTextFocus && !editorReadonly" }, { "key": "~", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.typeChar", "args": [ "~" ], "await": "document selection" }, "when": "kb-macro.recording && emacs-mcx.inRectMarkMode && editorTextFocus && !editorReadonly" }, - { "key": "ctrl+'", "command": "editor.action.triggerSuggest", + { "key": "ctrl+'", "command": "kb-macro.wrap", "args": { "command": "editor.action.triggerSuggest", "record": "side-effect" }, "when": "kb-macro.recording && editorTextFocus" }, - { "key": "ctrl+'", "command": "toggleSuggestionDetails", + { "key": "ctrl+'", "command": "kb-macro.wrap", "args": { "command": "toggleSuggestionDetails", "record": "side-effect" }, "when": "kb-macro.recording && editorTextFocus && suggestWidgetVisible" }, - { "key": "alt+/", "command": "editor.action.triggerSuggest", + { "key": "alt+/", "command": "kb-macro.wrap", "args": { "command": "editor.action.triggerSuggest", "record": "side-effect" }, "when": "kb-macro.recording && editorTextFocus && !config.emacs-mcx.useMetaPrefixMacCmd" }, - { "key": "cmd+/", "command": "editor.action.triggerSuggest", + { "key": "cmd+/", "command": "kb-macro.wrap", "args": { "command": "editor.action.triggerSuggest", "record": "side-effect" }, "when": "kb-macro.recording && isMac && editorTextFocus && config.emacs-mcx.useMetaPrefixMacCmd" }, - { "key": "alt+/", "command": "editor.action.triggerSuggest", + { "key": "alt+/", "command": "kb-macro.wrap", "args": { "command": "editor.action.triggerSuggest", "record": "side-effect" }, "when": "kb-macro.recording && !isMac && editorTextFocus && config.emacs-mcx.useMetaPrefixMacCmd" }, - { "key": "escape /", "command": "editor.action.triggerSuggest", + { "key": "escape /", "command": "kb-macro.wrap", "args": { "command": "editor.action.triggerSuggest", "record": "side-effect" }, "when": "kb-macro.recording && editorTextFocus && config.emacs-mcx.useMetaPrefixEscape" }, - { "key": "ctrl+[ /", "command": "editor.action.triggerSuggest", + { "key": "ctrl+[ /", "command": "kb-macro.wrap", "args": { "command": "editor.action.triggerSuggest", "record": "side-effect" }, "when": "kb-macro.recording && editorTextFocus && config.emacs-mcx.useMetaPrefixCtrlLeftBracket" }, - { "key": "alt+/", "command": "toggleSuggestionDetails", + { "key": "alt+/", "command": "kb-macro.wrap", "args": { "command": "toggleSuggestionDetails", "record": "side-effect" }, "when": "kb-macro.recording && editorTextFocus && suggestWidgetVisible && !config.emacs-mcx.useMetaPrefixMacCmd" }, - { "key": "cmd+/", "command": "toggleSuggestionDetails", + { "key": "cmd+/", "command": "kb-macro.wrap", "args": { "command": "toggleSuggestionDetails", "record": "side-effect" }, "when": "kb-macro.recording && isMac && editorTextFocus && suggestWidgetVisible && config.emacs-mcx.useMetaPrefixMacCmd" }, - { "key": "alt+/", "command": "toggleSuggestionDetails", + { "key": "alt+/", "command": "kb-macro.wrap", "args": { "command": "toggleSuggestionDetails", "record": "side-effect" }, "when": "kb-macro.recording && !isMac && editorTextFocus && suggestWidgetVisible && config.emacs-mcx.useMetaPrefixMacCmd" }, - { "key": "escape /", "command": "toggleSuggestionDetails", + { "key": "escape /", "command": "kb-macro.wrap", "args": { "command": "toggleSuggestionDetails", "record": "side-effect" }, "when": "kb-macro.recording && editorTextFocus && suggestWidgetVisible && config.emacs-mcx.useMetaPrefixEscape" }, - { "key": "ctrl+[ /", "command": "toggleSuggestionDetails", + { "key": "ctrl+[ /", "command": "kb-macro.wrap", "args": { "command": "toggleSuggestionDetails", "record": "side-effect" }, "when": "kb-macro.recording && editorTextFocus && suggestWidgetVisible && config.emacs-mcx.useMetaPrefixCtrlLeftBracket" }, { "key": "alt+x", "command": "workbench.action.showCommands", "when": "kb-macro.recording && !config.emacs-mcx.useMetaPrefixMacCmd" }, diff --git a/package.json b/package.json index 496a5491..6f2c91c1 100644 --- a/package.json +++ b/package.json @@ -191,7 +191,11 @@ }, { "key": "shift+escape", - "command": "leaveSnippet", + "command": "kb-macro.wrap", + "args": { + "command": "leaveSnippet", + "record": "side-effect" + }, "when": "kb-macro.recording && editorTextFocus && inSnippetMode" }, { @@ -220,7 +224,11 @@ }, { "key": "shift+escape", - "command": "hideSuggestWidget", + "command": "kb-macro.wrap", + "args": { + "command": "hideSuggestWidget", + "record": "side-effect" + }, "when": "kb-macro.recording && suggestWidgetVisible && textInputFocus" }, { @@ -331,7 +339,8 @@ "key": "escape", "command": "kb-macro.wrap", "args": { - "command": "editor.action.inlineSuggest.hide" + "command": "editor.action.inlineSuggest.hide", + "record": "side-effect" }, "when": "kb-macro.recording && inlineSuggestionVisible" }, @@ -425,7 +434,11 @@ }, { "key": "escape", - "command": "leaveSnippet", + "command": "kb-macro.wrap", + "args": { + "command": "leaveSnippet", + "record": "side-effect" + }, "when": "kb-macro.recording && editorTextFocus && inSnippetMode" }, { @@ -462,7 +475,11 @@ }, { "key": "escape", - "command": "hideSuggestWidget", + "command": "kb-macro.wrap", + "args": { + "command": "hideSuggestWidget", + "record": "side-effect" + }, "when": "kb-macro.recording && suggestWidgetVisible && textInputFocus" }, { @@ -668,7 +685,11 @@ }, { "key": "cmd+down", - "command": "selectNextSuggestion", + "command": "kb-macro.wrap", + "args": { + "command": "selectNextSuggestion", + "record": "side-effect" + }, "when": "kb-macro.recording && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus" }, { @@ -753,7 +774,11 @@ }, { "key": "down", - "command": "selectNextSuggestion", + "command": "kb-macro.wrap", + "args": { + "command": "selectNextSuggestion", + "record": "side-effect" + }, "when": "kb-macro.recording && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus" }, { @@ -1101,7 +1126,11 @@ }, { "key": "pagedown", - "command": "selectNextPageSuggestion", + "command": "kb-macro.wrap", + "args": { + "command": "selectNextPageSuggestion", + "record": "side-effect" + }, "when": "kb-macro.recording && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus" }, { @@ -1179,7 +1208,11 @@ }, { "key": "pageup", - "command": "selectPrevPageSuggestion", + "command": "kb-macro.wrap", + "args": { + "command": "selectPrevPageSuggestion", + "record": "side-effect" + }, "when": "kb-macro.recording && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus" }, { @@ -1330,7 +1363,11 @@ }, { "key": "cmd+up", - "command": "selectPrevSuggestion", + "command": "kb-macro.wrap", + "args": { + "command": "selectPrevSuggestion", + "record": "side-effect" + }, "when": "kb-macro.recording && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus" }, { @@ -1399,7 +1436,11 @@ }, { "key": "up", - "command": "selectPrevSuggestion", + "command": "kb-macro.wrap", + "args": { + "command": "selectPrevSuggestion", + "record": "side-effect" + }, "when": "kb-macro.recording && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus" }, { @@ -1714,19 +1755,28 @@ }, { "key": "shift+tab", - "command": "jumpToPrevSnippetPlaceholder", + "command": "kb-macro.wrap", + "args": { + "command": "jumpToPrevSnippetPlaceholder", + "record": "side-effect" + }, "when": "kb-macro.recording && editorTextFocus && hasPrevTabstop && inSnippetMode" }, { "key": "shift+tab", - "command": "acceptAlternativeSelectedSuggestion", + "command": "kb-macro.wrap", + "args": { + "command": "acceptAlternativeSelectedSuggestion", + "record": "side-effect" + }, "when": "kb-macro.recording && suggestWidgetVisible && textInputFocus" }, { "key": "shift+tab", "command": "kb-macro.wrap", "args": { - "command": "insertPrevSuggestion" + "command": "insertPrevSuggestion", + "record": "side-effect" }, "when": "kb-macro.recording && hasOtherSuggestions && textInputFocus && !inSnippetMode && !suggestWidgetVisible && config.editor.tabCompletion == 'on'" }, @@ -1757,7 +1807,11 @@ }, { "key": "ctrl+down", - "command": "selectNextSuggestion", + "command": "kb-macro.wrap", + "args": { + "command": "selectNextSuggestion", + "record": "side-effect" + }, "when": "kb-macro.recording && !isMac && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus" }, { @@ -1864,7 +1918,11 @@ }, { "key": "ctrl+up", - "command": "selectPrevSuggestion", + "command": "kb-macro.wrap", + "args": { + "command": "selectPrevSuggestion", + "record": "side-effect" + }, "when": "kb-macro.recording && !isMac && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus" }, { @@ -1956,17 +2014,29 @@ }, { "key": "tab", - "command": "insertSnippet", + "command": "kb-macro.wrap", + "args": { + "command": "insertSnippet", + "record": "side-effect" + }, "when": "kb-macro.recording && editorTextFocus && hasSnippetCompletions && !editorTabMovesFocus && !inSnippetMode" }, { "key": "tab", - "command": "jumpToNextSnippetPlaceholder", + "command": "kb-macro.wrap", + "args": { + "command": "jumpToNextSnippetPlaceholder", + "record": "side-effect" + }, "when": "kb-macro.recording && editorTextFocus && hasNextTabstop && inSnippetMode" }, { "key": "tab", - "command": "acceptSelectedSuggestion", + "command": "kb-macro.wrap", + "args": { + "command": "acceptSelectedSuggestion", + "record": "side-effect" + }, "when": "kb-macro.recording && suggestWidgetVisible && textInputFocus" }, { @@ -1981,7 +2051,8 @@ "key": "tab", "command": "kb-macro.wrap", "args": { - "command": "insertNextSuggestion" + "command": "insertNextSuggestion", + "record": "side-effect" }, "when": "kb-macro.recording && hasOtherSuggestions && textInputFocus && !inSnippetMode && !suggestWidgetVisible && config.editor.tabCompletion == 'on'" }, @@ -1989,7 +2060,8 @@ "key": "tab", "command": "kb-macro.wrap", "args": { - "command": "editor.action.inlineSuggest.commit" + "command": "editor.action.inlineSuggest.commit", + "record": "side-effect" }, "when": "kb-macro.recording && inlineSuggestionHasIndentationLessThanTabSize && inlineSuggestionVisible && !editorTabMovesFocus" }, @@ -2132,7 +2204,11 @@ }, { "key": "shift+enter", - "command": "acceptAlternativeSelectedSuggestion", + "command": "kb-macro.wrap", + "args": { + "command": "acceptAlternativeSelectedSuggestion", + "record": "side-effect" + }, "when": "kb-macro.recording && suggestWidgetVisible && textInputFocus" }, { @@ -2437,7 +2513,11 @@ }, { "key": "enter", - "command": "acceptSelectedSuggestion", + "command": "kb-macro.wrap", + "args": { + "command": "acceptSelectedSuggestion", + "record": "side-effect" + }, "when": "kb-macro.recording && acceptSuggestionOnEnter && suggestWidgetVisible && suggestionMakesTextEdit && textInputFocus" }, { @@ -2945,9 +3025,13 @@ }, { "key": "ctrl+/", - "command": "toggleExplainMode", - "when": "kb-macro.recording && suggestWidgetVisible", - "mac": "cmd+/" + "mac": "cmd+/", + "command": "kb-macro.wrap", + "args": { + "command": "toggleExplainMode", + "record": "side-effect" + }, + "when": "kb-macro.recording && suggestWidgetVisible" }, { "key": "ctrl+/", @@ -3190,7 +3274,8 @@ "key": "alt+]", "command": "kb-macro.wrap", "args": { - "command": "editor.action.inlineSuggest.showNext" + "command": "editor.action.inlineSuggest.showNext", + "record": "side-effect" }, "when": "kb-macro.recording && inlineSuggestionVisible && !editorReadonly" }, @@ -3198,7 +3283,8 @@ "key": "alt+[", "command": "kb-macro.wrap", "args": { - "command": "editor.action.inlineSuggest.showPrevious" + "command": "editor.action.inlineSuggest.showPrevious", + "record": "side-effect" }, "when": "kb-macro.recording && inlineSuggestionVisible && !editorReadonly" }, @@ -3914,24 +4000,40 @@ }, { "key": "ctrl+i", - "command": "editor.action.triggerSuggest", - "when": "kb-macro.recording && editorHasCompletionItemProvider && textInputFocus && !editorReadonly", - "mac": "cmd+i" + "mac": "cmd+i", + "command": "kb-macro.wrap", + "args": { + "command": "editor.action.triggerSuggest", + "record": "side-effect" + }, + "when": "kb-macro.recording && editorHasCompletionItemProvider && textInputFocus && !editorReadonly" }, { "key": "ctrl+i", - "command": "toggleSuggestionDetails", - "when": "kb-macro.recording && suggestWidgetVisible && textInputFocus", - "mac": "cmd+i" + "mac": "cmd+i", + "command": "kb-macro.wrap", + "args": { + "command": "toggleSuggestionDetails", + "record": "side-effect" + }, + "when": "kb-macro.recording && suggestWidgetVisible && textInputFocus" }, { "key": "ctrl+space", - "command": "editor.action.triggerSuggest", + "command": "kb-macro.wrap", + "args": { + "command": "editor.action.triggerSuggest", + "record": "side-effect" + }, "when": "kb-macro.recording && editorHasCompletionItemProvider && textInputFocus && !editorReadonly" }, { "key": "ctrl+space", - "command": "toggleSuggestionDetails", + "command": "kb-macro.wrap", + "args": { + "command": "toggleSuggestionDetails", + "record": "side-effect" + }, "when": "kb-macro.recording && suggestWidgetVisible && textInputFocus" }, { @@ -4438,9 +4540,13 @@ }, { "key": "ctrl+pagedown", - "command": "selectNextPageSuggestion", - "when": "kb-macro.recording && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus", - "mac": "cmd+pagedown" + "mac": "cmd+pagedown", + "command": "kb-macro.wrap", + "args": { + "command": "selectNextPageSuggestion", + "record": "side-effect" + }, + "when": "kb-macro.recording && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus" }, { "key": "ctrl+pagedown", @@ -4462,9 +4568,13 @@ }, { "key": "ctrl+pageup", - "command": "selectPrevPageSuggestion", - "when": "kb-macro.recording && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus", - "mac": "cmd+pageup" + "mac": "cmd+pageup", + "command": "kb-macro.wrap", + "args": { + "command": "selectPrevPageSuggestion", + "record": "side-effect" + }, + "when": "kb-macro.recording && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus" }, { "key": "ctrl+pageup", @@ -4486,7 +4596,11 @@ }, { "key": "ctrl+alt+space", - "command": "toggleSuggestionFocus", + "command": "kb-macro.wrap", + "args": { + "command": "toggleSuggestionFocus", + "record": "side-effect" + }, "when": "kb-macro.recording && suggestWidgetVisible && textInputFocus" }, { @@ -6737,7 +6851,11 @@ }, { "key": "ctrl+n", - "command": "selectNextSuggestion", + "command": "kb-macro.wrap", + "args": { + "command": "selectNextSuggestion", + "record": "side-effect" + }, "when": "kb-macro.recording && isMac && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus" }, { @@ -6875,7 +6993,11 @@ }, { "key": "ctrl+p", - "command": "selectPrevSuggestion", + "command": "kb-macro.wrap", + "args": { + "command": "selectPrevSuggestion", + "record": "side-effect" + }, "when": "kb-macro.recording && isMac && suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus" }, { @@ -7407,7 +7529,11 @@ }, { "key": "alt+escape", - "command": "editor.action.triggerSuggest", + "command": "kb-macro.wrap", + "args": { + "command": "editor.action.triggerSuggest", + "record": "side-effect" + }, "when": "kb-macro.recording && isMac && editorHasCompletionItemProvider && textInputFocus && !editorReadonly" }, {