diff --git a/software/scripts/sublime-text-keybindings.js b/software/scripts/sublime-text-keybindings.js index 70c1d224..f27845a6 100644 --- a/software/scripts/sublime-text-keybindings.js +++ b/software/scripts/sublime-text-keybindings.js @@ -37,6 +37,7 @@ async function doInit() { WINDOWS_ONLY_KEY_BINDINGS = parseJsonWithComments(await fetchUrlAsString('software/scripts/sublime-text-keybindings.windows.json')) || []; LINUX_ONLY_KEYBINDING = parseJsonWithComments(await fetchUrlAsString('software/scripts/sublime-text-keybindings.linux.json')) || []; + LINUX_ONLY_KEYBINDING = [...LINUX_ONLY_KEYBINDING, ...WINDOWS_ONLY_KEY_BINDINGS]; MAC_ONLY_KEY_BINDINGS = parseJsonWithComments(await fetchUrlAsString('software/scripts/sublime-text-keybindings.mac.json')) || []; // begin COMMON_KEY_BINDINGS diff --git a/software/scripts/sublime-text-keybindings.linux.json b/software/scripts/sublime-text-keybindings.linux.json index 2a41a382..fe51488c 100644 --- a/software/scripts/sublime-text-keybindings.linux.json +++ b/software/scripts/sublime-text-keybindings.linux.json @@ -1,259 +1 @@ -[ - { - "key": "alt+r", - "command": "show_overlay", - "args": { - "overlay": "goto", - "text": "@" - } - }, - { - "key": "alt+p", - "command": "show_overlay", - "args": { - "overlay": "goto", - "show_files": true - } - }, - { - "key": "alt+shift+p", - "command": "show_overlay", - "args": { - "overlay": "command_palette" - } - }, - { - "key": "alt+ctrl+p", - "command": "prompt_select_workspace" - }, - { - "key": "alt+shift+g", - "command": "find_prev" - }, - { - "key": "alt+g", - "command": "find_next" - }, - { - "key": "ctrl+up", - "command": "move", - "args": { - "by": "pages", - "forward": false - } - }, - { - "key": "ctrl+down", - "command": "move", - "args": { - "by": "pages", - "forward": true - } - }, - { - "key": "alt+shift+l", - "command": "split_selection_into_lines" - }, - { - "key": "alt+shift+[", - "command": "prev_view" - }, - { - "key": "alt+shift+]", - "command": "next_view" - }, - { - "key": "alt+shift+a", - "command": "alignment" - }, - { - "key": "alt+x", - "command": "cut" - }, - { - "key": "alt+c", - "command": "copy" - }, - { - "key": "alt+v", - "command": "paste" - }, - { - "key": "alt+a", - "command": "select_all" - }, - { - "key": "alt+z", - "command": "undo" - }, - { - "key": "alt+s", - "command": "save" - }, - { - "key": "alt+shift+s", - "command": "prompt_save_as" - }, - { - "key": "alt+backspace", - "command": "left_delete" - }, - { - "key": "alt+=", - "command": "increase_font_size" - }, - { - "key": "alt+keypad_plus", - "command": "increase_font_size" - }, - { - "key": "alt+-", - "command": "decrease_font_size" - }, - { - "key": "alt+keypad_minus", - "command": "decrease_font_size" - }, - { - "key": "alt+d", - "command": "find_under_expand" - }, - { - "key": "alt+shift+n", - "command": "new_window" - }, - { - "key": "alt+n", - "command": "new_file" - }, - { - "key": "alt+w", - "command": "close" - }, - { - "key": "alt+y", - "command": "redo_or_repeat" - }, - { - "key": "alt+up", - "command": "move", - "args": { - "by": "pages", - "forward": false - } - }, - { - "key": "alt+down", - "command": "move", - "args": { - "by": "pages", - "forward": true - } - }, - { - "key": "alt+left", - "command": "move_to", - "args": { - "to": "bol", - "extend": false - } - }, - { - "key": "alt+right", - "command": "move_to", - "args": { - "to": "eol", - "extend": false - } - }, - { - "key": "shift+alt+left", - "command": "move_to", - "args": { - "to": "bol", - "extend": true - } - }, - { - "key": "shift+alt+right", - "command": "move_to", - "args": { - "to": "eol", - "extend": true - } - }, - { - "key": "ctrl+alt+left", - "command": "move_to", - "args": { - "to": "bof", - "extend": false - } - }, - { - "key": "ctrl+alt+right", - "command": "move_to", - "args": { - "to": "eof", - "extend": false - } - }, - { - "key": "ctrl+alt+up", - "command": "move_to", - "args": { - "to": "bof", - "extend": false - } - }, - { - "key": "ctrl+alt+down", - "command": "move_to", - "args": { - "to": "eof", - "extend": false - } - }, - { - "key": "ctrl+alt+shift+up", - "command": "move_to", - "args": { - "to": "bof", - "extend": true - } - }, - { - "key": "ctrl+alt+shift+down", - "command": "move_to", - "args": { - "to": "eof", - "extend": true - } - }, - { - "key": "shift+alt+up", - "command": "move", - "args": { - "by": "pages", - "forward": false, - "extend": true - } - }, - { - "key": "shift+alt+down", - "command": "move", - "args": { - "by": "pages", - "forward": true, - "extend": true - } - }, - { - "key": "alt+/", - "command": "toggle_comment", - "args": { - "block": false - } - }, - { "key": "shift+alt+z", "command": "redo_or_repeat" } -] +[] diff --git a/software/scripts/vs-code-keybindings.js b/software/scripts/vs-code-keybindings.js index 52cdb1ac..b72713e7 100644 --- a/software/scripts/vs-code-keybindings.js +++ b/software/scripts/vs-code-keybindings.js @@ -155,7 +155,11 @@ async function doWork() { // write to build file writeToBuildFile([ ['vs-code-keybindings-windows', _formatKey([...COMMON_KEY_BINDINGS, ...WINDOWS_ONLY_KEY_BINDINGS], WINDOWS_OS_KEY), true], - ['vs-code-keybindings-linux', _formatKey([...COMMON_KEY_BINDINGS, ...LINUX_ONLY_KEYBINDING], LINUX_OS_KEY), true], + [ + 'vs-code-keybindings-linux', + _formatKey([...COMMON_KEY_BINDINGS, ...WINDOWS_ONLY_KEY_BINDINGS, ...LINUX_ONLY_KEYBINDING], LINUX_OS_KEY), + true, + ], ['vs-code-keybindings-macosx', _formatKey([...COMMON_KEY_BINDINGS, ...MAC_ONLY_KEY_BINDINGS], MAC_OSX_KEY), true], ]); diff --git a/software/scripts/vs-code-keybindings.linux.json b/software/scripts/vs-code-keybindings.linux.json index 62a341cf..fe51488c 100644 --- a/software/scripts/vs-code-keybindings.linux.json +++ b/software/scripts/vs-code-keybindings.linux.json @@ -1,273 +1 @@ -[ - { - "key": "alt+shift+p", - "command": "workbench.action.showCommands" - }, - { - "key": "alt+p", - "command": "workbench.action.quickOpen" - }, - { - "key": "alt+right", - "command": "cursorEnd", - "when": "textInputFocus" - }, - { - "key": "alt+left", - "command": "cursorHome", - "when": "textInputFocus" - }, - { - "key": "alt+shift+h", - "command": "workbench.action.replaceInFiles" - }, - { - "key": "alt+a", - "command": "editor.action.selectAll" - }, - { - "key": "alt+a", - "command": "editor.action.webvieweditor.selectAll", - "when": "!editorFocus && !inputFocus && activeEditor == 'WebviewEditor'" - }, - { - "key": "alt+a", - "command": "list.selectAll", - "when": "listFocus && listSupportsMultiselect && !inputFocus" - }, - { - "key": "alt+c", - "command": "editor.action.clipboardCopyAction" - }, - { - "key": "alt+c", - "command": "workbench.action.terminal.copySelection", - "when": "terminalTextSelectedInFocused || terminalFocus && terminalHasBeenCreated && terminalTextSelected || terminalFocus && terminalProcessSupported && terminalTextSelected || terminalFocus && terminalTextSelected && terminalTextSelectedInFocused || terminalHasBeenCreated && terminalTextSelected && terminalTextSelectedInFocused || terminalProcessSupported && terminalTextSelected && terminalTextSelectedInFocused" - }, - { - "key": "alt+c", - "command": "keybindings.editor.copyKeybindingEntry", - "when": "inKeybindings && keybindingFocus && !whenFocus" - }, - { - "key": "alt+c", - "command": "problems.action.copy", - "when": "problemsVisibility && !relatedInformationFocus && focusedView == 'workbench.panel.markers.view'" - }, - { - "key": "alt+c", - "command": "remote.tunnel.copyAddressInline", - "when": "tunnelViewFocus && tunnelType == 'Detected' && tunnelViewMultiSelection == 'undefined' || tunnelViewFocus && tunnelType == 'Forwarded' && tunnelViewMultiSelection == 'undefined'" - }, - { - "key": "alt+c", - "command": "search.action.copyMatch", - "when": "fileMatchOrMatchFocus" - }, - { - "key": "alt+c", - "command": "filesExplorer.copy", - "when": "filesExplorerFocus && foldersViewVisible && !explorerResourceIsRoot && !inputFocus" - }, - { - "key": "alt+x", - "command": "editor.action.clipboardCutAction" - }, - { - "key": "alt+v", - "command": "editor.action.clipboardPasteAction" - }, - { - "key": "alt+v", - "command": "workbench.action.terminal.sendSequence", - "when": "terminalFocus && !accessibilityModeEnabled && terminalShellType == 'pwsh'" - }, - { - "key": "alt+v", - "command": "filesExplorer.paste", - "when": "filesExplorerFocus && foldersViewVisible && !explorerResourceReadonly && !inputFocus" - }, - { - "key": "alt+v", - "command": "workbench.action.terminal.paste", - "when": "terminalFocus && terminalHasBeenCreated || terminalFocus && terminalProcessSupported" - }, - { - "key": "alt+s", - "command": "workbench.action.files.save" - }, - { - "key": "alt+l", - "command": "expandLineSelection" - }, - { - "key": "alt+shift+s", - "command": "workbench.action.files.saveAll" - }, - { - "key": "alt+z", - "command": "undo", - "when": "textInputFocus && !editorReadonly" - }, - { - "key": "alt+shift+z", - "command": "redo", - "when": "textInputFocus && !editorReadonly" - }, - { - "key": "alt+y", - "command": "redo", - "when": "textInputFocus && !editorReadonly" - }, - { - "key": "alt+ctrl+c", - "command": "workbench.files.action.compareWithSaved" - }, - { - "key": "alt+shift+]", - "command": "workbench.action.nextEditor" - }, - { - "key": "alt+shift+[", - "command": "workbench.action.previousEditor" - }, - { - "key": "alt+w", - "command": "workbench.action.closeActiveEditor" - }, - { - "key": "alt+d", - "command": "workbench.action.splitEditor" - }, - { - "key": "alt+shift+d", - "command": "workbench.action.splitEditorDown" - }, - { - "key": "alt+down", - "command": "cursorPageDown", - "when": "textInputFocus" - }, - { - "key": "alt+up", - "command": "cursorPageUp", - "when": "textInputFocus" - }, - { - "key": "alt+shift+up", - "command": "cursorPageUpSelect", - "when": "textInputFocus" - }, - { - "key": "alt+shift+down", - "command": "cursorPageDownSelect", - "when": "textInputFocus" - }, - { - "key": "alt+shift+left", - "command": "cursorHomeSelect", - "when": "textInputFocus" - }, - { - "key": "alt+shift+right", - "command": "cursorEndSelect", - "when": "textInputFocus", - "args": { - "sticky": false - } - }, - { - "key": "alt+ctrl+left", - "command": "cursorTop", - "when": "textInputFocus" - }, - { - "key": "alt+ctrl+up", - "command": "cursorTop", - "when": "textInputFocus" - }, - { - "key": "alt+ctrl+shift+up", - "command": "cursorTopSelect", - "when": "textInputFocus" - }, - { - "key": "alt+ctrl+right", - "command": "cursorBottom", - "when": "textInputFocus" - }, - { - "key": "alt+ctrl+down", - "command": "cursorBottom", - "when": "textInputFocus" - }, - { - "key": "alt+ctrl+shift+down", - "command": "cursorBottomSelect", - "when": "textInputFocus" - }, - { - "key": "alt+ctrl+shift+left", - "command": "cursorTopSelect", - "when": "textInputFocus" - }, - { - "key": "alt+ctrl+shift+right", - "command": "cursorBottomSelect", - "when": "textInputFocus" - }, - { - "key": "alt+n", - "command": "workbench.action.files.newUntitledFile" - }, - { - "key": "alt+shift+n", - "command": "workbench.action.newWindow" - }, - { - "key": "alt+d", - "command": "editor.action.addSelectionToNextFindMatch" - }, - { - "key": "alt+/", - "command": "editor.action.commentLine", - "when": "editorTextFocus && !editorReadonly" - }, - { - "key": "alt+[", - "command": "editor.action.outdentLines", - "when": "editorTextFocus && !editorReadonly" - }, - { - "key": "alt+]", - "command": "editor.action.indentLines", - "when": "editorTextFocus && !editorReadonly" - }, - { - "key": "alt+=", - "command": "workbench.action.zoomIn" - }, - { - "key": "alt+-", - "command": "workbench.action.zoomOut" - }, - { - "key": "alt+o", - "command": "workbench.action.files.openFile" - }, - { - "key": "alt+`", - "command": "workbench.action.terminal.toggleTerminal", - "when": "terminal.active" - }, - { - "key": "alt+g", - "command": "editor.action.moveSelectionToNextFindMatch", - "when": "editorFocus" - }, - { - "key": "alt+shift+g", - "command": "editor.action.moveSelectionToPreviousFindMatch", - "when": "editorFocus" - } -] +[]