diff --git a/resource/default/Linux/VSCode.json b/resource/default/Linux/VSCode.json index d2b9965..dd9c2a7 100644 --- a/resource/default/Linux/VSCode.json +++ b/resource/default/Linux/VSCode.json @@ -2,12 +2,12 @@ { "key": "shift+tab", "command": "acceptAlternativeSelectedSuggestion", - "when": "suggestWidgetVisible && textInputFocus && textInputFocus" + "when": "suggestWidgetVisible && textInputFocus" }, { "key": "shift+enter", "command": "acceptAlternativeSelectedSuggestion", - "when": "suggestWidgetVisible && textInputFocus && textInputFocus" + "when": "suggestWidgetVisible && textInputFocus" }, { "key": "tab", @@ -36,7 +36,8 @@ }, { "key": "ctrl+n", - "command": "workbench.action.files.newUntitledFile" + "command": "workbench.action.files.newUntitledFile", + "when": "(!editorHasCodeActionsProvider && editorTextFocus) || !editorTextFocus" }, { "key": "ctrl+/", @@ -75,12 +76,13 @@ }, { "key": "ctrl+x", - "command": "editor.action.clipboardCutAction" + "command": "editor.action.clipboardCutAction", + "when": "editorTextFocus && !editorReadonly" }, { "key": "ctrl+shift+alt+down", "command": "editor.action.copyLinesDownAction", - "when": "editorTextFocus && !editorReadonly" + "when": "editorTextFocus && !editorReadonly && !editorHasSelection" }, { "key": "", @@ -105,17 +107,67 @@ { "key": "ctrl+enter", "command": "editor.action.insertLineAfter", - "when": "editorTextFocus && !editorReadonly" + "when": "editorTextFocus && !editorReadonly && !notebookEditorFocused" + }, + { + "key": "ctrl+right", + "command": "cursorWordRight", + "when": "editorTextFocus && !inlineSuggestionVisible && !config.intellij-idea-keybindings.useCamelHumpsWords" + }, + { + "key": "ctrl+right", + "command": "cursorWordPartRight", + "when": "editorTextFocus && !inlineSuggestionVisible && config.intellij-idea-keybindings.useCamelHumpsWords" + }, + { + "key": "ctrl+left", + "command": "cursorWordLeft", + "when": "editorTextFocus && !config.intellij-idea-keybindings.useCamelHumpsWords" + }, + { + "key": "ctrl+left", + "command": "cursorWordPartStartLeft", + "when": "editorTextFocus && config.intellij-idea-keybindings.useCamelHumpsWords" + }, + { + "key": "ctrl+shift+right", + "command": "cursorWordRightSelect", + "when": "editorTextFocus && !config.intellij-idea-keybindings.useCamelHumpsWords" + }, + { + "key": "ctrl+shift+right", + "command": "cursorWordPartRightSelect", + "when": "editorTextFocus && config.intellij-idea-keybindings.useCamelHumpsWords" + }, + { + "key": "ctrl+shift+left", + "command": "cursorWordLeftSelect", + "when": "editorTextFocus && !config.intellij-idea-keybindings.useCamelHumpsWords" + }, + { + "key": "ctrl+shift+left", + "command": "cursorWordPartStartLeftSelect", + "when": "editorTextFocus && config.intellij-idea-keybindings.useCamelHumpsWords" }, { "key": "ctrl+delete", "command": "deleteWordRight", - "when": "textInputFocus && !editorReadonly" + "when": "textInputFocus && !editorReadonly && !config.intellij-idea-keybindings.useCamelHumpsWords" + }, + { + "key": "ctrl+delete", + "command": "deleteWordPartRight", + "when": "editorTextFocus && !editorReadonly && config.intellij-idea-keybindings.useCamelHumpsWords" }, { "key": "ctrl+backspace", "command": "deleteWordLeft", - "when": "textInputFocus && !editorReadonly" + "when": "textInputFocus && !editorReadonly && !config.intellij-idea-keybindings.useCamelHumpsWords" + }, + { + "key": "ctrl+backspace", + "command": "deleteWordPartLeft", + "when": "editorTextFocus && !editorReadonly && config.intellij-idea-keybindings.useCamelHumpsWords" }, { "key": "ctrl+shift+]", @@ -224,7 +276,8 @@ }, { "key": "", - "command": "workbench.action.tasks.reRunTask" + "command": "workbench.action.tasks.reRunTask", + "when": "taskCommandsRegistered && !terminalFocus" }, { "key": "ctrl+shift+d", @@ -233,7 +286,7 @@ { "key": "ctrl+f5", "command": "workbench.action.debug.run", - "when": "debuggersAvailable" + "when": "debuggersAvailable && !inDebugMode && !terminalFocus" }, { "key": "f10", @@ -263,7 +316,7 @@ { "key": "", "command": "editor.debug.action.selectionToRepl", - "when": "debuggersAvailable && editorHasSelection" + "when": "debuggersAvailable && editorTextFocus && editorHasSelection" }, { "key": "f5", @@ -276,8 +329,8 @@ "when": "debuggersAvailable && editorTextFocus" }, { - "key": "ctrl+shift+d", - "command": "workbench.view.debug" + "key": "ctrl+shift+f8", + "command": "workbench.debug.action.focusBreakpointsView" }, { "key": "ctrl+t", @@ -312,7 +365,8 @@ }, { "key": "ctrl+b", - "command": "workbench.action.toggleSidebarVisibility" + "command": "workbench.action.toggleSidebarVisibility", + "when": "!editorFocus && !terminalFocus && !problemFocus && !inDebugRepl" }, { "key": "ctrl+shift+m", @@ -337,11 +391,13 @@ }, { "key": "ctrl+alt+-", - "command": "workbench.action.navigateBack" + "command": "workbench.action.navigateBack", + "when": "canNavigateBack" }, { "key": "ctrl+shift+-", - "command": "workbench.action.navigateForward" + "command": "workbench.action.navigateForward", + "when": "canNavigateForward" }, { "key": "ctrl+k ctrl+q", @@ -418,7 +474,7 @@ { "key": "f2", "command": "renameFile", - "when": "explorerViewletVisible && filesExplorerFocus && !explorerResourceIsRoot && !explorerResourceReadonly && !inputFocus" + "when": "explorerViewletVisible && filesExplorerFocus" }, { "key": "", @@ -445,15 +501,18 @@ }, { "key": "ctrl+shift+e", - "command": "workbench.view.explorer" + "command": "workbench.view.explorer", + "when": "!explorerViewletFocus" }, { "key": "ctrl+b", - "command": "workbench.action.toggleSidebarVisibility" + "command": "workbench.action.toggleSidebarVisibility", + "when": "explorerViewletFocus" }, { "key": "ctrl+shift+g", - "command": "workbench.view.scm" + "command": "workbench.view.scm", + "when": "activeViewlet != 'workbench.view.scm'" }, { "key": "", @@ -489,7 +548,8 @@ }, { "key": "", - "command": "workbench.action.quickOpenNavigateNext" + "command": "workbench.action.quickOpenNavigateNext", + "when": "inQuickOpen" }, { "key": "alt+f5", @@ -509,15 +569,17 @@ { "key": "ctrl+enter", "command": "editor.action.insertLineAfter", - "when": "editorTextFocus && !editorReadonly" + "when": "editorTextFocus && !editorReadonly && !suggestWidgetVisible" }, { "key": "", - "command": "workbench.action.terminal.focus" + "command": "workbench.action.terminal.focus", + "when": "!terminalFocus" }, { "key": "ctrl+`", - "command": "workbench.action.terminal.toggleTerminal" + "command": "workbench.action.terminal.toggleTerminal", + "when": "terminalFocus" }, { "key": "ctrl+shift+l", @@ -547,17 +609,17 @@ { "key": "enter", "command": "list.select", - "when": "listFocus && !inputFocus" + "when": "filesExplorerFocus && foldersViewVisible && !explorerResourceIsFolder && !inputFocus" }, { "key": "ctrl+shift+;", - "command": "breadcrumbs.focus", - "when": "breadcrumbsPossible" + "command": "breadcrumbs.focusAndSelect", + "when": "breadcrumbsPossible && breadcrumbsVisible" }, { "key": "ctrl+alt+c", "command": "copyFilePath", - "when": "!editorFocus" + "when": "!editorFocus && !terminalFocus" }, { "key": "ctrl+i", @@ -571,7 +633,8 @@ }, { "key": "ctrl+shift+f", - "command": "workbench.action.findInFiles" + "command": "workbench.action.findInFiles", + "when": "!explorerResourceIsFolder || !filesExplorerFocus" }, { "key": "ctrl+c", @@ -650,26 +713,11 @@ "command": "cursorBottomSelect", "when": "textInputFocus" }, - { - "key": "ctrl+home", - "command": "cursorTop", - "when": "textInputFocus" - }, { "key": "ctrl+shift+home", "command": "cursorTopSelect", "when": "textInputFocus" }, - { - "key": "", - "command": "cursorWordRight", - "when": "textInputFocus" - }, - { - "key": "", - "command": "cursorWordRightSelect", - "when": "textInputFocus" - }, { "key": "pagedown", "command": "cursorPageDown", @@ -690,20 +738,6 @@ "command": "cursorPageUpSelect", "when": "textInputFocus" }, - { - "key": "ctrl+left", - "command": "cursorWordLeft", - "when": "textInputFocus" - }, - { - "key": "ctrl+shift+left", - "command": "cursorWordLeftSelect", - "when": "textInputFocus" - }, - { - "key": "ctrl+n", - "command": "workbench.action.files.newUntitledFile" - }, { "key": "shift+alt+h", "command": "references-view.showCallHierarchy", @@ -717,6 +751,6 @@ { "key": "", "command": "java.action.showTypeHierarchy", - "when": "editorLangId == java && editorTextFocus" + "when": "editorLangId == java && javaLSReady && editorTextFocus" } ] \ No newline at end of file diff --git a/resource/default/Mac/VSCode.json b/resource/default/Mac/VSCode.json index 832cb08..e51111f 100644 --- a/resource/default/Mac/VSCode.json +++ b/resource/default/Mac/VSCode.json @@ -2,12 +2,12 @@ { "key": "shift+tab", "command": "acceptAlternativeSelectedSuggestion", - "when": "suggestWidgetVisible && textInputFocus && textInputFocus" + "when": "suggestWidgetVisible && textInputFocus" }, { "key": "shift+enter", "command": "acceptAlternativeSelectedSuggestion", - "when": "suggestWidgetVisible && textInputFocus && textInputFocus" + "when": "suggestWidgetVisible && textInputFocus" }, { "key": "tab", @@ -36,7 +36,8 @@ }, { "key": "cmd+n", - "command": "workbench.action.files.newUntitledFile" + "command": "workbench.action.files.newUntitledFile", + "when": "(!editorHasCodeActionsProvider && editorTextFocus) || !editorTextFocus" }, { "key": "cmd+/", @@ -86,7 +87,7 @@ { "key": "shift+alt+down", "command": "editor.action.copyLinesDownAction", - "when": "editorTextFocus && !editorReadonly" + "when": "editorTextFocus && !editorReadonly && !editorHasSelection" }, { "key": "", @@ -111,17 +112,67 @@ { "key": "cmd+enter", "command": "editor.action.insertLineAfter", - "when": "editorTextFocus && !editorReadonly" + "when": "editorTextFocus && !editorReadonly && !notebookEditorFocused" + }, + { + "key": "alt+right", + "command": "cursorWordRight", + "when": "editorTextFocus && !inlineSuggestionVisible && !config.intellij-idea-keybindings.useCamelHumpsWords" + }, + { + "key": "alt+right", + "command": "cursorWordPartRight", + "when": "editorTextFocus && !inlineSuggestionVisible && config.intellij-idea-keybindings.useCamelHumpsWords" + }, + { + "key": "alt+left", + "command": "cursorWordLeft", + "when": "editorTextFocus && !config.intellij-idea-keybindings.useCamelHumpsWords" + }, + { + "key": "alt+left", + "command": "cursorWordPartStartLeft", + "when": "editorTextFocus && config.intellij-idea-keybindings.useCamelHumpsWords" + }, + { + "key": "alt+shift+right", + "command": "cursorWordRightSelect", + "when": "editorTextFocus && !config.intellij-idea-keybindings.useCamelHumpsWords" + }, + { + "key": "alt+shift+right", + "command": "cursorWordPartRightSelect", + "when": "editorTextFocus && config.intellij-idea-keybindings.useCamelHumpsWords" + }, + { + "key": "alt+shift+left", + "command": "cursorWordLeftSelect", + "when": "editorTextFocus && !config.intellij-idea-keybindings.useCamelHumpsWords" + }, + { + "key": "alt+shift+left", + "command": "cursorWordPartStartLeftSelect", + "when": "editorTextFocus && config.intellij-idea-keybindings.useCamelHumpsWords" }, { "key": "alt+delete", "command": "deleteWordRight", - "when": "textInputFocus && !editorReadonly" + "when": "textInputFocus && !editorReadonly && !config.intellij-idea-keybindings.useCamelHumpsWords" + }, + { + "key": "alt+delete", + "command": "deleteWordPartRight", + "when": "editorTextFocus && !editorReadonly && config.intellij-idea-keybindings.useCamelHumpsWords" }, { "key": "alt+backspace", "command": "deleteWordLeft", - "when": "textInputFocus && !editorReadonly" + "when": "textInputFocus && !editorReadonly && !config.intellij-idea-keybindings.useCamelHumpsWords" + }, + { + "key": "alt+backspace", + "command": "deleteWordPartLeft", + "when": "editorTextFocus && !editorReadonly && config.intellij-idea-keybindings.useCamelHumpsWords" }, { "key": "alt+cmd+]", @@ -240,7 +291,8 @@ }, { "key": "", - "command": "workbench.action.tasks.reRunTask" + "command": "workbench.action.tasks.reRunTask", + "when": "taskCommandsRegistered && !terminalFocus" }, { "key": "shift+cmd+d", @@ -249,7 +301,7 @@ { "key": "ctrl+f5", "command": "workbench.action.debug.run", - "when": "debuggersAvailable" + "when": "debuggersAvailable && !inDebugMode && !terminalFocus" }, { "key": "f10", @@ -279,7 +331,7 @@ { "key": "", "command": "editor.debug.action.selectionToRepl", - "when": "debuggersAvailable && editorHasSelection" + "when": "debuggersAvailable && editorTextFocus && editorHasSelection" }, { "key": "f5", @@ -292,8 +344,8 @@ "when": "debuggersAvailable && editorTextFocus" }, { - "key": "shift+cmd+d", - "command": "workbench.view.debug" + "key": "cmd+shift+f8", + "command": "workbench.debug.action.focusBreakpointsView" }, { "key": "cmd+t", @@ -326,7 +378,8 @@ }, { "key": "cmd+b", - "command": "workbench.action.toggleSidebarVisibility" + "command": "workbench.action.toggleSidebarVisibility", + "when": "!editorFocus && !terminalFocus && !problemFocus && !inDebugRepl" }, { "key": "shift+cmd+m", @@ -352,11 +405,13 @@ }, { "key": "ctrl+-", - "command": "workbench.action.navigateBack" + "command": "workbench.action.navigateBack", + "when": "canNavigateBack" }, { "key": "ctrl+shift+-", - "command": "workbench.action.navigateForward" + "command": "workbench.action.navigateForward", + "when": "canNavigateForward" }, { "key": "cmd+k cmd+q", @@ -433,7 +488,7 @@ { "key": "enter", "command": "renameFile", - "when": "explorerViewletVisible && filesExplorerFocus && !explorerResourceIsRoot && !explorerResourceReadonly && !inputFocus" + "when": "explorerViewletVisible && filesExplorerFocus" }, { "key": "", @@ -460,11 +515,13 @@ }, { "key": "shift+cmd+e", - "command": "workbench.view.explorer" + "command": "workbench.view.explorer", + "when": "!explorerViewletFocus" }, { "key": "cmd+b", - "command": "workbench.action.toggleSidebarVisibility" + "command": "workbench.action.toggleSidebarVisibility", + "when": "explorerViewletFocus" }, { "key": "cmd+b", @@ -472,7 +529,8 @@ }, { "key": "ctrl+shift+g", - "command": "workbench.view.scm" + "command": "workbench.view.scm", + "when": "activeViewlet != 'workbench.view.scm'" }, { "key": "alt+cmd+s", @@ -508,7 +566,8 @@ }, { "key": "", - "command": "workbench.action.quickOpenNavigateNext" + "command": "workbench.action.quickOpenNavigateNext", + "when": "inQuickOpen" }, { "key": "alt+f5", @@ -528,15 +587,17 @@ { "key": "cmd+enter", "command": "editor.action.insertLineAfter", - "when": "editorTextFocus && !editorReadonly" + "when": "editorTextFocus && !editorReadonly && !suggestWidgetVisible" }, { "key": "", - "command": "workbench.action.terminal.focus" + "command": "workbench.action.terminal.focus", + "when": "!terminalFocus" }, { "key": "ctrl+`", - "command": "workbench.action.terminal.toggleTerminal" + "command": "workbench.action.terminal.toggleTerminal", + "when": "terminalFocus" }, { "key": "shift+cmd+l", @@ -566,22 +627,22 @@ { "key": "cmd+down", "command": "list.select", - "when": "listFocus && !inputFocus" + "when": "filesExplorerFocus && foldersViewVisible && !explorerResourceIsFolder && !inputFocus" }, { "key": "enter", "command": "list.select", - "when": "listFocus && !inputFocus" + "when": "filesExplorerFocus && foldersViewVisible && !explorerResourceIsFolder && !inputFocus" }, { "key": "shift+cmd+;", - "command": "breadcrumbs.focus", - "when": "breadcrumbsPossible" + "command": "breadcrumbs.focusAndSelect", + "when": "breadcrumbsPossible && breadcrumbsVisible" }, { "key": "alt+cmd+c", "command": "copyFilePath", - "when": "!editorFocus" + "when": "!editorFocus && !terminalFocus" }, { "key": "cmd+i", @@ -600,7 +661,8 @@ }, { "key": "shift+cmd+f", - "command": "workbench.action.findInFiles" + "command": "workbench.action.findInFiles", + "when": "!explorerResourceIsFolder || !filesExplorerFocus" }, { "key": "cmd+c", @@ -681,16 +743,6 @@ "command": "cursorTopSelect", "when": "textInputFocus" }, - { - "key": "", - "command": "cursorWordRight", - "when": "textInputFocus" - }, - { - "key": "", - "command": "cursorWordRightSelect", - "when": "textInputFocus" - }, { "key": "pagedown", "command": "cursorPageDown", @@ -711,20 +763,6 @@ "command": "cursorPageUpSelect", "when": "textInputFocus" }, - { - "key": "alt+left", - "command": "cursorWordLeft", - "when": "textInputFocus" - }, - { - "key": "shift+alt+left", - "command": "cursorWordLeftSelect", - "when": "textInputFocus" - }, - { - "key": "cmd+n", - "command": "workbench.action.files.newUntitledFile" - }, { "key": "shift+alt+h", "command": "references-view.showCallHierarchy", @@ -738,6 +776,6 @@ { "key": "", "command": "java.action.showTypeHierarchy", - "when": "editorLangId == java && editorTextFocus" + "when": "editorLangId == java && javaLSReady && editorTextFocus" } ] \ No newline at end of file diff --git a/resource/default/Windows/VSCode.json b/resource/default/Windows/VSCode.json index 6b5d45b..d1f150f 100644 --- a/resource/default/Windows/VSCode.json +++ b/resource/default/Windows/VSCode.json @@ -2,12 +2,12 @@ { "key": "shift+tab", "command": "acceptAlternativeSelectedSuggestion", - "when": "suggestWidgetVisible && textInputFocus && textInputFocus" + "when": "suggestWidgetVisible && textInputFocus" }, { "key": "shift+enter", "command": "acceptAlternativeSelectedSuggestion", - "when": "suggestWidgetVisible && textInputFocus && textInputFocus" + "when": "suggestWidgetVisible && textInputFocus" }, { "key": "tab", @@ -36,7 +36,8 @@ }, { "key": "ctrl+n", - "command": "workbench.action.files.newUntitledFile" + "command": "workbench.action.files.newUntitledFile", + "when": "(!editorHasCodeActionsProvider && editorTextFocus) || !editorTextFocus" }, { "key": "ctrl+/", @@ -75,16 +76,18 @@ }, { "key": "shift+delete", - "command": "editor.action.clipboardCutAction" + "command": "editor.action.clipboardCutAction", + "when": "editorTextFocus && !editorReadonly" }, { "key": "ctrl+x", - "command": "editor.action.clipboardCutAction" + "command": "editor.action.clipboardCutAction", + "when": "editorTextFocus && !editorReadonly" }, { "key": "shift+alt+down", "command": "editor.action.copyLinesDownAction", - "when": "editorTextFocus && !editorReadonly" + "when": "editorTextFocus && !editorReadonly && !editorHasSelection" }, { "key": "", @@ -109,17 +112,67 @@ { "key": "ctrl+enter", "command": "editor.action.insertLineAfter", - "when": "editorTextFocus && !editorReadonly" + "when": "editorTextFocus && !editorReadonly && !notebookEditorFocused" + }, + { + "key": "ctrl+right", + "command": "cursorWordRight", + "when": "editorTextFocus && !inlineSuggestionVisible && !config.intellij-idea-keybindings.useCamelHumpsWords" + }, + { + "key": "ctrl+right", + "command": "cursorWordPartRight", + "when": "editorTextFocus && !inlineSuggestionVisible && config.intellij-idea-keybindings.useCamelHumpsWords" + }, + { + "key": "ctrl+left", + "command": "cursorWordLeft", + "when": "editorTextFocus && !config.intellij-idea-keybindings.useCamelHumpsWords" + }, + { + "key": "ctrl+left", + "command": "cursorWordPartStartLeft", + "when": "editorTextFocus && config.intellij-idea-keybindings.useCamelHumpsWords" + }, + { + "key": "ctrl+shift+right", + "command": "cursorWordRightSelect", + "when": "editorTextFocus && !config.intellij-idea-keybindings.useCamelHumpsWords" + }, + { + "key": "ctrl+shift+right", + "command": "cursorWordPartRightSelect", + "when": "editorTextFocus && config.intellij-idea-keybindings.useCamelHumpsWords" + }, + { + "key": "ctrl+shift+left", + "command": "cursorWordLeftSelect", + "when": "editorTextFocus && !config.intellij-idea-keybindings.useCamelHumpsWords" + }, + { + "key": "ctrl+shift+left", + "command": "cursorWordPartStartLeftSelect", + "when": "editorTextFocus && config.intellij-idea-keybindings.useCamelHumpsWords" }, { "key": "ctrl+delete", "command": "deleteWordRight", - "when": "textInputFocus && !editorReadonly" + "when": "textInputFocus && !editorReadonly && !config.intellij-idea-keybindings.useCamelHumpsWords" + }, + { + "key": "ctrl+delete", + "command": "deleteWordPartRight", + "when": "editorTextFocus && !editorReadonly && config.intellij-idea-keybindings.useCamelHumpsWords" }, { "key": "ctrl+backspace", "command": "deleteWordLeft", - "when": "textInputFocus && !editorReadonly" + "when": "textInputFocus && !editorReadonly && !config.intellij-idea-keybindings.useCamelHumpsWords" + }, + { + "key": "ctrl+backspace", + "command": "deleteWordPartLeft", + "when": "editorTextFocus && !editorReadonly && config.intellij-idea-keybindings.useCamelHumpsWords" }, { "key": "ctrl+shift+]", @@ -232,7 +285,8 @@ }, { "key": "", - "command": "workbench.action.tasks.reRunTask" + "command": "workbench.action.tasks.reRunTask", + "when": "taskCommandsRegistered && !terminalFocus" }, { "key": "ctrl+shift+d", @@ -241,7 +295,7 @@ { "key": "ctrl+f5", "command": "workbench.action.debug.run", - "when": "debuggersAvailable" + "when": "debuggersAvailable && !inDebugMode && !terminalFocus" }, { "key": "f10", @@ -271,7 +325,7 @@ { "key": "", "command": "editor.debug.action.selectionToRepl", - "when": "debuggersAvailable && editorHasSelection" + "when": "debuggersAvailable && editorTextFocus && editorHasSelection" }, { "key": "f5", @@ -284,8 +338,8 @@ "when": "debuggersAvailable && editorTextFocus" }, { - "key": "ctrl+shift+d", - "command": "workbench.view.debug" + "key": "ctrl+shift+f8", + "command": "workbench.debug.action.focusBreakpointsView" }, { "key": "ctrl+t", @@ -320,7 +374,8 @@ }, { "key": "ctrl+b", - "command": "workbench.action.toggleSidebarVisibility" + "command": "workbench.action.toggleSidebarVisibility", + "when": "!editorFocus && !terminalFocus && !problemFocus && !inDebugRepl" }, { "key": "ctrl+shift+m", @@ -345,11 +400,13 @@ }, { "key": "alt+left", - "command": "workbench.action.navigateBack" + "command": "workbench.action.navigateBack", + "when": "canNavigateBack" }, { "key": "alt+right", - "command": "workbench.action.navigateForward" + "command": "workbench.action.navigateForward", + "when": "canNavigateForward" }, { "key": "ctrl+k ctrl+q", @@ -426,7 +483,7 @@ { "key": "f2", "command": "renameFile", - "when": "explorerViewletVisible && filesExplorerFocus && !explorerResourceIsRoot && !explorerResourceReadonly && !inputFocus" + "when": "explorerViewletVisible && filesExplorerFocus" }, { "key": "", @@ -453,11 +510,13 @@ }, { "key": "ctrl+shift+e", - "command": "workbench.view.explorer" + "command": "workbench.view.explorer", + "when": "!explorerViewletFocus" }, { "key": "ctrl+b", - "command": "workbench.action.toggleSidebarVisibility" + "command": "workbench.action.toggleSidebarVisibility", + "when": "explorerViewletFocus" }, { "key": "ctrl+b", @@ -465,7 +524,8 @@ }, { "key": "ctrl+shift+g", - "command": "workbench.view.scm" + "command": "workbench.view.scm", + "when": "activeViewlet != 'workbench.view.scm'" }, { "key": "ctrl+k s", @@ -501,7 +561,8 @@ }, { "key": "", - "command": "workbench.action.quickOpenNavigateNext" + "command": "workbench.action.quickOpenNavigateNext", + "when": "inQuickOpen" }, { "key": "alt+f5", @@ -521,15 +582,17 @@ { "key": "ctrl+enter", "command": "editor.action.insertLineAfter", - "when": "editorTextFocus && !editorReadonly" + "when": "editorTextFocus && !editorReadonly && !suggestWidgetVisible" }, { "key": "", - "command": "workbench.action.terminal.focus" + "command": "workbench.action.terminal.focus", + "when": "!terminalFocus" }, { "key": "ctrl+`", - "command": "workbench.action.terminal.toggleTerminal" + "command": "workbench.action.terminal.toggleTerminal", + "when": "terminalFocus" }, { "key": "ctrl+shift+l", @@ -559,17 +622,17 @@ { "key": "enter", "command": "list.select", - "when": "listFocus && !inputFocus" + "when": "filesExplorerFocus && foldersViewVisible && !explorerResourceIsFolder && !inputFocus" }, { "key": "ctrl+shift+;", - "command": "breadcrumbs.focus", - "when": "breadcrumbsPossible" + "command": "breadcrumbs.focusAndSelect", + "when": "breadcrumbsPossible && breadcrumbsVisible" }, { "key": "shift+alt+c", "command": "copyFilePath", - "when": "!editorFocus" + "when": "!editorFocus && !terminalFocus" }, { "key": "ctrl+i", @@ -583,7 +646,8 @@ }, { "key": "ctrl+shift+f", - "command": "workbench.action.findInFiles" + "command": "workbench.action.findInFiles", + "when": "!explorerResourceIsFolder || !filesExplorerFocus" }, { "key": "ctrl+insert", @@ -676,16 +740,6 @@ "command": "cursorTopSelect", "when": "textInputFocus" }, - { - "key": "", - "command": "cursorWordRight", - "when": "textInputFocus" - }, - { - "key": "", - "command": "cursorWordRightSelect", - "when": "textInputFocus" - }, { "key": "pagedown", "command": "cursorPageDown", @@ -706,20 +760,6 @@ "command": "cursorPageUpSelect", "when": "textInputFocus" }, - { - "key": "ctrl+left", - "command": "cursorWordLeft", - "when": "textInputFocus" - }, - { - "key": "ctrl+shift+left", - "command": "cursorWordLeftSelect", - "when": "textInputFocus" - }, - { - "key": "ctrl+n", - "command": "workbench.action.files.newUntitledFile" - }, { "key": "shift+alt+h", "command": "references-view.showCallHierarchy", @@ -733,6 +773,6 @@ { "key": "", "command": "java.action.showTypeHierarchy", - "when": "editorLangId == java && editorTextFocus" + "when": "editorLangId == java && javaLSReady && editorTextFocus" } ] \ No newline at end of file