@codingame/monaco-vscode-view-common-service-override 5.3.0 → 6.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +3 -3
- package/viewCommon.js +1 -1
- package/vscode/src/vs/base/browser/ui/centered/centeredViewLayout.js +2 -1
- package/vscode/src/vs/base/browser/ui/grid/grid.js +34 -24
- package/vscode/src/vs/base/browser/ui/grid/gridview.js +35 -34
- package/vscode/src/vs/workbench/api/browser/viewsExtensionPoint.js +9 -60
- package/vscode/src/vs/workbench/browser/actions/listCommands.js +119 -79
- package/vscode/src/vs/workbench/browser/actions/navigationActions.js +76 -64
- package/vscode/src/vs/workbench/browser/media/style.css.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.js +51 -71
- package/vscode/src/vs/workbench/browser/parts/activitybar/media/activityaction.css.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.js +21 -18
- package/vscode/src/vs/workbench/browser/parts/compositeBar.js +6 -6
- package/vscode/src/vs/workbench/browser/parts/compositePart.js +11 -8
- package/vscode/src/vs/workbench/browser/parts/editor/auxiliaryEditorPart.js +8 -7
- package/vscode/src/vs/workbench/browser/parts/editor/editor.contribution.js +112 -107
- package/vscode/src/vs/workbench/browser/parts/editor/editorConfiguration.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/editor/editorDropTarget.js +36 -30
- package/vscode/src/vs/workbench/browser/parts/editor/editorPart.js +75 -69
- package/vscode/src/vs/workbench/browser/parts/editor/editorParts.js +143 -25
- package/vscode/src/vs/workbench/browser/parts/paneCompositeBar.js +20 -16
- package/vscode/src/vs/workbench/browser/parts/paneCompositePart.js +13 -11
- package/vscode/src/vs/workbench/browser/parts/paneCompositePartService.js +5 -4
- package/vscode/src/vs/workbench/browser/parts/panel/panelPart.js +8 -5
- package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarActions.js +9 -6
- package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarPart.js +51 -37
- package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.js +28 -25
- package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.js +23 -13
- package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyTree.js +5 -5
- package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditor.contribution.js +3 -2
- package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditorInputFactory.js +2 -1
- package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditors.js +34 -23
- package/vscode/src/vs/workbench/contrib/customEditor/common/contributedCustomEditors.js +3 -2
- package/vscode/src/vs/workbench/contrib/customEditor/common/customEditor.js +7 -1
- package/vscode/src/vs/workbench/contrib/customEditor/common/extensionPoint.js +3 -2
- package/vscode/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpener.contribution.js +1 -0
- package/vscode/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.js +17 -15
- package/vscode/src/vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution.js +2 -1
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/commands.js +2 -1
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution.js +4 -3
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.js +7 -7
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView.js +2 -2
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/codeEditorView.js +2 -1
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.js +9 -8
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView.js +2 -2
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.js +11 -6
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/scrollSynchronizer.js +24 -23
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.js +3 -2
- package/vscode/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.js +5 -4
- package/vscode/src/vs/workbench/contrib/sash/browser/sash.contribution.js +2 -1
- package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution.js +26 -23
- package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.js +23 -13
- package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.js +5 -5
- package/vscode/src/vs/workbench/contrib/webview/browser/resourceLoading.js +2 -2
- package/vscode/src/vs/workbench/contrib/webview/browser/webviewElement.js +7 -6
- package/vscode/src/vs/workbench/contrib/webview/browser/webviewService.js +8 -6
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewCommands.js +10 -8
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution.js +3 -2
- package/vscode/src/vs/workbench/contrib/webviewView/browser/webviewViewPane.js +4 -3
- package/vscode/src/vs/workbench/services/activity/browser/activityService.js +1 -0
- package/vscode/src/vs/workbench/services/editor/browser/editorPaneService.js +1 -0
- package/vscode/src/vs/workbench/services/editor/browser/editorResolverService.js +21 -19
- package/vscode/src/vs/workbench/services/history/browser/historyService.js +73 -63
- package/vscode/src/vs/workbench/services/progress/browser/progressService.js +19 -15
- package/vscode/src/vs/workbench/services/untitled/common/untitledTextEditorService.js +1 -0
- package/vscode/src/vs/workbench/services/views/browser/viewDescriptorService.js +23 -18
- package/vscode/src/vs/workbench/services/views/common/viewContainerModel.js +20 -14
- package/vscode/src/vs/base/browser/deviceAccess.js +0 -61
- package/vscode/src/vs/platform/languagePacks/common/localizedStrings.js +0 -13
- package/vscode/src/vs/workbench/browser/window.js +0 -330
- package/vscode/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.js +0 -371
- package/vscode/src/vs/workbench/services/driver/browser/driver.js +0 -188
|
@@ -1,10 +1,16 @@
|
|
|
1
1
|
import { localize2WithPath } from 'vscode/vscode/vs/nls';
|
|
2
|
+
import { GroupLocation, GroupDirection } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
|
|
2
3
|
import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
|
|
4
|
+
import { Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
|
|
3
5
|
import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
|
|
4
6
|
import { Action2, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
|
|
5
7
|
import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
|
|
8
|
+
import { Direction } from '../../../base/browser/ui/grid/grid.js';
|
|
9
|
+
import { KeyCode, KeyMod } from 'vscode/vscode/vs/base/common/keyCodes';
|
|
6
10
|
import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
|
|
7
11
|
import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
|
|
12
|
+
import { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
|
|
13
|
+
import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
|
|
8
14
|
import { getActiveWindow } from 'vscode/vscode/vs/base/browser/dom';
|
|
9
15
|
import { isAuxiliaryWindow } from 'vscode/vscode/vs/base/browser/window';
|
|
10
16
|
|
|
@@ -18,79 +24,79 @@ class BaseNavigationAction extends Action2 {
|
|
|
18
24
|
const layoutService = accessor.get(IWorkbenchLayoutService);
|
|
19
25
|
const editorGroupService = accessor.get(IEditorGroupsService);
|
|
20
26
|
const paneCompositeService = accessor.get(IPaneCompositePartService);
|
|
21
|
-
const isEditorFocus = layoutService.hasFocus(
|
|
22
|
-
const isPanelFocus = layoutService.hasFocus(
|
|
23
|
-
const isSidebarFocus = layoutService.hasFocus(
|
|
24
|
-
const isAuxiliaryBarFocus = layoutService.hasFocus(
|
|
27
|
+
const isEditorFocus = layoutService.hasFocus(Parts.EDITOR_PART);
|
|
28
|
+
const isPanelFocus = layoutService.hasFocus(Parts.PANEL_PART);
|
|
29
|
+
const isSidebarFocus = layoutService.hasFocus(Parts.SIDEBAR_PART);
|
|
30
|
+
const isAuxiliaryBarFocus = layoutService.hasFocus(Parts.AUXILIARYBAR_PART);
|
|
25
31
|
let neighborPart;
|
|
26
32
|
if (isEditorFocus) {
|
|
27
33
|
const didNavigate = this.navigateAcrossEditorGroup(this.toGroupDirection(this.direction), editorGroupService);
|
|
28
34
|
if (didNavigate) {
|
|
29
35
|
return;
|
|
30
36
|
}
|
|
31
|
-
neighborPart = layoutService.getVisibleNeighborPart(
|
|
37
|
+
neighborPart = layoutService.getVisibleNeighborPart(Parts.EDITOR_PART, this.direction);
|
|
32
38
|
}
|
|
33
39
|
if (isPanelFocus) {
|
|
34
|
-
neighborPart = layoutService.getVisibleNeighborPart(
|
|
40
|
+
neighborPart = layoutService.getVisibleNeighborPart(Parts.PANEL_PART, this.direction);
|
|
35
41
|
}
|
|
36
42
|
if (isSidebarFocus) {
|
|
37
|
-
neighborPart = layoutService.getVisibleNeighborPart(
|
|
43
|
+
neighborPart = layoutService.getVisibleNeighborPart(Parts.SIDEBAR_PART, this.direction);
|
|
38
44
|
}
|
|
39
45
|
if (isAuxiliaryBarFocus) {
|
|
40
|
-
neighborPart = neighborPart = layoutService.getVisibleNeighborPart(
|
|
46
|
+
neighborPart = neighborPart = layoutService.getVisibleNeighborPart(Parts.AUXILIARYBAR_PART, this.direction);
|
|
41
47
|
}
|
|
42
|
-
if (neighborPart ===
|
|
48
|
+
if (neighborPart === Parts.EDITOR_PART) {
|
|
43
49
|
if (!this.navigateBackToEditorGroup(this.toGroupDirection(this.direction), editorGroupService)) {
|
|
44
|
-
this.navigateToEditorGroup(this.direction ===
|
|
50
|
+
this.navigateToEditorGroup(this.direction === Direction.Right ? GroupLocation.FIRST : GroupLocation.LAST, editorGroupService);
|
|
45
51
|
}
|
|
46
52
|
}
|
|
47
|
-
else if (neighborPart ===
|
|
53
|
+
else if (neighborPart === Parts.SIDEBAR_PART) {
|
|
48
54
|
this.navigateToSidebar(layoutService, paneCompositeService);
|
|
49
55
|
}
|
|
50
|
-
else if (neighborPart ===
|
|
56
|
+
else if (neighborPart === Parts.PANEL_PART) {
|
|
51
57
|
this.navigateToPanel(layoutService, paneCompositeService);
|
|
52
58
|
}
|
|
53
|
-
else if (neighborPart ===
|
|
59
|
+
else if (neighborPart === Parts.AUXILIARYBAR_PART) {
|
|
54
60
|
this.navigateToAuxiliaryBar(layoutService, paneCompositeService);
|
|
55
61
|
}
|
|
56
62
|
}
|
|
57
63
|
async navigateToPanel(layoutService, paneCompositeService) {
|
|
58
|
-
if (!layoutService.isVisible(
|
|
64
|
+
if (!layoutService.isVisible(Parts.PANEL_PART)) {
|
|
59
65
|
return false;
|
|
60
66
|
}
|
|
61
|
-
const activePanel = paneCompositeService.getActivePaneComposite(
|
|
67
|
+
const activePanel = paneCompositeService.getActivePaneComposite(ViewContainerLocation.Panel);
|
|
62
68
|
if (!activePanel) {
|
|
63
69
|
return false;
|
|
64
70
|
}
|
|
65
71
|
const activePanelId = activePanel.getId();
|
|
66
|
-
const res = await paneCompositeService.openPaneComposite(activePanelId,
|
|
72
|
+
const res = await paneCompositeService.openPaneComposite(activePanelId, ViewContainerLocation.Panel, true);
|
|
67
73
|
if (!res) {
|
|
68
74
|
return false;
|
|
69
75
|
}
|
|
70
76
|
return res;
|
|
71
77
|
}
|
|
72
78
|
async navigateToSidebar(layoutService, paneCompositeService) {
|
|
73
|
-
if (!layoutService.isVisible(
|
|
79
|
+
if (!layoutService.isVisible(Parts.SIDEBAR_PART)) {
|
|
74
80
|
return false;
|
|
75
81
|
}
|
|
76
|
-
const activeViewlet = paneCompositeService.getActivePaneComposite(
|
|
82
|
+
const activeViewlet = paneCompositeService.getActivePaneComposite(ViewContainerLocation.Sidebar);
|
|
77
83
|
if (!activeViewlet) {
|
|
78
84
|
return false;
|
|
79
85
|
}
|
|
80
86
|
const activeViewletId = activeViewlet.getId();
|
|
81
|
-
const viewlet = await paneCompositeService.openPaneComposite(activeViewletId,
|
|
87
|
+
const viewlet = await paneCompositeService.openPaneComposite(activeViewletId, ViewContainerLocation.Sidebar, true);
|
|
82
88
|
return !!viewlet;
|
|
83
89
|
}
|
|
84
90
|
async navigateToAuxiliaryBar(layoutService, paneCompositeService) {
|
|
85
|
-
if (!layoutService.isVisible(
|
|
91
|
+
if (!layoutService.isVisible(Parts.AUXILIARYBAR_PART)) {
|
|
86
92
|
return false;
|
|
87
93
|
}
|
|
88
|
-
const activePanel = paneCompositeService.getActivePaneComposite(
|
|
94
|
+
const activePanel = paneCompositeService.getActivePaneComposite(ViewContainerLocation.AuxiliaryBar);
|
|
89
95
|
if (!activePanel) {
|
|
90
96
|
return false;
|
|
91
97
|
}
|
|
92
98
|
const activePanelId = activePanel.getId();
|
|
93
|
-
const res = await paneCompositeService.openPaneComposite(activePanelId,
|
|
99
|
+
const res = await paneCompositeService.openPaneComposite(activePanelId, ViewContainerLocation.AuxiliaryBar, true);
|
|
94
100
|
if (!res) {
|
|
95
101
|
return false;
|
|
96
102
|
}
|
|
@@ -116,18 +122,18 @@ class BaseNavigationAction extends Action2 {
|
|
|
116
122
|
}
|
|
117
123
|
toGroupDirection(direction) {
|
|
118
124
|
switch (direction) {
|
|
119
|
-
case
|
|
120
|
-
case
|
|
121
|
-
case
|
|
122
|
-
case
|
|
125
|
+
case Direction.Down: return GroupDirection.DOWN;
|
|
126
|
+
case Direction.Left: return GroupDirection.LEFT;
|
|
127
|
+
case Direction.Right: return GroupDirection.RIGHT;
|
|
128
|
+
case Direction.Up: return GroupDirection.UP;
|
|
123
129
|
}
|
|
124
130
|
}
|
|
125
131
|
toOppositeDirection(direction) {
|
|
126
132
|
switch (direction) {
|
|
127
|
-
case
|
|
128
|
-
case
|
|
129
|
-
case
|
|
130
|
-
case
|
|
133
|
+
case GroupDirection.UP: return GroupDirection.DOWN;
|
|
134
|
+
case GroupDirection.RIGHT: return GroupDirection.LEFT;
|
|
135
|
+
case GroupDirection.LEFT: return GroupDirection.RIGHT;
|
|
136
|
+
case GroupDirection.DOWN: return GroupDirection.UP;
|
|
131
137
|
}
|
|
132
138
|
}
|
|
133
139
|
doNavigateToEditorGroup(scope, editorGroupService) {
|
|
@@ -146,7 +152,7 @@ registerAction2(class extends BaseNavigationAction {
|
|
|
146
152
|
title: ( localize2WithPath(_moduleId, 0, 'Navigate to the View on the Left')),
|
|
147
153
|
category: Categories.View,
|
|
148
154
|
f1: true
|
|
149
|
-
},
|
|
155
|
+
}, Direction.Left);
|
|
150
156
|
}
|
|
151
157
|
});
|
|
152
158
|
registerAction2(class extends BaseNavigationAction {
|
|
@@ -156,7 +162,7 @@ registerAction2(class extends BaseNavigationAction {
|
|
|
156
162
|
title: ( localize2WithPath(_moduleId, 1, 'Navigate to the View on the Right')),
|
|
157
163
|
category: Categories.View,
|
|
158
164
|
f1: true
|
|
159
|
-
},
|
|
165
|
+
}, Direction.Right);
|
|
160
166
|
}
|
|
161
167
|
});
|
|
162
168
|
registerAction2(class extends BaseNavigationAction {
|
|
@@ -166,7 +172,7 @@ registerAction2(class extends BaseNavigationAction {
|
|
|
166
172
|
title: ( localize2WithPath(_moduleId, 2, 'Navigate to the View Above')),
|
|
167
173
|
category: Categories.View,
|
|
168
174
|
f1: true
|
|
169
|
-
},
|
|
175
|
+
}, Direction.Up);
|
|
170
176
|
}
|
|
171
177
|
});
|
|
172
178
|
registerAction2(class extends BaseNavigationAction {
|
|
@@ -176,7 +182,7 @@ registerAction2(class extends BaseNavigationAction {
|
|
|
176
182
|
title: ( localize2WithPath(_moduleId, 3, 'Navigate to the View Below')),
|
|
177
183
|
category: Categories.View,
|
|
178
184
|
f1: true
|
|
179
|
-
},
|
|
185
|
+
}, Direction.Down);
|
|
180
186
|
}
|
|
181
187
|
});
|
|
182
188
|
class BaseFocusAction extends Action2 {
|
|
@@ -195,57 +201,63 @@ class BaseFocusAction extends Action2 {
|
|
|
195
201
|
let neighbour;
|
|
196
202
|
if (windowIsAuxiliary) {
|
|
197
203
|
switch (part) {
|
|
198
|
-
case
|
|
199
|
-
neighbour =
|
|
204
|
+
case Parts.EDITOR_PART:
|
|
205
|
+
neighbour = Parts.STATUSBAR_PART;
|
|
200
206
|
break;
|
|
201
207
|
default:
|
|
202
|
-
neighbour =
|
|
208
|
+
neighbour = Parts.EDITOR_PART;
|
|
203
209
|
}
|
|
204
210
|
}
|
|
205
211
|
else {
|
|
206
212
|
switch (part) {
|
|
207
|
-
case
|
|
208
|
-
neighbour = next ?
|
|
213
|
+
case Parts.EDITOR_PART:
|
|
214
|
+
neighbour = next ? Parts.PANEL_PART : Parts.SIDEBAR_PART;
|
|
209
215
|
break;
|
|
210
|
-
case
|
|
211
|
-
neighbour = next ?
|
|
216
|
+
case Parts.PANEL_PART:
|
|
217
|
+
neighbour = next ? Parts.AUXILIARYBAR_PART : Parts.EDITOR_PART;
|
|
212
218
|
break;
|
|
213
|
-
case
|
|
214
|
-
neighbour = next ?
|
|
219
|
+
case Parts.AUXILIARYBAR_PART:
|
|
220
|
+
neighbour = next ? Parts.STATUSBAR_PART : Parts.PANEL_PART;
|
|
215
221
|
break;
|
|
216
|
-
case
|
|
217
|
-
neighbour = next ?
|
|
222
|
+
case Parts.STATUSBAR_PART:
|
|
223
|
+
neighbour = next ? Parts.ACTIVITYBAR_PART : Parts.AUXILIARYBAR_PART;
|
|
218
224
|
break;
|
|
219
|
-
case
|
|
220
|
-
neighbour = next ?
|
|
225
|
+
case Parts.ACTIVITYBAR_PART:
|
|
226
|
+
neighbour = next ? Parts.SIDEBAR_PART : Parts.STATUSBAR_PART;
|
|
227
|
+
break;
|
|
228
|
+
case Parts.SIDEBAR_PART:
|
|
229
|
+
neighbour = next ? Parts.EDITOR_PART : Parts.ACTIVITYBAR_PART;
|
|
221
230
|
break;
|
|
222
231
|
default:
|
|
223
|
-
neighbour =
|
|
232
|
+
neighbour = Parts.EDITOR_PART;
|
|
224
233
|
}
|
|
225
234
|
}
|
|
226
|
-
if (layoutService.isVisible(neighbour, activeWindow) || neighbour ===
|
|
235
|
+
if (layoutService.isVisible(neighbour, activeWindow) || neighbour === Parts.EDITOR_PART) {
|
|
227
236
|
return neighbour;
|
|
228
237
|
}
|
|
229
238
|
return this.findVisibleNeighbour(layoutService, neighbour, next);
|
|
230
239
|
}
|
|
231
240
|
focusNextOrPreviousPart(layoutService, editorService, next) {
|
|
232
241
|
let currentlyFocusedPart;
|
|
233
|
-
if (editorService.activeEditorPane?.hasFocus() || layoutService.hasFocus(
|
|
234
|
-
currentlyFocusedPart =
|
|
242
|
+
if (editorService.activeEditorPane?.hasFocus() || layoutService.hasFocus(Parts.EDITOR_PART)) {
|
|
243
|
+
currentlyFocusedPart = Parts.EDITOR_PART;
|
|
244
|
+
}
|
|
245
|
+
else if (layoutService.hasFocus(Parts.ACTIVITYBAR_PART)) {
|
|
246
|
+
currentlyFocusedPart = Parts.ACTIVITYBAR_PART;
|
|
235
247
|
}
|
|
236
|
-
else if (layoutService.hasFocus(
|
|
237
|
-
currentlyFocusedPart =
|
|
248
|
+
else if (layoutService.hasFocus(Parts.STATUSBAR_PART)) {
|
|
249
|
+
currentlyFocusedPart = Parts.STATUSBAR_PART;
|
|
238
250
|
}
|
|
239
|
-
else if (layoutService.hasFocus(
|
|
240
|
-
currentlyFocusedPart =
|
|
251
|
+
else if (layoutService.hasFocus(Parts.SIDEBAR_PART)) {
|
|
252
|
+
currentlyFocusedPart = Parts.SIDEBAR_PART;
|
|
241
253
|
}
|
|
242
|
-
else if (layoutService.hasFocus(
|
|
243
|
-
currentlyFocusedPart =
|
|
254
|
+
else if (layoutService.hasFocus(Parts.AUXILIARYBAR_PART)) {
|
|
255
|
+
currentlyFocusedPart = Parts.AUXILIARYBAR_PART;
|
|
244
256
|
}
|
|
245
|
-
else if (layoutService.hasFocus(
|
|
246
|
-
currentlyFocusedPart =
|
|
257
|
+
else if (layoutService.hasFocus(Parts.PANEL_PART)) {
|
|
258
|
+
currentlyFocusedPart = Parts.PANEL_PART;
|
|
247
259
|
}
|
|
248
|
-
layoutService.focusPart(currentlyFocusedPart ? this.findVisibleNeighbour(layoutService, currentlyFocusedPart, next) :
|
|
260
|
+
layoutService.focusPart(currentlyFocusedPart ? this.findVisibleNeighbour(layoutService, currentlyFocusedPart, next) : Parts.EDITOR_PART, getActiveWindow());
|
|
249
261
|
}
|
|
250
262
|
}
|
|
251
263
|
registerAction2(class extends BaseFocusAction {
|
|
@@ -256,8 +268,8 @@ registerAction2(class extends BaseFocusAction {
|
|
|
256
268
|
category: Categories.View,
|
|
257
269
|
f1: true,
|
|
258
270
|
keybinding: {
|
|
259
|
-
primary:
|
|
260
|
-
weight:
|
|
271
|
+
primary: KeyCode.F6,
|
|
272
|
+
weight: KeybindingWeight.WorkbenchContrib
|
|
261
273
|
}
|
|
262
274
|
}, true);
|
|
263
275
|
}
|
|
@@ -270,8 +282,8 @@ registerAction2(class extends BaseFocusAction {
|
|
|
270
282
|
category: Categories.View,
|
|
271
283
|
f1: true,
|
|
272
284
|
keybinding: {
|
|
273
|
-
primary:
|
|
274
|
-
weight:
|
|
285
|
+
primary: KeyMod.Shift | KeyCode.F6,
|
|
286
|
+
weight: KeybindingWeight.WorkbenchContrib
|
|
275
287
|
}
|
|
276
288
|
}, false);
|
|
277
289
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
|
|
2
2
|
|
|
3
|
-
var css = "@keyframes fadeIn{0%{opacity:0}to{opacity:1}}.mac .monaco-workbench-part,.mac.monaco-workbench-part{font-family:-apple-system,BlinkMacSystemFont,sans-serif}.mac:lang(zh-Hans) .monaco-workbench-part,.mac:lang(zh-Hans).monaco-workbench-part{font-family:-apple-system,BlinkMacSystemFont,PingFang SC,Hiragino Sans GB,sans-serif}.mac:lang(zh-Hant) .monaco-workbench-part,.mac:lang(zh-Hant).monaco-workbench-part{font-family:-apple-system,BlinkMacSystemFont,PingFang TC,sans-serif}.mac:lang(ja) .monaco-workbench-part,.mac:lang(ja).monaco-workbench-part{font-family:-apple-system,BlinkMacSystemFont,Hiragino Kaku Gothic Pro,sans-serif}.mac:lang(ko) .monaco-workbench-part,.mac:lang(ko).monaco-workbench-part{font-family:-apple-system,BlinkMacSystemFont,Nanum Gothic,Apple SD Gothic Neo,AppleGothic,sans-serif}.windows .monaco-workbench-part,.windows.monaco-workbench-part{font-family:Segoe WPC,Segoe UI,sans-serif}.windows:lang(zh-Hans) .monaco-workbench-part,.windows:lang(zh-Hans).monaco-workbench-part{font-family:Segoe WPC,Segoe UI,Microsoft YaHei,sans-serif}.windows:lang(zh-Hant) .monaco-workbench-part,.windows:lang(zh-Hant).monaco-workbench-part{font-family:Segoe WPC,Segoe UI,Microsoft Jhenghei,sans-serif}.windows:lang(ja) .monaco-workbench-part,.windows:lang(ja).monaco-workbench-part{font-family:Segoe WPC,Segoe UI,Yu Gothic UI,Meiryo UI,sans-serif}.windows:lang(ko) .monaco-workbench-part,.windows:lang(ko).monaco-workbench-part{font-family:Segoe WPC,Segoe UI,Malgun Gothic,Dotom,sans-serif}.linux .monaco-workbench-part,.linux.monaco-workbench-part{font-family:system-ui,Ubuntu,Droid Sans,sans-serif}.linux:lang(zh-Hans) .monaco-workbench-part,.linux:lang(zh-Hans).monaco-workbench-part{font-family:system-ui,Ubuntu,Droid Sans,Source Han Sans SC,Source Han Sans CN,Source Han Sans,sans-serif}.linux:lang(zh-Hant) .monaco-workbench-part,.linux:lang(zh-Hant).monaco-workbench-part{font-family:system-ui,Ubuntu,Droid Sans,Source Han Sans TC,Source Han Sans TW,Source Han Sans,sans-serif}.linux:lang(ja) .monaco-workbench-part,.linux:lang(ja).monaco-workbench-part{font-family:system-ui,Ubuntu,Droid Sans,Source Han Sans J,Source Han Sans JP,Source Han Sans,sans-serif}.linux:lang(ko) .monaco-workbench-part,.linux:lang(ko).monaco-workbench-part{font-family:system-ui,Ubuntu,Droid Sans,Source Han Sans K,Source Han Sans JR,Source Han Sans,UnDotum,FBaekmuk Gulim,sans-serif}.mac .monaco-workbench-part,.mac.monaco-workbench-part{--monaco-monospace-font:\"SF Mono\",Monaco,Menlo,Courier,monospace}.windows .monaco-workbench-part,.windows.monaco-workbench-part{--monaco-monospace-font:Consolas,\"Courier New\",monospace}.linux .monaco-workbench-part,.linux.monaco-workbench-part{--monaco-monospace-font:\"Ubuntu Mono\",\"Liberation Mono\",\"DejaVu Sans Mono\",\"Courier New\",monospace}.monaco-workbench-part{color:var(--vscode-foreground);font-size:13px;line-height:1.4em}.monaco-workbench-part.web,.monaco-workbench.web .monaco-workbench-part{touch-action:none}.monaco-workbench.border:not(.fullscreen){border:1px solid var(--window-border-color);box-sizing:border-box}.monaco-workbench.border.mac{border-radius:5px}.monaco-workbench.border.mac.macos-bigsur-or-newer{border-radius:10px}.monaco-workbench-part img{border:0}.monaco-workbench-part label{cursor:pointer}.monaco-workbench-part a{text-decoration:none}.monaco-workbench.hc-black .monaco-workbench-part p>a,.monaco-workbench.hc-black.monaco-workbench-part p>a,.monaco-workbench.hc-light .monaco-workbench-part p>a,.monaco-workbench.hc-light.monaco-workbench-part p>a{text-decoration:underline!important}.monaco-workbench-part a:active{background-color:inherit;color:inherit}.monaco-workbench-part a.plain,.monaco-workbench-part a.plain.hover,.monaco-workbench-part a.plain:hover{color:inherit;text-decoration:none}.monaco-workbench-part input{color:inherit;font-family:inherit;font-size:100%}.monaco-workbench-part table{color:inherit;font-size:inherit}.monaco-workbench-part input::placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part input::-webkit-input-placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part input::-moz-placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part textarea::placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part textarea::-webkit-input-placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part textarea::-moz-placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part .pointer{cursor:pointer}.monaco-workbench.mac.monaco-font-aliasing-antialiased .monaco-workbench-part,.monaco-workbench.mac.monaco-font-aliasing-antialiased.monaco-workbench-part{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.monaco-workbench.mac.monaco-font-aliasing-none .monaco-workbench-part,.monaco-workbench.mac.monaco-font-aliasing-none.monaco-workbench-part{-webkit-font-smoothing:none;-moz-osx-font-smoothing:unset}@media (-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){.monaco-workbench.mac.monaco-font-aliasing-auto .monaco-workbench-part,.monaco-workbench.mac.monaco-font-aliasing-auto.monaco-workbench-part{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}}.monaco-workbench-part .context-view{-webkit-app-region:no-drag}.monaco-workbench-part .codicon{color:var(--vscode-icon-foreground)}.monaco-workbench-part .codicon[class*=codicon-]{font-size:16px}.monaco-workbench-part .predefined-file-icon[class*=codicon-]:before{
|
|
3
|
+
var css = "@keyframes fadeIn{0%{opacity:0}to{opacity:1}}.mac .monaco-workbench-part,.mac.monaco-workbench-part{font-family:-apple-system,BlinkMacSystemFont,sans-serif}.mac:lang(zh-Hans) .monaco-workbench-part,.mac:lang(zh-Hans).monaco-workbench-part{font-family:-apple-system,BlinkMacSystemFont,PingFang SC,Hiragino Sans GB,sans-serif}.mac:lang(zh-Hant) .monaco-workbench-part,.mac:lang(zh-Hant).monaco-workbench-part{font-family:-apple-system,BlinkMacSystemFont,PingFang TC,sans-serif}.mac:lang(ja) .monaco-workbench-part,.mac:lang(ja).monaco-workbench-part{font-family:-apple-system,BlinkMacSystemFont,Hiragino Kaku Gothic Pro,sans-serif}.mac:lang(ko) .monaco-workbench-part,.mac:lang(ko).monaco-workbench-part{font-family:-apple-system,BlinkMacSystemFont,Nanum Gothic,Apple SD Gothic Neo,AppleGothic,sans-serif}.windows .monaco-workbench-part,.windows.monaco-workbench-part{font-family:Segoe WPC,Segoe UI,sans-serif}.windows:lang(zh-Hans) .monaco-workbench-part,.windows:lang(zh-Hans).monaco-workbench-part{font-family:Segoe WPC,Segoe UI,Microsoft YaHei,sans-serif}.windows:lang(zh-Hant) .monaco-workbench-part,.windows:lang(zh-Hant).monaco-workbench-part{font-family:Segoe WPC,Segoe UI,Microsoft Jhenghei,sans-serif}.windows:lang(ja) .monaco-workbench-part,.windows:lang(ja).monaco-workbench-part{font-family:Segoe WPC,Segoe UI,Yu Gothic UI,Meiryo UI,sans-serif}.windows:lang(ko) .monaco-workbench-part,.windows:lang(ko).monaco-workbench-part{font-family:Segoe WPC,Segoe UI,Malgun Gothic,Dotom,sans-serif}.linux .monaco-workbench-part,.linux.monaco-workbench-part{font-family:system-ui,Ubuntu,Droid Sans,sans-serif}.linux:lang(zh-Hans) .monaco-workbench-part,.linux:lang(zh-Hans).monaco-workbench-part{font-family:system-ui,Ubuntu,Droid Sans,Source Han Sans SC,Source Han Sans CN,Source Han Sans,sans-serif}.linux:lang(zh-Hant) .monaco-workbench-part,.linux:lang(zh-Hant).monaco-workbench-part{font-family:system-ui,Ubuntu,Droid Sans,Source Han Sans TC,Source Han Sans TW,Source Han Sans,sans-serif}.linux:lang(ja) .monaco-workbench-part,.linux:lang(ja).monaco-workbench-part{font-family:system-ui,Ubuntu,Droid Sans,Source Han Sans J,Source Han Sans JP,Source Han Sans,sans-serif}.linux:lang(ko) .monaco-workbench-part,.linux:lang(ko).monaco-workbench-part{font-family:system-ui,Ubuntu,Droid Sans,Source Han Sans K,Source Han Sans JR,Source Han Sans,UnDotum,FBaekmuk Gulim,sans-serif}.mac .monaco-workbench-part,.mac.monaco-workbench-part{--monaco-monospace-font:\"SF Mono\",Monaco,Menlo,Courier,monospace}.windows .monaco-workbench-part,.windows.monaco-workbench-part{--monaco-monospace-font:Consolas,\"Courier New\",monospace}.linux .monaco-workbench-part,.linux.monaco-workbench-part{--monaco-monospace-font:\"Ubuntu Mono\",\"Liberation Mono\",\"DejaVu Sans Mono\",\"Courier New\",monospace}.monaco-workbench-part{color:var(--vscode-foreground);font-size:13px;line-height:1.4em}.monaco-workbench-part.web,.monaco-workbench.web .monaco-workbench-part{touch-action:none}.monaco-workbench.border:not(.fullscreen){border:1px solid var(--window-border-color);box-sizing:border-box}.monaco-workbench.border.mac{border-radius:5px}.monaco-workbench.border.mac.macos-bigsur-or-newer{border-radius:10px}.monaco-workbench-part img{border:0}.monaco-workbench-part label{cursor:pointer}.monaco-workbench-part a{text-decoration:none}.monaco-workbench.hc-black .monaco-workbench-part p>a,.monaco-workbench.hc-black.monaco-workbench-part p>a,.monaco-workbench.hc-light .monaco-workbench-part p>a,.monaco-workbench.hc-light.monaco-workbench-part p>a{text-decoration:underline!important}.monaco-workbench-part a:active{background-color:inherit;color:inherit}.monaco-workbench-part a.plain,.monaco-workbench-part a.plain.hover,.monaco-workbench-part a.plain:hover{color:inherit;text-decoration:none}.monaco-workbench-part input{color:inherit;font-family:inherit;font-size:100%}.monaco-workbench-part table{color:inherit;font-size:inherit}.monaco-workbench-part input::placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part input::-webkit-input-placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part input::-moz-placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part textarea::placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part textarea::-webkit-input-placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part textarea::-moz-placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part .pointer{cursor:pointer}.monaco-workbench.mac.monaco-font-aliasing-antialiased .monaco-workbench-part,.monaco-workbench.mac.monaco-font-aliasing-antialiased.monaco-workbench-part{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.monaco-workbench.mac.monaco-font-aliasing-none .monaco-workbench-part,.monaco-workbench.mac.monaco-font-aliasing-none.monaco-workbench-part{-webkit-font-smoothing:none;-moz-osx-font-smoothing:unset}@media (-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){.monaco-workbench.mac.monaco-font-aliasing-auto .monaco-workbench-part,.monaco-workbench.mac.monaco-font-aliasing-auto.monaco-workbench-part{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}}.monaco-workbench-part .context-view{-webkit-app-region:no-drag}.monaco-workbench-part .codicon{color:var(--vscode-icon-foreground)}.monaco-workbench-part .codicon[class*=codicon-]{font-size:16px}.monaco-workbench-part .predefined-file-icon[class*=codicon-]:before{padding-left:3px;padding-right:3px;width:16px}.predefined-file-icon:before{font-family:codicon}.monaco-workbench:not(.file-icons-enabled) .predefined-file-icon[class*=codicon-]:before{content:unset!important}.monaco-workbench.modal-dialog-visible .monaco-progress-container.infinite .progress-bit{display:none}.monaco-workbench-part select{appearance:none;-webkit-appearance:none;-moz-appearance:none;border:1px solid;font-family:inherit}.monaco-workbench-part .select-container{position:relative}.monaco-workbench-part .select-container:after{bottom:0;content:var(--vscode-icon-chevron-down-content);font-family:var(--vscode-icon-chevron-down-font-family);font-size:16px;height:16px;line-height:16px;margin:auto;pointer-events:none;position:absolute;right:6px;top:0;width:16px}.monaco-workbench-part .synthetic-focus,.monaco-workbench-part [tabindex=\"-1\"]:focus,.monaco-workbench-part [tabindex=\"0\"]:focus,.monaco-workbench-part button:focus,.monaco-workbench-part input[type=button]:focus,.monaco-workbench-part input[type=checkbox]:focus,.monaco-workbench-part input[type=search]:focus,.monaco-workbench-part input[type=text]:focus,.monaco-workbench-part select:focus,.monaco-workbench-part textarea:focus{opacity:1;outline-color:var(--vscode-focusBorder);outline-offset:-1px;outline-style:solid;outline-width:1px}.monaco-workbench.hc-black .synthetic-focus input,.monaco-workbench.hc-light .synthetic-focus input{background:transparent}.monaco-workbench-part input[type=checkbox]:focus{outline-offset:2px}.monaco-workbench-part [tabindex=\"-1\"]:active,.monaco-workbench-part [tabindex=\"0\"]:active,.monaco-workbench-part input[type=button]:active,.monaco-workbench-part input[type=checkbox]:active,.monaco-workbench-part select:active{outline:0!important}.monaco-workbench.mac .monaco-workbench-part select:focus,.monaco-workbench.mac.monaco-workbench-part select:focus{border-color:transparent}.monaco-workbench .monaco-list:not(.element-focused):focus:before{content:\"\";height:100%;left:0;outline:1px solid;outline-color:var(--vscode-focusBorder);outline-offset:-1px;outline-style:solid;outline-width:1px;pointer-events:none;position:absolute;top:0;width:100%;z-index:15}.monaco-workbench .monaco-list .monaco-list-row .monaco-highlighted-label .highlight{color:var(--vscode-list-highlightForeground)}.monaco-workbench .monaco-list .monaco-list-row.focused .monaco-highlighted-label .highlight{color:var(--vscode-list-focusHighlightForeground)}.monaco-workbench-part .monaco-inputbox.error input[type=text]:focus,.monaco-workbench-part .monaco-inputbox.error.synthetic-focus,.monaco-workbench-part .monaco-inputbox.info input[type=text]:focus,.monaco-workbench-part .monaco-inputbox.info.synthetic-focus,.monaco-workbench-part .monaco-inputbox.warning input[type=text]:focus,.monaco-workbench-part .monaco-inputbox.warning.synthetic-focus,.monaco-workbench-part .monaco-list:focus,.monaco-workbench-part .synthetic-focus :focus{outline:0!important}.monaco-workbench-part a.monaco-link:hover{text-decoration:underline}.monaco-workbench-part .monaco-action-bar:not(.vertical) .action-label:not(.disabled):hover,.monaco-workbench-part .monaco-action-bar:not(.vertical) .monaco-dropdown-with-primary:not(.disabled):hover{background-color:var(--vscode-toolbar-hoverBackground)}.monaco-workbench-part .monaco-action-bar:not(.vertical) .action-item.active .action-label:not(.disabled),.monaco-workbench-part .monaco-action-bar:not(.vertical) .monaco-dropdown.active .action-label:not(.disabled){background-color:var(--vscode-toolbar-activeBackground)}.monaco-workbench-part .monaco-action-bar:not(.vertical) .action-item .action-label:hover:not(.disabled){outline:1px dashed var(--vscode-toolbar-hoverOutline);outline-offset:-1px}";
|
|
4
4
|
n(css,{});
|
|
5
5
|
|
|
6
6
|
export { css, css as default };
|