@codingame/monaco-vscode-views-service-override 1.83.4 → 1.83.6
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/index.d.ts +8 -3
- package/index.js +7 -1
- package/l10n.js +8 -0
- package/missing-services.js +2141 -0
- package/package.json +2 -2
- package/services.js +95 -0
- package/views.d.ts +51 -15
- package/views.js +124 -96
- package/vscode/src/vs/base/browser/ui/tree/treeDefaults.js +1 -1
- package/vscode/src/vs/workbench/api/browser/viewsExtensionPoint.js +262 -49
- package/vscode/src/vs/workbench/browser/parts/activitybar/activitybarActions.js +57 -42
- package/vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.js +51 -11
- package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.js +14 -2
- package/vscode/src/vs/workbench/browser/parts/compositeBar.js +5 -1
- package/vscode/src/vs/workbench/browser/parts/compositePart.js +18 -3
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsControl.js +52 -20
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.js +5 -1
- package/vscode/src/vs/workbench/browser/parts/editor/editorDropTarget.js +6 -1
- package/vscode/src/vs/workbench/browser/parts/editor/editorGroupView.js +23 -4
- package/vscode/src/vs/workbench/browser/parts/editor/editorGroupWatermark.js +60 -12
- package/vscode/src/vs/workbench/browser/parts/editor/editorPane.d.ts +112 -0
- package/vscode/src/vs/workbench/browser/parts/editor/editorPanes.js +11 -2
- package/vscode/src/vs/workbench/browser/parts/editor/editorTabsControl.js +12 -2
- package/vscode/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.js +5 -4
- package/vscode/src/vs/workbench/browser/parts/panel/panelPart.js +27 -15
- package/vscode/src/vs/workbench/browser/parts/views/checkbox.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/views/treeView.js +32 -19
- package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.js +58 -18
- package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.js +29 -5
- package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyTree.js +17 -3
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.js +55 -10
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsOutline.js +5 -3
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree.js +22 -3
- package/vscode/src/vs/workbench/contrib/customEditor/common/contributedCustomEditors.js +5 -1
- package/vscode/src/vs/workbench/contrib/customEditor/common/extensionPoint.js +40 -8
- package/vscode/src/vs/workbench/contrib/files/browser/editors/binaryFileEditor.js +5 -1
- package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileEditor.js +36 -10
- package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.js +111 -16
- package/vscode/src/vs/workbench/contrib/files/browser/fileActions.contribution.js +153 -97
- package/vscode/src/vs/workbench/contrib/files/browser/fileCommands.js +28 -6
- package/vscode/src/vs/workbench/contrib/files/browser/files.contribution2.js +11 -463
- package/vscode/src/vs/workbench/contrib/files/browser/workspaceWatcher.js +16 -4
- package/vscode/src/vs/workbench/contrib/files/common/dirtyFilesIndicator.js +10 -4
- package/vscode/src/vs/workbench/contrib/languageDetection/browser/languageDetection.contribution.js +27 -5
- package/vscode/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.js +53 -28
- package/vscode/src/vs/workbench/contrib/outline/browser/outline.contribution.js +180 -36
- package/vscode/src/vs/workbench/contrib/outline/browser/outlinePane.js +17 -3
- package/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.js +29 -5
- package/vscode/src/vs/workbench/contrib/remote/browser/remoteIcons.js +85 -17
- package/vscode/src/vs/workbench/contrib/remote/browser/tunnelView.js +301 -62
- package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution.js +48 -16
- package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.js +29 -5
- package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.js +17 -3
- package/vscode/src/vs/workbench/contrib/webview/browser/webviewElement.js +6 -1
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewCommands.js +25 -5
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution.js +5 -1
- package/vscode/src/vs/workbench/services/editor/browser/editorResolverService.js +49 -9
- package/vscode/src/vs/workbench/services/history/browser/historyService.js +36 -36
- package/vscode/src/vs/workbench/services/hover/browser/hoverWidget.js +6 -1
- package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfileIcons.js +5 -1
- package/vscode/src/vs/workbench/services/views/browser/viewDescriptorService.js +14 -5
- package/vscode/src/vs/workbench/services/views/common/viewContainerModel.js +5 -1
|
@@ -17,20 +17,24 @@ import { TypeHierarchyTreePeekWidget } from './typeHierarchyPeek.js';
|
|
|
17
17
|
import { TypeHierarchyProviderRegistry, TypeHierarchyModel } from 'vscode/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
|
|
18
18
|
|
|
19
19
|
var TypeHierarchyController_1;
|
|
20
|
-
const _ctxHasTypeHierarchyProvider = ( new RawContextKey(
|
|
20
|
+
const _ctxHasTypeHierarchyProvider = ( new RawContextKey('editorHasTypeHierarchyProvider', false, ( localizeWithPath(
|
|
21
|
+
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution',
|
|
21
22
|
'editorHasTypeHierarchyProvider',
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
23
|
+
'Whether a type hierarchy provider is available'
|
|
24
|
+
))));
|
|
25
|
+
const _ctxTypeHierarchyVisible = ( new RawContextKey('typeHierarchyVisible', false, ( localizeWithPath(
|
|
26
|
+
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution',
|
|
26
27
|
'typeHierarchyVisible',
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
));
|
|
28
|
+
'Whether type hierarchy peek is currently showing'
|
|
29
|
+
))));
|
|
30
30
|
const _ctxTypeHierarchyDirection = ( new RawContextKey(
|
|
31
31
|
'typeHierarchyDirection',
|
|
32
32
|
undefined,
|
|
33
|
-
{ type: 'string', description: localizeWithPath(
|
|
33
|
+
{ type: 'string', description: ( localizeWithPath(
|
|
34
|
+
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution',
|
|
35
|
+
'typeHierarchyDirection',
|
|
36
|
+
'whether type hierarchy shows super types or subtypes'
|
|
37
|
+
)) }
|
|
34
38
|
));
|
|
35
39
|
function sanitizedDirection(candidate) {
|
|
36
40
|
return candidate === "subtypes" || candidate === "supertypes"
|
|
@@ -99,14 +103,22 @@ let TypeHierarchyController = class TypeHierarchyController {
|
|
|
99
103
|
this._widget.showModel(model);
|
|
100
104
|
}
|
|
101
105
|
else {
|
|
102
|
-
this._widget.showMessage(localizeWithPath(
|
|
106
|
+
this._widget.showMessage(( localizeWithPath(
|
|
107
|
+
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution',
|
|
108
|
+
'no.item',
|
|
109
|
+
"No results"
|
|
110
|
+
)));
|
|
103
111
|
}
|
|
104
112
|
}).catch(err => {
|
|
105
113
|
if (isCancellationError(err)) {
|
|
106
114
|
this.endTypeHierarchy();
|
|
107
115
|
return;
|
|
108
116
|
}
|
|
109
|
-
this._widget.showMessage(localizeWithPath(
|
|
117
|
+
this._widget.showMessage(( localizeWithPath(
|
|
118
|
+
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution',
|
|
119
|
+
'error',
|
|
120
|
+
"Failed to show type hierarchy"
|
|
121
|
+
)));
|
|
110
122
|
});
|
|
111
123
|
}
|
|
112
124
|
async startTypeHierarchyFromTypeHierarchy() {
|
|
@@ -151,7 +163,11 @@ registerAction2(class PeekTypeHierarchyAction extends EditorAction2 {
|
|
|
151
163
|
constructor() {
|
|
152
164
|
super({
|
|
153
165
|
id: 'editor.showTypeHierarchy',
|
|
154
|
-
title: { value: localizeWithPath(
|
|
166
|
+
title: { value: ( localizeWithPath(
|
|
167
|
+
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution',
|
|
168
|
+
'title',
|
|
169
|
+
"Peek Type Hierarchy"
|
|
170
|
+
)), original: 'Peek Type Hierarchy' },
|
|
155
171
|
menu: {
|
|
156
172
|
id: MenuId.EditorContextPeek,
|
|
157
173
|
group: 'navigation',
|
|
@@ -170,7 +186,11 @@ registerAction2(class extends EditorAction2 {
|
|
|
170
186
|
constructor() {
|
|
171
187
|
super({
|
|
172
188
|
id: 'editor.showSupertypes',
|
|
173
|
-
title: { value: localizeWithPath(
|
|
189
|
+
title: { value: ( localizeWithPath(
|
|
190
|
+
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution',
|
|
191
|
+
'title.supertypes',
|
|
192
|
+
"Show Supertypes"
|
|
193
|
+
)), original: 'Show Supertypes' },
|
|
174
194
|
icon: Codicon.typeHierarchySuper,
|
|
175
195
|
precondition: ( ContextKeyExpr.and(_ctxTypeHierarchyVisible, ( _ctxTypeHierarchyDirection.isEqualTo("subtypes" )))),
|
|
176
196
|
keybinding: {
|
|
@@ -192,7 +212,11 @@ registerAction2(class extends EditorAction2 {
|
|
|
192
212
|
constructor() {
|
|
193
213
|
super({
|
|
194
214
|
id: 'editor.showSubtypes',
|
|
195
|
-
title: { value: localizeWithPath(
|
|
215
|
+
title: { value: ( localizeWithPath(
|
|
216
|
+
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution',
|
|
217
|
+
'title.subtypes',
|
|
218
|
+
"Show Subtypes"
|
|
219
|
+
)), original: 'Show Subtypes' },
|
|
196
220
|
icon: Codicon.typeHierarchySub,
|
|
197
221
|
precondition: ( ContextKeyExpr.and(_ctxTypeHierarchyVisible, ( _ctxTypeHierarchyDirection.isEqualTo("supertypes" )))),
|
|
198
222
|
keybinding: {
|
|
@@ -214,7 +238,11 @@ registerAction2(class extends EditorAction2 {
|
|
|
214
238
|
constructor() {
|
|
215
239
|
super({
|
|
216
240
|
id: 'editor.refocusTypeHierarchy',
|
|
217
|
-
title: { value: localizeWithPath(
|
|
241
|
+
title: { value: ( localizeWithPath(
|
|
242
|
+
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution',
|
|
243
|
+
'title.refocusTypeHierarchy',
|
|
244
|
+
"Refocus Type Hierarchy"
|
|
245
|
+
)), original: 'Refocus Type Hierarchy' },
|
|
218
246
|
precondition: _ctxTypeHierarchyVisible,
|
|
219
247
|
keybinding: {
|
|
220
248
|
weight: 200 ,
|
|
@@ -230,7 +258,11 @@ registerAction2(class extends EditorAction2 {
|
|
|
230
258
|
constructor() {
|
|
231
259
|
super({
|
|
232
260
|
id: 'editor.closeTypeHierarchy',
|
|
233
|
-
title: localizeWithPath(
|
|
261
|
+
title: ( localizeWithPath(
|
|
262
|
+
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution',
|
|
263
|
+
'close',
|
|
264
|
+
'Close'
|
|
265
|
+
)),
|
|
234
266
|
icon: Codicon.close,
|
|
235
267
|
precondition: _ctxTypeHierarchyVisible,
|
|
236
268
|
keybinding: {
|
|
@@ -250,13 +250,27 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends peek
|
|
|
250
250
|
}
|
|
251
251
|
this._previewDisposable.add(value);
|
|
252
252
|
const title = this._direction === "supertypes"
|
|
253
|
-
? localizeWithPath(
|
|
254
|
-
|
|
253
|
+
? ( localizeWithPath(
|
|
254
|
+
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek',
|
|
255
|
+
'supertypes',
|
|
256
|
+
"Supertypes of '{0}'",
|
|
257
|
+
element.model.root.name
|
|
258
|
+
))
|
|
259
|
+
: ( localizeWithPath(
|
|
260
|
+
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek',
|
|
261
|
+
'subtypes',
|
|
262
|
+
"Subtypes of '{0}'",
|
|
263
|
+
element.model.root.name
|
|
264
|
+
));
|
|
255
265
|
this.setTitle(title);
|
|
256
266
|
}
|
|
257
267
|
showLoading() {
|
|
258
268
|
this._parent.dataset['state'] = "loading" ;
|
|
259
|
-
this.setTitle(localizeWithPath(
|
|
269
|
+
this.setTitle(( localizeWithPath(
|
|
270
|
+
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek',
|
|
271
|
+
'title.loading',
|
|
272
|
+
"Loading..."
|
|
273
|
+
)));
|
|
260
274
|
this._show();
|
|
261
275
|
}
|
|
262
276
|
showMessage(message) {
|
|
@@ -275,8 +289,18 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends peek
|
|
|
275
289
|
await this._tree.expand(root.element);
|
|
276
290
|
if (root.children.length === 0) {
|
|
277
291
|
this.showMessage(this._direction === "supertypes"
|
|
278
|
-
? localizeWithPath(
|
|
279
|
-
|
|
292
|
+
? ( localizeWithPath(
|
|
293
|
+
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek',
|
|
294
|
+
'empt.supertypes',
|
|
295
|
+
"No supertypes of '{0}'",
|
|
296
|
+
model.root.name
|
|
297
|
+
))
|
|
298
|
+
: ( localizeWithPath(
|
|
299
|
+
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek',
|
|
300
|
+
'empt.subtypes',
|
|
301
|
+
"No subtypes of '{0}'",
|
|
302
|
+
model.root.name
|
|
303
|
+
)));
|
|
280
304
|
}
|
|
281
305
|
else {
|
|
282
306
|
this._parent.dataset['state'] = "data" ;
|
|
@@ -104,14 +104,28 @@ class AccessibilityProvider {
|
|
|
104
104
|
this.getDirection = getDirection;
|
|
105
105
|
}
|
|
106
106
|
getWidgetAriaLabel() {
|
|
107
|
-
return localizeWithPath(
|
|
107
|
+
return ( localizeWithPath(
|
|
108
|
+
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree',
|
|
109
|
+
'tree.aria',
|
|
110
|
+
"Type Hierarchy"
|
|
111
|
+
));
|
|
108
112
|
}
|
|
109
113
|
getAriaLabel(element) {
|
|
110
114
|
if (this.getDirection() === "supertypes" ) {
|
|
111
|
-
return localizeWithPath(
|
|
115
|
+
return ( localizeWithPath(
|
|
116
|
+
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree',
|
|
117
|
+
'supertypes',
|
|
118
|
+
"supertypes of {0}",
|
|
119
|
+
element.item.name
|
|
120
|
+
));
|
|
112
121
|
}
|
|
113
122
|
else {
|
|
114
|
-
return localizeWithPath(
|
|
123
|
+
return ( localizeWithPath(
|
|
124
|
+
'vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree',
|
|
125
|
+
'subtypes',
|
|
126
|
+
"subtypes of {0}",
|
|
127
|
+
element.item.name
|
|
128
|
+
));
|
|
115
129
|
}
|
|
116
130
|
}
|
|
117
131
|
}
|
|
@@ -179,7 +179,12 @@ let WebviewElement = class WebviewElement extends Disposable {
|
|
|
179
179
|
this._hasFindResult.fire(didFind);
|
|
180
180
|
}));
|
|
181
181
|
this._register(this.on('fatal-error', (e) => {
|
|
182
|
-
notificationService.error(localizeWithPath(
|
|
182
|
+
notificationService.error(( localizeWithPath(
|
|
183
|
+
'vs/workbench/contrib/webview/browser/webviewElement',
|
|
184
|
+
'fatalErrorMessage',
|
|
185
|
+
"Error loading webview: {0}",
|
|
186
|
+
e.message
|
|
187
|
+
)));
|
|
183
188
|
this._onFatalError.fire({ message: e.message });
|
|
184
189
|
}));
|
|
185
190
|
this._register(this.on('did-keydown', (data) => {
|
|
@@ -11,7 +11,11 @@ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/commo
|
|
|
11
11
|
const webviewActiveContextKeyExpr = ( ContextKeyExpr.and(( ContextKeyExpr.equals('activeEditor', WebviewEditor.ID)), ( EditorContextKeys.focus.toNegated() )));
|
|
12
12
|
class ShowWebViewEditorFindWidgetAction extends Action2 {
|
|
13
13
|
static { this.ID = 'editor.action.webvieweditor.showFind'; }
|
|
14
|
-
static { this.LABEL = nls.localizeWithPath(
|
|
14
|
+
static { this.LABEL = ( nls.localizeWithPath(
|
|
15
|
+
'vs/workbench/contrib/webviewPanel/browser/webviewCommands',
|
|
16
|
+
'editor.action.webvieweditor.showFind',
|
|
17
|
+
"Show find"
|
|
18
|
+
)); }
|
|
15
19
|
constructor() {
|
|
16
20
|
super({
|
|
17
21
|
id: ShowWebViewEditorFindWidgetAction.ID,
|
|
@@ -32,7 +36,11 @@ class ShowWebViewEditorFindWidgetAction extends Action2 {
|
|
|
32
36
|
}
|
|
33
37
|
class HideWebViewEditorFindCommand extends Action2 {
|
|
34
38
|
static { this.ID = 'editor.action.webvieweditor.hideFind'; }
|
|
35
|
-
static { this.LABEL = nls.localizeWithPath(
|
|
39
|
+
static { this.LABEL = ( nls.localizeWithPath(
|
|
40
|
+
'vs/workbench/contrib/webviewPanel/browser/webviewCommands',
|
|
41
|
+
'editor.action.webvieweditor.hideFind',
|
|
42
|
+
"Stop find"
|
|
43
|
+
)); }
|
|
36
44
|
constructor() {
|
|
37
45
|
super({
|
|
38
46
|
id: HideWebViewEditorFindCommand.ID,
|
|
@@ -53,7 +61,11 @@ class HideWebViewEditorFindCommand extends Action2 {
|
|
|
53
61
|
}
|
|
54
62
|
class WebViewEditorFindNextCommand extends Action2 {
|
|
55
63
|
static { this.ID = 'editor.action.webvieweditor.findNext'; }
|
|
56
|
-
static { this.LABEL = nls.localizeWithPath(
|
|
64
|
+
static { this.LABEL = ( nls.localizeWithPath(
|
|
65
|
+
'vs/workbench/contrib/webviewPanel/browser/webviewCommands',
|
|
66
|
+
'editor.action.webvieweditor.findNext',
|
|
67
|
+
'Find next'
|
|
68
|
+
)); }
|
|
57
69
|
constructor() {
|
|
58
70
|
super({
|
|
59
71
|
id: WebViewEditorFindNextCommand.ID,
|
|
@@ -74,7 +86,11 @@ class WebViewEditorFindNextCommand extends Action2 {
|
|
|
74
86
|
}
|
|
75
87
|
class WebViewEditorFindPreviousCommand extends Action2 {
|
|
76
88
|
static { this.ID = 'editor.action.webvieweditor.findPrevious'; }
|
|
77
|
-
static { this.LABEL = nls.localizeWithPath(
|
|
89
|
+
static { this.LABEL = ( nls.localizeWithPath(
|
|
90
|
+
'vs/workbench/contrib/webviewPanel/browser/webviewCommands',
|
|
91
|
+
'editor.action.webvieweditor.findPrevious',
|
|
92
|
+
'Find previous'
|
|
93
|
+
)); }
|
|
78
94
|
constructor() {
|
|
79
95
|
super({
|
|
80
96
|
id: WebViewEditorFindPreviousCommand.ID,
|
|
@@ -95,7 +111,11 @@ class WebViewEditorFindPreviousCommand extends Action2 {
|
|
|
95
111
|
}
|
|
96
112
|
class ReloadWebviewAction extends Action2 {
|
|
97
113
|
static { this.ID = 'workbench.action.webview.reloadWebviewAction'; }
|
|
98
|
-
static { this.LABEL = nls.localizeWithPath(
|
|
114
|
+
static { this.LABEL = ( nls.localizeWithPath(
|
|
115
|
+
'vs/workbench/contrib/webviewPanel/browser/webviewCommands',
|
|
116
|
+
'refreshWebviewLabel',
|
|
117
|
+
"Reload Webviews"
|
|
118
|
+
)); }
|
|
99
119
|
constructor() {
|
|
100
120
|
super({
|
|
101
121
|
id: ReloadWebviewAction.ID,
|
|
@@ -13,7 +13,11 @@ import { ShowWebViewEditorFindWidgetAction, HideWebViewEditorFindCommand, WebVie
|
|
|
13
13
|
import { WebviewEditor } from 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditor';
|
|
14
14
|
import { WebviewInput } from 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
|
|
15
15
|
|
|
16
|
-
(( Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID,
|
|
16
|
+
(( Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localizeWithPath(
|
|
17
|
+
'vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution',
|
|
18
|
+
'webview.editor.label',
|
|
19
|
+
"webview editor"
|
|
20
|
+
))), [( new SyncDescriptor(WebviewInput))]);
|
|
17
21
|
let WebviewPanelContribution = class WebviewPanelContribution extends Disposable {
|
|
18
22
|
constructor(editorGroupService) {
|
|
19
23
|
super();
|
|
@@ -419,8 +419,16 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
419
419
|
if (storedChoices[globForResource] && storedChoices[globForResource].find(editorID => editorID === currentEditor.editorId)) {
|
|
420
420
|
return;
|
|
421
421
|
}
|
|
422
|
-
const handle = this.notificationService.prompt(Severity.Warning, localizeWithPath(
|
|
423
|
-
|
|
422
|
+
const handle = this.notificationService.prompt(Severity.Warning, ( localizeWithPath(
|
|
423
|
+
'vs/workbench/services/editor/browser/editorResolverService',
|
|
424
|
+
'editorResolver.conflictingDefaults',
|
|
425
|
+
'There are multiple default editors available for the resource.'
|
|
426
|
+
)), [{
|
|
427
|
+
label: ( localizeWithPath(
|
|
428
|
+
'vs/workbench/services/editor/browser/editorResolverService',
|
|
429
|
+
'editorResolver.configureDefault',
|
|
430
|
+
'Configure Default'
|
|
431
|
+
)),
|
|
424
432
|
run: async () => {
|
|
425
433
|
const picked = await this.doPickEditor(untypedInput, true);
|
|
426
434
|
if (!picked) {
|
|
@@ -441,7 +449,12 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
441
449
|
}
|
|
442
450
|
},
|
|
443
451
|
{
|
|
444
|
-
label: localizeWithPath(
|
|
452
|
+
label: ( localizeWithPath(
|
|
453
|
+
'vs/workbench/services/editor/browser/editorResolverService',
|
|
454
|
+
'editorResolver.keepDefault',
|
|
455
|
+
'Keep {0}',
|
|
456
|
+
editorName
|
|
457
|
+
)),
|
|
445
458
|
run: writeCurrentEditorsToStorage
|
|
446
459
|
}
|
|
447
460
|
]);
|
|
@@ -467,9 +480,21 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
467
480
|
}
|
|
468
481
|
});
|
|
469
482
|
const quickPickEntries = [];
|
|
470
|
-
const currentlyActiveLabel = localizeWithPath(
|
|
471
|
-
|
|
472
|
-
|
|
483
|
+
const currentlyActiveLabel = ( localizeWithPath(
|
|
484
|
+
'vs/workbench/services/editor/browser/editorResolverService',
|
|
485
|
+
'promptOpenWith.currentlyActive',
|
|
486
|
+
"Active"
|
|
487
|
+
));
|
|
488
|
+
const currentDefaultLabel = ( localizeWithPath(
|
|
489
|
+
'vs/workbench/services/editor/browser/editorResolverService',
|
|
490
|
+
'promptOpenWith.currentDefault',
|
|
491
|
+
"Default"
|
|
492
|
+
));
|
|
493
|
+
const currentDefaultAndActiveLabel = ( localizeWithPath(
|
|
494
|
+
'vs/workbench/services/editor/browser/editorResolverService',
|
|
495
|
+
'promptOpenWith.currentDefaultAndActive',
|
|
496
|
+
"Active and Default"
|
|
497
|
+
));
|
|
473
498
|
let defaultViewType = defaultSetting;
|
|
474
499
|
if (!defaultViewType && registeredEditors.length > 2 && registeredEditors[1]?.editorInfo.priority !== RegisteredEditorPriority.option) {
|
|
475
500
|
defaultViewType = registeredEditors[1]?.editorInfo.id;
|
|
@@ -494,7 +519,12 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
494
519
|
quickPickEntries.push(separator);
|
|
495
520
|
const configureDefaultEntry = {
|
|
496
521
|
id: EditorResolverService_1.configureDefaultID,
|
|
497
|
-
label:
|
|
522
|
+
label: ( localizeWithPath(
|
|
523
|
+
'vs/workbench/services/editor/browser/editorResolverService',
|
|
524
|
+
'promptOpenWith.configureDefault',
|
|
525
|
+
"Configure default editor for '{0}'...",
|
|
526
|
+
`*${extname(resource)}`
|
|
527
|
+
)),
|
|
498
528
|
};
|
|
499
529
|
quickPickEntries.push(configureDefaultEntry);
|
|
500
530
|
}
|
|
@@ -508,8 +538,18 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
508
538
|
const editorPicks = this.mapEditorsToQuickPickEntry(resource, showDefaultPicker);
|
|
509
539
|
const editorPicker = this.quickInputService.createQuickPick();
|
|
510
540
|
const placeHolderMessage = showDefaultPicker ?
|
|
511
|
-
|
|
512
|
-
|
|
541
|
+
( localizeWithPath(
|
|
542
|
+
'vs/workbench/services/editor/browser/editorResolverService',
|
|
543
|
+
'promptOpenWith.updateDefaultPlaceHolder',
|
|
544
|
+
"Select new default editor for '{0}'",
|
|
545
|
+
`*${extname(resource)}`
|
|
546
|
+
)) :
|
|
547
|
+
( localizeWithPath(
|
|
548
|
+
'vs/workbench/services/editor/browser/editorResolverService',
|
|
549
|
+
'promptOpenWith.placeHolder',
|
|
550
|
+
"Select editor for '{0}'",
|
|
551
|
+
basename(resource)
|
|
552
|
+
));
|
|
513
553
|
editorPicker.placeholder = placeHolderMessage;
|
|
514
554
|
editorPicker.canAcceptInBackground = true;
|
|
515
555
|
editorPicker.items = editorPicks;
|
|
@@ -46,51 +46,51 @@ let HistoryService = class HistoryService extends Disposable {
|
|
|
46
46
|
this.activeEditorListeners = this._register(( new DisposableStore()));
|
|
47
47
|
this.lastActiveEditor = undefined;
|
|
48
48
|
this.editorHelper = this.instantiationService.createInstance(EditorHelper);
|
|
49
|
-
this.canNavigateBackContextKey = (( new RawContextKey(
|
|
49
|
+
this.canNavigateBackContextKey = (( new RawContextKey('canNavigateBack', false, ( localizeWithPath(
|
|
50
|
+
'vs/workbench/services/history/browser/historyService',
|
|
50
51
|
'canNavigateBack',
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
52
|
+
"Whether it is possible to navigate back in editor history"
|
|
53
|
+
))))).bindTo(this.contextKeyService);
|
|
54
|
+
this.canNavigateForwardContextKey = (( new RawContextKey('canNavigateForward', false, ( localizeWithPath(
|
|
55
|
+
'vs/workbench/services/history/browser/historyService',
|
|
55
56
|
'canNavigateForward',
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
57
|
+
"Whether it is possible to navigate forward in editor history"
|
|
58
|
+
))))).bindTo(this.contextKeyService);
|
|
59
|
+
this.canNavigateBackInNavigationsContextKey = (( new RawContextKey('canNavigateBackInNavigationLocations', false, ( localizeWithPath(
|
|
60
|
+
'vs/workbench/services/history/browser/historyService',
|
|
60
61
|
'canNavigateBackInNavigationLocations',
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
62
|
+
"Whether it is possible to navigate back in editor navigation locations history"
|
|
63
|
+
))))).bindTo(this.contextKeyService);
|
|
64
|
+
this.canNavigateForwardInNavigationsContextKey = (( new RawContextKey('canNavigateForwardInNavigationLocations', false, ( localizeWithPath(
|
|
65
|
+
'vs/workbench/services/history/browser/historyService',
|
|
65
66
|
'canNavigateForwardInNavigationLocations',
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
67
|
+
"Whether it is possible to navigate forward in editor navigation locations history"
|
|
68
|
+
))))).bindTo(this.contextKeyService);
|
|
69
|
+
this.canNavigateToLastNavigationLocationContextKey = (( new RawContextKey('canNavigateToLastNavigationLocation', false, ( localizeWithPath(
|
|
70
|
+
'vs/workbench/services/history/browser/historyService',
|
|
70
71
|
'canNavigateToLastNavigationLocation',
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
72
|
+
"Whether it is possible to navigate to the last editor navigation location"
|
|
73
|
+
))))).bindTo(this.contextKeyService);
|
|
74
|
+
this.canNavigateBackInEditsContextKey = (( new RawContextKey('canNavigateBackInEditLocations', false, ( localizeWithPath(
|
|
75
|
+
'vs/workbench/services/history/browser/historyService',
|
|
75
76
|
'canNavigateBackInEditLocations',
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
77
|
+
"Whether it is possible to navigate back in editor edit locations history"
|
|
78
|
+
))))).bindTo(this.contextKeyService);
|
|
79
|
+
this.canNavigateForwardInEditsContextKey = (( new RawContextKey('canNavigateForwardInEditLocations', false, ( localizeWithPath(
|
|
80
|
+
'vs/workbench/services/history/browser/historyService',
|
|
80
81
|
'canNavigateForwardInEditLocations',
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
82
|
+
"Whether it is possible to navigate forward in editor edit locations history"
|
|
83
|
+
))))).bindTo(this.contextKeyService);
|
|
84
|
+
this.canNavigateToLastEditLocationContextKey = (( new RawContextKey('canNavigateToLastEditLocation', false, ( localizeWithPath(
|
|
85
|
+
'vs/workbench/services/history/browser/historyService',
|
|
85
86
|
'canNavigateToLastEditLocation',
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
87
|
+
"Whether it is possible to navigate to the last editor edit location"
|
|
88
|
+
))))).bindTo(this.contextKeyService);
|
|
89
|
+
this.canReopenClosedEditorContextKey = (( new RawContextKey('canReopenClosedEditor', false, ( localizeWithPath(
|
|
90
|
+
'vs/workbench/services/history/browser/historyService',
|
|
90
91
|
'canReopenClosedEditor',
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
))).bindTo(this.contextKeyService);
|
|
92
|
+
"Whether it is possible to reopen the last closed editor"
|
|
93
|
+
))))).bindTo(this.contextKeyService);
|
|
94
94
|
this._onDidChangeEditorNavigationStack = this._register(( new Emitter()));
|
|
95
95
|
this.onDidChangeEditorNavigationStack = this._onDidChangeEditorNavigationStack.event;
|
|
96
96
|
this.defaultScopedEditorNavigationStack = undefined;
|
|
@@ -149,7 +149,12 @@ let HoverWidget = class HoverWidget extends Widget {
|
|
|
149
149
|
if (hideOnHover && options.showHoverHint) {
|
|
150
150
|
const statusBarElement = $('div.hover-row.status-bar');
|
|
151
151
|
const infoElement = $('div.info');
|
|
152
|
-
infoElement.textContent = localizeWithPath(
|
|
152
|
+
infoElement.textContent = ( localizeWithPath(
|
|
153
|
+
'vs/workbench/services/hover/browser/hoverWidget',
|
|
154
|
+
'hoverhint',
|
|
155
|
+
'Hold {0} key to mouse over',
|
|
156
|
+
isMacintosh ? 'Option' : 'Alt'
|
|
157
|
+
));
|
|
153
158
|
statusBarElement.appendChild(infoElement);
|
|
154
159
|
this._hover.containerDomNode.appendChild(statusBarElement);
|
|
155
160
|
}
|
|
@@ -2,6 +2,10 @@ import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
|
|
|
2
2
|
import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
|
|
3
3
|
import { registerIcon } from 'monaco-editor/esm/vs/platform/theme/common/iconRegistry.js';
|
|
4
4
|
|
|
5
|
-
const DEFAULT_ICON = registerIcon('settings-view-bar-icon', Codicon.settingsGear, localizeWithPath(
|
|
5
|
+
const DEFAULT_ICON = registerIcon('settings-view-bar-icon', Codicon.settingsGear, ( localizeWithPath(
|
|
6
|
+
'vs/workbench/services/userDataProfile/common/userDataProfileIcons',
|
|
7
|
+
'settingsViewBarIcon',
|
|
8
|
+
"Settings icon in the view bar."
|
|
9
|
+
)));
|
|
6
10
|
|
|
7
11
|
export { DEFAULT_ICON };
|
|
@@ -537,7 +537,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
|
|
|
537
537
|
super({
|
|
538
538
|
id: `${viewDescriptor.id}.toggleVisibility`,
|
|
539
539
|
viewPaneContainerId: viewContainerModel.viewContainer.id,
|
|
540
|
-
precondition: viewDescriptor.canToggleVisibility && (!viewContainerModel.isVisible(viewDescriptor.id) || viewContainerModel.visibleViewDescriptors.length > 1) ? ContextKeyExpr.true() : ContextKeyExpr.false(),
|
|
540
|
+
precondition: viewDescriptor.canToggleVisibility && (!viewContainerModel.isVisible(viewDescriptor.id) || viewContainerModel.visibleViewDescriptors.length > 1) ? ContextKeyExpr.true() : ( ContextKeyExpr.false()),
|
|
541
541
|
toggled: ( ContextKeyExpr.has(`${viewDescriptor.id}.visible`)),
|
|
542
542
|
title: viewDescriptor.name,
|
|
543
543
|
menu: [{
|
|
@@ -555,7 +555,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
|
|
|
555
555
|
group: '1_toggleVisibility'
|
|
556
556
|
}, {
|
|
557
557
|
id: MenuId.ViewTitleContext,
|
|
558
|
-
when: ( ContextKeyExpr.and(viewContainerModel.visibleViewDescriptors.length > 1 ? ( ContextKeyExpr.or(...( viewContainerModel.visibleViewDescriptors.map(v => ( ContextKeyExpr.equals('view', v.id)))))) : ContextKeyExpr.false())),
|
|
558
|
+
when: ( ContextKeyExpr.and(viewContainerModel.visibleViewDescriptors.length > 1 ? ( ContextKeyExpr.or(...( viewContainerModel.visibleViewDescriptors.map(v => ( ContextKeyExpr.equals('view', v.id)))))) : ( ContextKeyExpr.false()))),
|
|
559
559
|
order: index,
|
|
560
560
|
group: '2_toggleVisibility'
|
|
561
561
|
}]
|
|
@@ -570,8 +570,13 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
|
|
|
570
570
|
super({
|
|
571
571
|
id: `${viewDescriptor.id}.removeView`,
|
|
572
572
|
viewPaneContainerId: viewContainerModel.viewContainer.id,
|
|
573
|
-
title: localizeWithPath(
|
|
574
|
-
|
|
573
|
+
title: ( localizeWithPath(
|
|
574
|
+
'vs/workbench/services/views/browser/viewDescriptorService',
|
|
575
|
+
'hideView',
|
|
576
|
+
"Hide '{0}'",
|
|
577
|
+
viewDescriptor.name
|
|
578
|
+
)),
|
|
579
|
+
precondition: viewDescriptor.canToggleVisibility && (!viewContainerModel.isVisible(viewDescriptor.id) || viewContainerModel.visibleViewDescriptors.length > 1) ? ContextKeyExpr.true() : ( ContextKeyExpr.false()),
|
|
575
580
|
menu: [{
|
|
576
581
|
id: MenuId.ViewTitleContext,
|
|
577
582
|
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', viewDescriptor.id)), ( ContextKeyExpr.has(`${viewDescriptor.id}.visible`)))),
|
|
@@ -596,7 +601,11 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
|
|
|
596
601
|
id: `${viewContainer.id}.resetViewContainerLocation`,
|
|
597
602
|
title: {
|
|
598
603
|
original: 'Reset Location',
|
|
599
|
-
value: localizeWithPath(
|
|
604
|
+
value: ( localizeWithPath(
|
|
605
|
+
'vs/workbench/services/views/browser/viewDescriptorService',
|
|
606
|
+
'resetViewLocation',
|
|
607
|
+
"Reset Location"
|
|
608
|
+
))
|
|
600
609
|
},
|
|
601
610
|
menu: [{
|
|
602
611
|
id: MenuId.ViewContainerTitleContext,
|
|
@@ -19,7 +19,11 @@ import { IOutputService } from 'vscode/vscode/vs/workbench/services/output/commo
|
|
|
19
19
|
import { CounterSet } from 'monaco-editor/esm/vs/base/common/map.js';
|
|
20
20
|
|
|
21
21
|
const VIEWS_LOG_ID = 'views';
|
|
22
|
-
const VIEWS_LOG_NAME = localizeWithPath(
|
|
22
|
+
const VIEWS_LOG_NAME = ( localizeWithPath(
|
|
23
|
+
'vs/workbench/services/views/common/viewContainerModel',
|
|
24
|
+
'views log',
|
|
25
|
+
"Views"
|
|
26
|
+
));
|
|
23
27
|
registerAction2(class extends Action2 {
|
|
24
28
|
constructor() {
|
|
25
29
|
super({
|