@codingame/monaco-vscode-view-common-service-override 28.4.0 → 29.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/vscode/src/vs/workbench/api/browser/viewsExtensionPoint.js +59 -59
- package/vscode/src/vs/workbench/browser/actions/helpActions.js +20 -20
- package/vscode/src/vs/workbench/browser/actions/listCommands.js +3 -3
- package/vscode/src/vs/workbench/browser/actions/navigationActions.js +6 -6
- package/vscode/src/vs/workbench/browser/parts/editor/editor.contribution.js +180 -169
- package/vscode/src/vs/workbench/browser/parts/editor/editorConfiguration.js +8 -8
- package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.js +12 -12
- package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.js +3 -3
- package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyTree.js +3 -3
- package/vscode/src/vs/workbench/contrib/customEditor/common/contributedCustomEditors.js +1 -1
- package/vscode/src/vs/workbench/contrib/customEditor/common/customEditor.js +1 -1
- package/vscode/src/vs/workbench/contrib/customEditor/common/extensionPoint.js +10 -10
- package/vscode/src/vs/workbench/contrib/languageStatus/browser/languageStatus.js +7 -7
- package/vscode/src/vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution.js +8 -8
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/commands.js +29 -29
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/devCommands.js +14 -14
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution.js +2 -2
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorAccessibilityHelp.js +5 -5
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/colors.js +13 -13
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.js +20 -20
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView.js +3 -3
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.js +10 -10
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView.js +3 -3
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.js +2 -2
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.js +1 -1
- package/vscode/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.js +12 -12
- package/vscode/src/vs/workbench/contrib/sash/browser/sash.contribution.js +2 -2
- package/vscode/src/vs/workbench/contrib/scrollLocking/browser/scrollLocking.js +7 -7
- package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution.js +10 -10
- package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.js +3 -3
- package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.js +3 -3
- package/vscode/src/vs/workbench/contrib/webview/browser/webviewElement.js +1 -1
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewCommands.js +5 -5
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution.js +1 -1
- package/vscode/src/vs/workbench/services/editor/browser/editorResolverService.js +8 -8
- package/vscode/src/vs/workbench/services/history/browser/historyService.js +9 -9
- package/vscode/src/vs/workbench/services/progress/browser/progressService.js +7 -7
- package/vscode/src/vs/workbench/services/views/browser/viewDescriptorService.js +5 -5
- package/vscode/src/vs/workbench/services/views/browser/viewsService.js +9 -9
- package/vscode/src/vs/workbench/services/views/common/viewContainerModel.d.ts +1 -0
- package/vscode/src/vs/workbench/services/views/common/viewContainerModel.js +3 -0
|
@@ -22,11 +22,11 @@ import { TypeHierarchyTreePeekWidget } from './typeHierarchyPeek.js';
|
|
|
22
22
|
import { TypeHierarchyDirection, TypeHierarchyProviderRegistry, TypeHierarchyModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
|
|
23
23
|
|
|
24
24
|
var TypeHierarchyController_1;
|
|
25
|
-
const _ctxHasTypeHierarchyProvider = ( new RawContextKey("editorHasTypeHierarchyProvider", false, ( localize(
|
|
26
|
-
const _ctxTypeHierarchyVisible = ( new RawContextKey("typeHierarchyVisible", false, ( localize(
|
|
25
|
+
const _ctxHasTypeHierarchyProvider = ( new RawContextKey("editorHasTypeHierarchyProvider", false, ( localize(14701, "Whether a type hierarchy provider is available"))));
|
|
26
|
+
const _ctxTypeHierarchyVisible = ( new RawContextKey("typeHierarchyVisible", false, ( localize(14702, "Whether type hierarchy peek is currently showing"))));
|
|
27
27
|
const _ctxTypeHierarchyDirection = ( new RawContextKey("typeHierarchyDirection", undefined, {
|
|
28
28
|
type: "string",
|
|
29
|
-
description: ( localize(
|
|
29
|
+
description: ( localize(14703, "whether type hierarchy shows super types or subtypes"))
|
|
30
30
|
}));
|
|
31
31
|
function sanitizedDirection(candidate) {
|
|
32
32
|
return candidate === TypeHierarchyDirection.Subtypes || candidate === TypeHierarchyDirection.Supertypes ? candidate : TypeHierarchyDirection.Subtypes;
|
|
@@ -121,14 +121,14 @@ let TypeHierarchyController = class TypeHierarchyController {
|
|
|
121
121
|
this._sessionDisposables.add(model);
|
|
122
122
|
this._widget.showModel(model);
|
|
123
123
|
} else {
|
|
124
|
-
this._widget.showMessage(( localize(
|
|
124
|
+
this._widget.showMessage(( localize(14704, "No results")));
|
|
125
125
|
}
|
|
126
126
|
}).catch(err => {
|
|
127
127
|
if (isCancellationError(err)) {
|
|
128
128
|
this.endTypeHierarchy();
|
|
129
129
|
return;
|
|
130
130
|
}
|
|
131
|
-
this._widget.showMessage(( localize(
|
|
131
|
+
this._widget.showMessage(( localize(14705, "Failed to show type hierarchy")));
|
|
132
132
|
});
|
|
133
133
|
}
|
|
134
134
|
async startTypeHierarchyFromTypeHierarchy() {
|
|
@@ -179,7 +179,7 @@ registerAction2(class PeekTypeHierarchyAction extends EditorAction2 {
|
|
|
179
179
|
constructor() {
|
|
180
180
|
super({
|
|
181
181
|
id: "editor.showTypeHierarchy",
|
|
182
|
-
title: ( localize2(
|
|
182
|
+
title: ( localize2(14706, "Peek Type Hierarchy")),
|
|
183
183
|
menu: {
|
|
184
184
|
id: MenuId.EditorContextPeek,
|
|
185
185
|
group: "navigation",
|
|
@@ -198,7 +198,7 @@ registerAction2(class extends EditorAction2 {
|
|
|
198
198
|
constructor() {
|
|
199
199
|
super({
|
|
200
200
|
id: "editor.showSupertypes",
|
|
201
|
-
title: ( localize2(
|
|
201
|
+
title: ( localize2(14707, "Show Supertypes")),
|
|
202
202
|
icon: Codicon.typeHierarchySuper,
|
|
203
203
|
precondition: ( ContextKeyExpr.and(_ctxTypeHierarchyVisible, ( _ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Subtypes)))),
|
|
204
204
|
keybinding: {
|
|
@@ -220,7 +220,7 @@ registerAction2(class extends EditorAction2 {
|
|
|
220
220
|
constructor() {
|
|
221
221
|
super({
|
|
222
222
|
id: "editor.showSubtypes",
|
|
223
|
-
title: ( localize2(
|
|
223
|
+
title: ( localize2(14708, "Show Subtypes")),
|
|
224
224
|
icon: Codicon.typeHierarchySub,
|
|
225
225
|
precondition: ( ContextKeyExpr.and(_ctxTypeHierarchyVisible, ( _ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Supertypes)))),
|
|
226
226
|
keybinding: {
|
|
@@ -242,7 +242,7 @@ registerAction2(class extends EditorAction2 {
|
|
|
242
242
|
constructor() {
|
|
243
243
|
super({
|
|
244
244
|
id: "editor.refocusTypeHierarchy",
|
|
245
|
-
title: ( localize2(
|
|
245
|
+
title: ( localize2(14709, "Refocus Type Hierarchy")),
|
|
246
246
|
precondition: _ctxTypeHierarchyVisible,
|
|
247
247
|
keybinding: {
|
|
248
248
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
@@ -258,7 +258,7 @@ registerAction2(class extends EditorAction2 {
|
|
|
258
258
|
constructor() {
|
|
259
259
|
super({
|
|
260
260
|
id: "editor.closeTypeHierarchy",
|
|
261
|
-
title: ( localize(
|
|
261
|
+
title: ( localize(14710, "Close")),
|
|
262
262
|
icon: Codicon.close,
|
|
263
263
|
precondition: _ctxTypeHierarchyVisible,
|
|
264
264
|
keybinding: {
|
|
@@ -326,12 +326,12 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
|
|
|
326
326
|
this._previewDisposable.add(toDisposable(() => decorationsCollection.clear()));
|
|
327
327
|
}
|
|
328
328
|
this._previewDisposable.add(value);
|
|
329
|
-
const title = this._direction === TypeHierarchyDirection.Supertypes ? ( localize(
|
|
329
|
+
const title = this._direction === TypeHierarchyDirection.Supertypes ? ( localize(14711, "Supertypes of '{0}'", element.model.root.name)) : ( localize(14712, "Subtypes of '{0}'", element.model.root.name));
|
|
330
330
|
this.setTitle(title);
|
|
331
331
|
}
|
|
332
332
|
showLoading() {
|
|
333
333
|
this._parent.dataset["state"] = State.Loading;
|
|
334
|
-
this.setTitle(( localize(
|
|
334
|
+
this.setTitle(( localize(14713, "Loading...")));
|
|
335
335
|
this._show();
|
|
336
336
|
}
|
|
337
337
|
showMessage(message) {
|
|
@@ -349,7 +349,7 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
|
|
|
349
349
|
const root = this._tree.getNode(model).children[0];
|
|
350
350
|
await this._tree.expand(root.element);
|
|
351
351
|
if (root.children.length === 0) {
|
|
352
|
-
this.showMessage(this._direction === TypeHierarchyDirection.Supertypes ? ( localize(
|
|
352
|
+
this.showMessage(this._direction === TypeHierarchyDirection.Supertypes ? ( localize(14714, "No supertypes of '{0}'", model.root.name)) : ( localize(14715, "No subtypes of '{0}'", model.root.name)));
|
|
353
353
|
} else {
|
|
354
354
|
this._parent.dataset["state"] = State.Data;
|
|
355
355
|
if (!viewState || this._tree.getFocus().length === 0) {
|
|
@@ -123,13 +123,13 @@ class AccessibilityProvider {
|
|
|
123
123
|
this.getDirection = getDirection;
|
|
124
124
|
}
|
|
125
125
|
getWidgetAriaLabel() {
|
|
126
|
-
return localize(
|
|
126
|
+
return localize(14716, "Type Hierarchy");
|
|
127
127
|
}
|
|
128
128
|
getAriaLabel(element) {
|
|
129
129
|
if (this.getDirection() === TypeHierarchyDirection.Supertypes) {
|
|
130
|
-
return localize(
|
|
130
|
+
return localize(14717, "supertypes of {0}", element.item.name);
|
|
131
131
|
} else {
|
|
132
|
-
return localize(
|
|
132
|
+
return localize(14718, "subtypes of {0}", element.item.name);
|
|
133
133
|
}
|
|
134
134
|
}
|
|
135
135
|
}
|
|
@@ -205,7 +205,7 @@ let WebviewElement = class WebviewElement extends Disposable {
|
|
|
205
205
|
this._hasFindResult.fire(didFind);
|
|
206
206
|
}));
|
|
207
207
|
this._register(this.on("fatal-error", e => {
|
|
208
|
-
notificationService.error(( localize(
|
|
208
|
+
notificationService.error(( localize(15099, "Error loading webview: {0}", e.message)));
|
|
209
209
|
this._onFatalError.fire({
|
|
210
210
|
message: e.message
|
|
211
211
|
});
|
|
@@ -18,7 +18,7 @@ class ShowWebViewEditorFindWidgetAction extends Action2 {
|
|
|
18
18
|
this.ID = "editor.action.webvieweditor.showFind";
|
|
19
19
|
}
|
|
20
20
|
static {
|
|
21
|
-
this.LABEL = ( localize(
|
|
21
|
+
this.LABEL = ( localize(15130, "Show find"));
|
|
22
22
|
}
|
|
23
23
|
constructor() {
|
|
24
24
|
super({
|
|
@@ -43,7 +43,7 @@ class HideWebViewEditorFindCommand extends Action2 {
|
|
|
43
43
|
this.ID = "editor.action.webvieweditor.hideFind";
|
|
44
44
|
}
|
|
45
45
|
static {
|
|
46
|
-
this.LABEL = ( localize(
|
|
46
|
+
this.LABEL = ( localize(15131, "Stop find"));
|
|
47
47
|
}
|
|
48
48
|
constructor() {
|
|
49
49
|
super({
|
|
@@ -68,7 +68,7 @@ class WebViewEditorFindNextCommand extends Action2 {
|
|
|
68
68
|
this.ID = "editor.action.webvieweditor.findNext";
|
|
69
69
|
}
|
|
70
70
|
static {
|
|
71
|
-
this.LABEL = ( localize(
|
|
71
|
+
this.LABEL = ( localize(15132, "Find next"));
|
|
72
72
|
}
|
|
73
73
|
constructor() {
|
|
74
74
|
super({
|
|
@@ -93,7 +93,7 @@ class WebViewEditorFindPreviousCommand extends Action2 {
|
|
|
93
93
|
this.ID = "editor.action.webvieweditor.findPrevious";
|
|
94
94
|
}
|
|
95
95
|
static {
|
|
96
|
-
this.LABEL = ( localize(
|
|
96
|
+
this.LABEL = ( localize(15133, "Find previous"));
|
|
97
97
|
}
|
|
98
98
|
constructor() {
|
|
99
99
|
super({
|
|
@@ -118,7 +118,7 @@ class ReloadWebviewAction extends Action2 {
|
|
|
118
118
|
this.ID = "workbench.action.webview.reloadWebviewAction";
|
|
119
119
|
}
|
|
120
120
|
static {
|
|
121
|
-
this.LABEL = ( localize2(
|
|
121
|
+
this.LABEL = ( localize2(15134, "Reload Webviews"));
|
|
122
122
|
}
|
|
123
123
|
constructor() {
|
|
124
124
|
super({
|
|
@@ -19,7 +19,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/ins
|
|
|
19
19
|
import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
|
|
20
20
|
|
|
21
21
|
( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(
|
|
22
|
-
EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(
|
|
22
|
+
EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(15136, "webview editor"))),
|
|
23
23
|
[( new SyncDescriptor(WebviewInput))]
|
|
24
24
|
);
|
|
25
25
|
let WebviewPanelContribution = class WebviewPanelContribution extends Disposable {
|
|
@@ -560,8 +560,8 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
560
560
|
if (storedChoices[globForResource]?.find(editorID => editorID === currentEditor.editorId)) {
|
|
561
561
|
return;
|
|
562
562
|
}
|
|
563
|
-
const handle = this.notificationService.prompt(Severity.Warning, ( localize(
|
|
564
|
-
label: ( localize(
|
|
563
|
+
const handle = this.notificationService.prompt(Severity.Warning, ( localize(15883, "There are multiple default editors available for the resource.")), [{
|
|
564
|
+
label: ( localize(15884, "Configure Default")),
|
|
565
565
|
run: async () => {
|
|
566
566
|
const picked = await this.doPickEditor(untypedInput, true);
|
|
567
567
|
if (!picked) {
|
|
@@ -579,7 +579,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
579
579
|
}]);
|
|
580
580
|
}
|
|
581
581
|
}, {
|
|
582
|
-
label: ( localize(
|
|
582
|
+
label: ( localize(15885, "Keep {0}", editorName)),
|
|
583
583
|
run: writeCurrentEditorsToStorage
|
|
584
584
|
}]);
|
|
585
585
|
const onCloseListener = handle.onDidClose(() => {
|
|
@@ -602,9 +602,9 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
602
602
|
}
|
|
603
603
|
});
|
|
604
604
|
const quickPickEntries = [];
|
|
605
|
-
const currentlyActiveLabel = ( localize(
|
|
606
|
-
const currentDefaultLabel = ( localize(
|
|
607
|
-
const currentDefaultAndActiveLabel = ( localize(
|
|
605
|
+
const currentlyActiveLabel = ( localize(15886, "Active"));
|
|
606
|
+
const currentDefaultLabel = ( localize(15887, "Default"));
|
|
607
|
+
const currentDefaultAndActiveLabel = ( localize(15888, "Active and Default"));
|
|
608
608
|
let defaultViewType = defaultSetting;
|
|
609
609
|
if (!defaultViewType && registeredEditors.length > 2 && registeredEditors[1]?.editorInfo.priority !== RegisteredEditorPriority.option) {
|
|
610
610
|
defaultViewType = registeredEditors[1]?.editorInfo.id;
|
|
@@ -631,7 +631,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
631
631
|
quickPickEntries.push(separator);
|
|
632
632
|
const configureDefaultEntry = {
|
|
633
633
|
id: EditorResolverService_1.configureDefaultID,
|
|
634
|
-
label: ( localize(
|
|
634
|
+
label: ( localize(15889, "Configure default editor for '{0}'...", `*${extname(resource)}`))
|
|
635
635
|
};
|
|
636
636
|
quickPickEntries.push(configureDefaultEntry);
|
|
637
637
|
}
|
|
@@ -651,7 +651,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
651
651
|
const editorPicker = disposables.add(this.quickInputService.createQuickPick({
|
|
652
652
|
useSeparators: true
|
|
653
653
|
}));
|
|
654
|
-
const placeHolderMessage = showDefaultPicker ? ( localize(
|
|
654
|
+
const placeHolderMessage = showDefaultPicker ? ( localize(15890, "Select new default editor for '{0}'", `*${extname(resource)}`)) : ( localize(15891, "Select editor for '{0}'", basename(resource)));
|
|
655
655
|
editorPicker.placeholder = placeHolderMessage;
|
|
656
656
|
editorPicker.canAcceptInBackground = true;
|
|
657
657
|
editorPicker.items = editorPicks;
|
|
@@ -101,33 +101,33 @@ let HistoryService = class HistoryService extends Disposable {
|
|
|
101
101
|
return matcher;
|
|
102
102
|
}));
|
|
103
103
|
this.editorHelper = this.instantiationService.createInstance(EditorHelper);
|
|
104
|
-
this.canNavigateBackContextKey = ( new RawContextKey("canNavigateBack", false, ( localize(
|
|
105
|
-
this.canNavigateForwardContextKey = ( new RawContextKey("canNavigateForward", false, ( localize(
|
|
104
|
+
this.canNavigateBackContextKey = ( new RawContextKey("canNavigateBack", false, ( localize(16105, "Whether it is possible to navigate back in editor history")))).bindTo(this.contextKeyService);
|
|
105
|
+
this.canNavigateForwardContextKey = ( new RawContextKey("canNavigateForward", false, ( localize(16106, "Whether it is possible to navigate forward in editor history")))).bindTo(this.contextKeyService);
|
|
106
106
|
this.canNavigateBackInNavigationsContextKey = ( new RawContextKey("canNavigateBackInNavigationLocations", false, ( localize(
|
|
107
|
-
|
|
107
|
+
16107,
|
|
108
108
|
"Whether it is possible to navigate back in editor navigation locations history"
|
|
109
109
|
)))).bindTo(this.contextKeyService);
|
|
110
110
|
this.canNavigateForwardInNavigationsContextKey = ( new RawContextKey("canNavigateForwardInNavigationLocations", false, ( localize(
|
|
111
|
-
|
|
111
|
+
16108,
|
|
112
112
|
"Whether it is possible to navigate forward in editor navigation locations history"
|
|
113
113
|
)))).bindTo(this.contextKeyService);
|
|
114
114
|
this.canNavigateToLastNavigationLocationContextKey = ( new RawContextKey("canNavigateToLastNavigationLocation", false, ( localize(
|
|
115
|
-
|
|
115
|
+
16109,
|
|
116
116
|
"Whether it is possible to navigate to the last editor navigation location"
|
|
117
117
|
)))).bindTo(this.contextKeyService);
|
|
118
118
|
this.canNavigateBackInEditsContextKey = ( new RawContextKey("canNavigateBackInEditLocations", false, ( localize(
|
|
119
|
-
|
|
119
|
+
16110,
|
|
120
120
|
"Whether it is possible to navigate back in editor edit locations history"
|
|
121
121
|
)))).bindTo(this.contextKeyService);
|
|
122
122
|
this.canNavigateForwardInEditsContextKey = ( new RawContextKey("canNavigateForwardInEditLocations", false, ( localize(
|
|
123
|
-
|
|
123
|
+
16111,
|
|
124
124
|
"Whether it is possible to navigate forward in editor edit locations history"
|
|
125
125
|
)))).bindTo(this.contextKeyService);
|
|
126
126
|
this.canNavigateToLastEditLocationContextKey = ( new RawContextKey("canNavigateToLastEditLocation", false, ( localize(
|
|
127
|
-
|
|
127
|
+
16112,
|
|
128
128
|
"Whether it is possible to navigate to the last editor edit location"
|
|
129
129
|
)))).bindTo(this.contextKeyService);
|
|
130
|
-
this.canReopenClosedEditorContextKey = ( new RawContextKey("canReopenClosedEditor", false, ( localize(
|
|
130
|
+
this.canReopenClosedEditorContextKey = ( new RawContextKey("canReopenClosedEditor", false, ( localize(16113, "Whether it is possible to reopen the last closed editor")))).bindTo(this.contextKeyService);
|
|
131
131
|
this.registerListeners();
|
|
132
132
|
if (this.editorService.activeEditorPane) {
|
|
133
133
|
this.onDidActiveEditorChange();
|
|
@@ -173,20 +173,20 @@ let ProgressService = class ProgressService extends Disposable {
|
|
|
173
173
|
let title;
|
|
174
174
|
const source = options.source && typeof options.source !== "string" ? options.source.label : options.source;
|
|
175
175
|
if (progressTitle && progressMessage) {
|
|
176
|
-
text = ( localize(
|
|
177
|
-
title = source ? ( localize(
|
|
176
|
+
text = ( localize(16241, "{0}: {1}", progressTitle, progressMessage));
|
|
177
|
+
title = source ? ( localize(16242, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
|
|
178
178
|
} else if (progressTitle) {
|
|
179
179
|
text = progressTitle;
|
|
180
|
-
title = source ? ( localize(
|
|
180
|
+
title = source ? ( localize(16243, "[{0}]: {1}", source, progressTitle)) : text;
|
|
181
181
|
} else if (progressMessage) {
|
|
182
182
|
text = progressMessage;
|
|
183
|
-
title = source ? ( localize(
|
|
183
|
+
title = source ? ( localize(16243, "[{0}]: {1}", source, progressMessage)) : text;
|
|
184
184
|
} else {
|
|
185
185
|
this.updateWindowProgress(idx + 1);
|
|
186
186
|
return;
|
|
187
187
|
}
|
|
188
188
|
const statusEntryProperties = {
|
|
189
|
-
name: ( localize(
|
|
189
|
+
name: ( localize(16244, "Progress Message")),
|
|
190
190
|
text,
|
|
191
191
|
showProgress: options.type || true,
|
|
192
192
|
ariaLabel: text,
|
|
@@ -292,7 +292,7 @@ let ProgressService = class ProgressService extends Disposable {
|
|
|
292
292
|
constructor() {
|
|
293
293
|
super(
|
|
294
294
|
"progress.cancel",
|
|
295
|
-
typeof options.cancellable === "string" ? options.cancellable : ( localize(
|
|
295
|
+
typeof options.cancellable === "string" ? options.cancellable : ( localize(16245, "Cancel")),
|
|
296
296
|
undefined,
|
|
297
297
|
true
|
|
298
298
|
);
|
|
@@ -484,7 +484,7 @@ let ProgressService = class ProgressService extends Disposable {
|
|
|
484
484
|
const buttons = options.buttons || [];
|
|
485
485
|
if (!options.sticky) {
|
|
486
486
|
buttons.push(
|
|
487
|
-
options.cancellable ? (typeof options.cancellable === "boolean" ? ( localize(
|
|
487
|
+
options.cancellable ? (typeof options.cancellable === "boolean" ? ( localize(16245, "Cancel")) : options.cancellable) : ( localize(16246, "Dismiss"))
|
|
488
488
|
);
|
|
489
489
|
}
|
|
490
490
|
dialog = ( new Dialog(
|
|
@@ -509,7 +509,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
|
|
|
509
509
|
mergeViewWithContainerWhenSingleView: true
|
|
510
510
|
}])),
|
|
511
511
|
title: {
|
|
512
|
-
value: ( localize(
|
|
512
|
+
value: ( localize(16622, "User View Container")),
|
|
513
513
|
original: "User View Container"
|
|
514
514
|
},
|
|
515
515
|
icon: location === ViewContainerLocation.Sidebar ? defaultViewIcon : undefined,
|
|
@@ -822,7 +822,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
|
|
|
822
822
|
title: viewDescriptor.name,
|
|
823
823
|
metadata: {
|
|
824
824
|
description: ( localize2(
|
|
825
|
-
|
|
825
|
+
16623,
|
|
826
826
|
"Toggles the visibility of the {0} view if the view container it is located in is visible",
|
|
827
827
|
viewDescriptor.name.value
|
|
828
828
|
))
|
|
@@ -853,10 +853,10 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
|
|
|
853
853
|
super({
|
|
854
854
|
id: `${viewDescriptor.id}.removeView`,
|
|
855
855
|
viewPaneContainerId: viewContainerModel.viewContainer.id,
|
|
856
|
-
title: ( localize(
|
|
856
|
+
title: ( localize(16624, "Hide '{0}'", viewDescriptor.name.value)),
|
|
857
857
|
metadata: {
|
|
858
858
|
description: ( localize2(
|
|
859
|
-
|
|
859
|
+
16625,
|
|
860
860
|
"Hides the {0} view if it is visible and the view container it is located in is visible",
|
|
861
861
|
viewDescriptor.name.value
|
|
862
862
|
))
|
|
@@ -886,7 +886,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
|
|
|
886
886
|
constructor() {
|
|
887
887
|
super({
|
|
888
888
|
id: `${viewContainer.id}.resetViewContainerLocation`,
|
|
889
|
-
title: ( localize2(
|
|
889
|
+
title: ( localize2(16626, "Reset Location")),
|
|
890
890
|
menu: [{
|
|
891
891
|
id: MenuId.ViewContainerTitleContext,
|
|
892
892
|
group: "1_viewActions",
|
|
@@ -285,7 +285,7 @@ let ViewsService = class ViewsService extends Disposable {
|
|
|
285
285
|
return this.viewDescriptorService.getViewDescriptorById(( viewId.toString()));
|
|
286
286
|
}
|
|
287
287
|
getFocusedViewName() {
|
|
288
|
-
const textEditorFocused = this.editorService.activeTextEditorControl?.hasTextFocus() ? ( localize(
|
|
288
|
+
const textEditorFocused = this.editorService.activeTextEditorControl?.hasTextFocus() ? ( localize(16627, "Text Editor")) : undefined;
|
|
289
289
|
return this.getFocusedView()?.name?.value ?? textEditorFocused ?? "";
|
|
290
290
|
}
|
|
291
291
|
async openView(id, focus) {
|
|
@@ -391,12 +391,12 @@ let ViewsService = class ViewsService extends Disposable {
|
|
|
391
391
|
const originalTitle = typeof title === "string" ? title : title.original;
|
|
392
392
|
if (viewContainerLocation === ViewContainerLocation.Sidebar) {
|
|
393
393
|
return {
|
|
394
|
-
value: ( localize(
|
|
394
|
+
value: ( localize(16628, "Show {0}", localizedTitle)),
|
|
395
395
|
original: `Show ${originalTitle}`
|
|
396
396
|
};
|
|
397
397
|
} else {
|
|
398
398
|
return {
|
|
399
|
-
value: ( localize(
|
|
399
|
+
value: ( localize(16629, "Toggle {0}", localizedTitle)),
|
|
400
400
|
original: `Toggle ${originalTitle}`
|
|
401
401
|
};
|
|
402
402
|
}
|
|
@@ -468,12 +468,12 @@ let ViewsService = class ViewsService extends Disposable {
|
|
|
468
468
|
const originalTitle = typeof title === "string" ? title : title.original;
|
|
469
469
|
if (viewContainerLocation === ViewContainerLocation.Sidebar) {
|
|
470
470
|
return {
|
|
471
|
-
value: ( localize(
|
|
471
|
+
value: ( localize(16628, "Show {0}", localizedTitle)),
|
|
472
472
|
original: `Show ${originalTitle}`
|
|
473
473
|
};
|
|
474
474
|
} else {
|
|
475
475
|
return {
|
|
476
|
-
value: ( localize(
|
|
476
|
+
value: ( localize(16629, "Toggle {0}", localizedTitle)),
|
|
477
477
|
original: `Toggle ${originalTitle}`
|
|
478
478
|
};
|
|
479
479
|
}
|
|
@@ -486,7 +486,7 @@ let ViewsService = class ViewsService extends Disposable {
|
|
|
486
486
|
} : undefined,
|
|
487
487
|
f1: viewDescriptor.openCommandActionDescriptor ? true : undefined,
|
|
488
488
|
metadata: {
|
|
489
|
-
description: ( localize(
|
|
489
|
+
description: ( localize(16630, "Opens view {0}", viewDescriptor.name.value)),
|
|
490
490
|
args: [{
|
|
491
491
|
name: "options",
|
|
492
492
|
schema: {
|
|
@@ -495,7 +495,7 @@ let ViewsService = class ViewsService extends Disposable {
|
|
|
495
495
|
"preserveFocus": {
|
|
496
496
|
type: "boolean",
|
|
497
497
|
default: false,
|
|
498
|
-
description: ( localize(
|
|
498
|
+
description: ( localize(16631, "Whether to preserve the existing focus when opening the view."))
|
|
499
499
|
}
|
|
500
500
|
}
|
|
501
501
|
}
|
|
@@ -542,7 +542,7 @@ let ViewsService = class ViewsService extends Disposable {
|
|
|
542
542
|
registerFocusViewAction(viewDescriptor, category) {
|
|
543
543
|
return registerAction2(class FocusViewAction extends Action2 {
|
|
544
544
|
constructor() {
|
|
545
|
-
const title = ( localize2(
|
|
545
|
+
const title = ( localize2(16632, "Focus on {0} View", viewDescriptor.name.value));
|
|
546
546
|
super({
|
|
547
547
|
id: viewDescriptor.focusCommand ? viewDescriptor.focusCommand.id : `${viewDescriptor.id}.focus`,
|
|
548
548
|
title,
|
|
@@ -588,7 +588,7 @@ let ViewsService = class ViewsService extends Disposable {
|
|
|
588
588
|
constructor() {
|
|
589
589
|
super({
|
|
590
590
|
id: `${viewDescriptor.id}.resetViewLocation`,
|
|
591
|
-
title: ( localize2(
|
|
591
|
+
title: ( localize2(16633, "Reset Location")),
|
|
592
592
|
menu: [{
|
|
593
593
|
id: MenuId.ViewTitleContext,
|
|
594
594
|
when: ( ContextKeyExpr.or(( ContextKeyExpr.and(( ContextKeyExpr.equals("view", viewDescriptor.id)), ( ContextKeyExpr.equals(`${viewDescriptor.id}.defaultViewLocation`, false)))))),
|
|
@@ -52,6 +52,7 @@ export declare class ViewContainerModel extends Disposable implements IViewConta
|
|
|
52
52
|
private readonly logger;
|
|
53
53
|
constructor(viewContainer: ViewContainer, instantiationService: IInstantiationService, contextKeyService: IContextKeyService, loggerService: ILoggerService);
|
|
54
54
|
private updateContainerInfo;
|
|
55
|
+
refreshContainerInfo(): void;
|
|
55
56
|
private isEqualIcon;
|
|
56
57
|
isVisible(id: string): boolean;
|
|
57
58
|
setVisible(id: string, visible: boolean): void;
|
|
@@ -348,6 +348,9 @@ let ViewContainerModel = class ViewContainerModel extends Disposable {
|
|
|
348
348
|
});
|
|
349
349
|
}
|
|
350
350
|
}
|
|
351
|
+
refreshContainerInfo() {
|
|
352
|
+
this.updateContainerInfo();
|
|
353
|
+
}
|
|
351
354
|
isEqualIcon(icon) {
|
|
352
355
|
if (URI.isUri(icon)) {
|
|
353
356
|
return URI.isUri(this._icon) && isEqual(icon, this._icon);
|