Skip to content

Commit 3f7d7a3

Browse files
kasecatokasecato
authored
Merge pull request #342 from kasecato/update/importer_base_files
Updates VSCode base files for the importer
2 parents 2ec097d + 3bfebcc commit 3f7d7a3

File tree

3 files changed

+280
-168
lines changed

3 files changed

+280
-168
lines changed

‎resource/default/Linux/VSCode.json‎

Lines changed: 93 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
{
33
"key": "shift+tab",
44
"command": "acceptAlternativeSelectedSuggestion",
5-
"when": "suggestWidgetVisible && textInputFocus && textInputFocus"
5+
"when": "suggestWidgetVisible && textInputFocus"
66
},
77
{
88
"key": "shift+enter",
99
"command": "acceptAlternativeSelectedSuggestion",
10-
"when": "suggestWidgetVisible && textInputFocus && textInputFocus"
10+
"when": "suggestWidgetVisible && textInputFocus"
1111
},
1212
{
1313
"key": "tab",
@@ -36,7 +36,8 @@
3636
},
3737
{
3838
"key": "ctrl+n",
39-
"command": "workbench.action.files.newUntitledFile"
39+
"command": "workbench.action.files.newUntitledFile",
40+
"when": "(!editorHasCodeActionsProvider && editorTextFocus) || !editorTextFocus"
4041
},
4142
{
4243
"key": "ctrl+/",
@@ -75,12 +76,13 @@
7576
},
7677
{
7778
"key": "ctrl+x",
78-
"command": "editor.action.clipboardCutAction"
79+
"command": "editor.action.clipboardCutAction",
80+
"when": "editorTextFocus && !editorReadonly"
7981
},
8082
{
8183
"key": "ctrl+shift+alt+down",
8284
"command": "editor.action.copyLinesDownAction",
83-
"when": "editorTextFocus && !editorReadonly"
85+
"when": "editorTextFocus && !editorReadonly && !editorHasSelection"
8486
},
8587
{
8688
"key": "",
@@ -105,17 +107,67 @@
105107
{
106108
"key": "ctrl+enter",
107109
"command": "editor.action.insertLineAfter",
108-
"when": "editorTextFocus && !editorReadonly"
110+
"when": "editorTextFocus && !editorReadonly && !notebookEditorFocused"
111+
},
112+
{
113+
"key": "ctrl+right",
114+
"command": "cursorWordRight",
115+
"when": "editorTextFocus && !inlineSuggestionVisible && !config.intellij-idea-keybindings.useCamelHumpsWords"
116+
},
117+
{
118+
"key": "ctrl+right",
119+
"command": "cursorWordPartRight",
120+
"when": "editorTextFocus && !inlineSuggestionVisible && config.intellij-idea-keybindings.useCamelHumpsWords"
121+
},
122+
{
123+
"key": "ctrl+left",
124+
"command": "cursorWordLeft",
125+
"when": "editorTextFocus && !config.intellij-idea-keybindings.useCamelHumpsWords"
126+
},
127+
{
128+
"key": "ctrl+left",
129+
"command": "cursorWordPartStartLeft",
130+
"when": "editorTextFocus && config.intellij-idea-keybindings.useCamelHumpsWords"
131+
},
132+
{
133+
"key": "ctrl+shift+right",
134+
"command": "cursorWordRightSelect",
135+
"when": "editorTextFocus && !config.intellij-idea-keybindings.useCamelHumpsWords"
136+
},
137+
{
138+
"key": "ctrl+shift+right",
139+
"command": "cursorWordPartRightSelect",
140+
"when": "editorTextFocus && config.intellij-idea-keybindings.useCamelHumpsWords"
141+
},
142+
{
143+
"key": "ctrl+shift+left",
144+
"command": "cursorWordLeftSelect",
145+
"when": "editorTextFocus && !config.intellij-idea-keybindings.useCamelHumpsWords"
146+
},
147+
{
148+
"key": "ctrl+shift+left",
149+
"command": "cursorWordPartStartLeftSelect",
150+
"when": "editorTextFocus && config.intellij-idea-keybindings.useCamelHumpsWords"
109151
},
110152
{
111153
"key": "ctrl+delete",
112154
"command": "deleteWordRight",
113-
"when": "textInputFocus && !editorReadonly"
155+
"when": "textInputFocus && !editorReadonly && !config.intellij-idea-keybindings.useCamelHumpsWords"
156+
},
157+
{
158+
"key": "ctrl+delete",
159+
"command": "deleteWordPartRight",
160+
"when": "editorTextFocus && !editorReadonly && config.intellij-idea-keybindings.useCamelHumpsWords"
114161
},
115162
{
116163
"key": "ctrl+backspace",
117164
"command": "deleteWordLeft",
118-
"when": "textInputFocus && !editorReadonly"
165+
"when": "textInputFocus && !editorReadonly && !config.intellij-idea-keybindings.useCamelHumpsWords"
166+
},
167+
{
168+
"key": "ctrl+backspace",
169+
"command": "deleteWordPartLeft",
170+
"when": "editorTextFocus && !editorReadonly && config.intellij-idea-keybindings.useCamelHumpsWords"
119171
},
120172
{
121173
"key": "ctrl+shift+]",
@@ -224,7 +276,8 @@
224276
},
225277
{
226278
"key": "",
227-
"command": "workbench.action.tasks.reRunTask"
279+
"command": "workbench.action.tasks.reRunTask",
280+
"when": "taskCommandsRegistered && !terminalFocus"
228281
},
229282
{
230283
"key": "ctrl+shift+d",
@@ -233,7 +286,7 @@
233286
{
234287
"key": "ctrl+f5",
235288
"command": "workbench.action.debug.run",
236-
"when": "debuggersAvailable"
289+
"when": "debuggersAvailable && !inDebugMode && !terminalFocus"
237290
},
238291
{
239292
"key": "f10",
@@ -263,7 +316,7 @@
263316
{
264317
"key": "",
265318
"command": "editor.debug.action.selectionToRepl",
266-
"when": "debuggersAvailable && editorHasSelection"
319+
"when": "debuggersAvailable && editorTextFocus && editorHasSelection"
267320
},
268321
{
269322
"key": "f5",
@@ -276,8 +329,8 @@
276329
"when": "debuggersAvailable && editorTextFocus"
277330
},
278331
{
279-
"key": "ctrl+shift+d",
280-
"command": "workbench.view.debug"
332+
"key": "ctrl+shift+f8",
333+
"command": "workbench.debug.action.focusBreakpointsView"
281334
},
282335
{
283336
"key": "ctrl+t",
@@ -312,7 +365,8 @@
312365
},
313366
{
314367
"key": "ctrl+b",
315-
"command": "workbench.action.toggleSidebarVisibility"
368+
"command": "workbench.action.toggleSidebarVisibility",
369+
"when": "!editorFocus && !terminalFocus && !problemFocus && !inDebugRepl"
316370
},
317371
{
318372
"key": "ctrl+shift+m",
@@ -337,11 +391,13 @@
337391
},
338392
{
339393
"key": "ctrl+alt+-",
340-
"command": "workbench.action.navigateBack"
394+
"command": "workbench.action.navigateBack",
395+
"when": "canNavigateBack"
341396
},
342397
{
343398
"key": "ctrl+shift+-",
344-
"command": "workbench.action.navigateForward"
399+
"command": "workbench.action.navigateForward",
400+
"when": "canNavigateForward"
345401
},
346402
{
347403
"key": "ctrl+k ctrl+q",
@@ -418,7 +474,7 @@
418474
{
419475
"key": "f2",
420476
"command": "renameFile",
421-
"when": "explorerViewletVisible && filesExplorerFocus && !explorerResourceIsRoot && !explorerResourceReadonly && !inputFocus"
477+
"when": "explorerViewletVisible && filesExplorerFocus"
422478
},
423479
{
424480
"key": "",
@@ -445,15 +501,18 @@
445501
},
446502
{
447503
"key": "ctrl+shift+e",
448-
"command": "workbench.view.explorer"
504+
"command": "workbench.view.explorer",
505+
"when": "!explorerViewletFocus"
449506
},
450507
{
451508
"key": "ctrl+b",
452-
"command": "workbench.action.toggleSidebarVisibility"
509+
"command": "workbench.action.toggleSidebarVisibility",
510+
"when": "explorerViewletFocus"
453511
},
454512
{
455513
"key": "ctrl+shift+g",
456-
"command": "workbench.view.scm"
514+
"command": "workbench.view.scm",
515+
"when": "activeViewlet != 'workbench.view.scm'"
457516
},
458517
{
459518
"key": "",
@@ -489,7 +548,8 @@
489548
},
490549
{
491550
"key": "",
492-
"command": "workbench.action.quickOpenNavigateNext"
551+
"command": "workbench.action.quickOpenNavigateNext",
552+
"when": "inQuickOpen"
493553
},
494554
{
495555
"key": "alt+f5",
@@ -509,15 +569,17 @@
509569
{
510570
"key": "ctrl+enter",
511571
"command": "editor.action.insertLineAfter",
512-
"when": "editorTextFocus && !editorReadonly"
572+
"when": "editorTextFocus && !editorReadonly && !suggestWidgetVisible"
513573
},
514574
{
515575
"key": "",
516-
"command": "workbench.action.terminal.focus"
576+
"command": "workbench.action.terminal.focus",
577+
"when": "!terminalFocus"
517578
},
518579
{
519580
"key": "ctrl+`",
520-
"command": "workbench.action.terminal.toggleTerminal"
581+
"command": "workbench.action.terminal.toggleTerminal",
582+
"when": "terminalFocus"
521583
},
522584
{
523585
"key": "ctrl+shift+l",
@@ -547,17 +609,17 @@
547609
{
548610
"key": "enter",
549611
"command": "list.select",
550-
"when": "listFocus && !inputFocus"
612+
"when": "filesExplorerFocus && foldersViewVisible && !explorerResourceIsFolder && !inputFocus"
551613
},
552614
{
553615
"key": "ctrl+shift+;",
554-
"command": "breadcrumbs.focus",
555-
"when": "breadcrumbsPossible"
616+
"command": "breadcrumbs.focusAndSelect",
617+
"when": "breadcrumbsPossible && breadcrumbsVisible"
556618
},
557619
{
558620
"key": "ctrl+alt+c",
559621
"command": "copyFilePath",
560-
"when": "!editorFocus"
622+
"when": "!editorFocus && !terminalFocus"
561623
},
562624
{
563625
"key": "ctrl+i",
@@ -571,7 +633,8 @@
571633
},
572634
{
573635
"key": "ctrl+shift+f",
574-
"command": "workbench.action.findInFiles"
636+
"command": "workbench.action.findInFiles",
637+
"when": "!explorerResourceIsFolder || !filesExplorerFocus"
575638
},
576639
{
577640
"key": "ctrl+c",
@@ -650,26 +713,11 @@
650713
"command": "cursorBottomSelect",
651714
"when": "textInputFocus"
652715
},
653-
{
654-
"key": "ctrl+home",
655-
"command": "cursorTop",
656-
"when": "textInputFocus"
657-
},
658716
{
659717
"key": "ctrl+shift+home",
660718
"command": "cursorTopSelect",
661719
"when": "textInputFocus"
662720
},
663-
{
664-
"key": "",
665-
"command": "cursorWordRight",
666-
"when": "textInputFocus"
667-
},
668-
{
669-
"key": "",
670-
"command": "cursorWordRightSelect",
671-
"when": "textInputFocus"
672-
},
673721
{
674722
"key": "pagedown",
675723
"command": "cursorPageDown",
@@ -690,20 +738,6 @@
690738
"command": "cursorPageUpSelect",
691739
"when": "textInputFocus"
692740
},
693-
{
694-
"key": "ctrl+left",
695-
"command": "cursorWordLeft",
696-
"when": "textInputFocus"
697-
},
698-
{
699-
"key": "ctrl+shift+left",
700-
"command": "cursorWordLeftSelect",
701-
"when": "textInputFocus"
702-
},
703-
{
704-
"key": "ctrl+n",
705-
"command": "workbench.action.files.newUntitledFile"
706-
},
707741
{
708742
"key": "shift+alt+h",
709743
"command": "references-view.showCallHierarchy",
@@ -717,6 +751,6 @@
717751
{
718752
"key": "",
719753
"command": "java.action.showTypeHierarchy",
720-
"when": "editorLangId == java && editorTextFocus"
754+
"when": "editorLangId == java && javaLSReady && editorTextFocus"
721755
}
722756
]

0 commit comments

Comments
 (0)