@codingame/monaco-vscode-view-common-service-override 21.3.2 → 21.3.3
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.js +1 -0
- package/package.json +41 -41
- 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 +3 -3
- 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/editors/baseCodeEditorView.js +3 -3
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.js +11 -11
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView.js +5 -5
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.js +1 -1
- 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.contribution.d.ts +1 -0
- package/vscode/src/vs/workbench/contrib/scrollLocking/browser/scrollLocking.contribution.js +6 -0
- package/vscode/src/vs/workbench/contrib/scrollLocking/browser/scrollLocking.d.ts +26 -0
- package/vscode/src/vs/workbench/contrib/scrollLocking/browser/scrollLocking.js +195 -0
- package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution.js +10 -10
- package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.js +5 -5
- 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 +9 -9
- package/vscode/src/vs/workbench/services/history/browser/historyService.js +9 -9
- package/vscode/src/vs/workbench/services/progress/browser/progressService.js +8 -8
- package/vscode/src/vs/workbench/services/views/browser/viewDescriptorService.js +5 -5
|
@@ -450,8 +450,8 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
450
450
|
if (storedChoices[globForResource] && storedChoices[globForResource].find(editorID => editorID === currentEditor.editorId)) {
|
|
451
451
|
return;
|
|
452
452
|
}
|
|
453
|
-
const handle = this.notificationService.prompt(Severity.Warning, ( localize(
|
|
454
|
-
label: ( localize(
|
|
453
|
+
const handle = this.notificationService.prompt(Severity.Warning, ( localize(13216, 'There are multiple default editors available for the resource.')), [{
|
|
454
|
+
label: ( localize(13217, 'Configure Default')),
|
|
455
455
|
run: async () => {
|
|
456
456
|
const picked = await this.doPickEditor(untypedInput, true);
|
|
457
457
|
if (!picked) {
|
|
@@ -472,7 +472,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
472
472
|
}
|
|
473
473
|
},
|
|
474
474
|
{
|
|
475
|
-
label: ( localize(
|
|
475
|
+
label: ( localize(13218, 'Keep {0}', editorName)),
|
|
476
476
|
run: writeCurrentEditorsToStorage
|
|
477
477
|
}
|
|
478
478
|
]);
|
|
@@ -498,9 +498,9 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
498
498
|
}
|
|
499
499
|
});
|
|
500
500
|
const quickPickEntries = [];
|
|
501
|
-
const currentlyActiveLabel = ( localize(
|
|
502
|
-
const currentDefaultLabel = ( localize(
|
|
503
|
-
const currentDefaultAndActiveLabel = ( localize(
|
|
501
|
+
const currentlyActiveLabel = ( localize(13219, "Active"));
|
|
502
|
+
const currentDefaultLabel = ( localize(13220, "Default"));
|
|
503
|
+
const currentDefaultAndActiveLabel = ( localize(13221, "Active and Default"));
|
|
504
504
|
let defaultViewType = defaultSetting;
|
|
505
505
|
if (!defaultViewType && registeredEditors.length > 2 && registeredEditors[1]?.editorInfo.priority !== RegisteredEditorPriority.option) {
|
|
506
506
|
defaultViewType = registeredEditors[1]?.editorInfo.id;
|
|
@@ -525,7 +525,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
525
525
|
quickPickEntries.push(separator);
|
|
526
526
|
const configureDefaultEntry = {
|
|
527
527
|
id: EditorResolverService_1.configureDefaultID,
|
|
528
|
-
label: ( localize(
|
|
528
|
+
label: ( localize(13222, "Configure default editor for '{0}'...", `*${extname(resource)}`)),
|
|
529
529
|
};
|
|
530
530
|
quickPickEntries.push(configureDefaultEntry);
|
|
531
531
|
}
|
|
@@ -540,8 +540,8 @@ let EditorResolverService = class EditorResolverService extends Disposable {
|
|
|
540
540
|
const disposables = ( new DisposableStore());
|
|
541
541
|
const editorPicker = disposables.add(this.quickInputService.createQuickPick({ useSeparators: true }));
|
|
542
542
|
const placeHolderMessage = showDefaultPicker ?
|
|
543
|
-
( localize(
|
|
544
|
-
( localize(
|
|
543
|
+
( localize(13223, "Select new default editor for '{0}'", `*${extname(resource)}`)) :
|
|
544
|
+
( localize(13224, "Select editor for '{0}'", basename(resource)));
|
|
545
545
|
editorPicker.placeholder = placeHolderMessage;
|
|
546
546
|
editorPicker.canAcceptInBackground = true;
|
|
547
547
|
editorPicker.items = editorPicks;
|
|
@@ -77,33 +77,33 @@ let HistoryService = class HistoryService extends Disposable {
|
|
|
77
77
|
return matcher;
|
|
78
78
|
})));
|
|
79
79
|
this.editorHelper = this.instantiationService.createInstance(EditorHelper);
|
|
80
|
-
this.canNavigateBackContextKey = (( new RawContextKey('canNavigateBack', false, ( localize(
|
|
81
|
-
this.canNavigateForwardContextKey = (( new RawContextKey('canNavigateForward', false, ( localize(
|
|
80
|
+
this.canNavigateBackContextKey = (( new RawContextKey('canNavigateBack', false, ( localize(13437, "Whether it is possible to navigate back in editor history"))))).bindTo(this.contextKeyService);
|
|
81
|
+
this.canNavigateForwardContextKey = (( new RawContextKey('canNavigateForward', false, ( localize(13438, "Whether it is possible to navigate forward in editor history"))))).bindTo(this.contextKeyService);
|
|
82
82
|
this.canNavigateBackInNavigationsContextKey = (( new RawContextKey('canNavigateBackInNavigationLocations', false, ( localize(
|
|
83
|
-
|
|
83
|
+
13439,
|
|
84
84
|
"Whether it is possible to navigate back in editor navigation locations history"
|
|
85
85
|
))))).bindTo(this.contextKeyService);
|
|
86
86
|
this.canNavigateForwardInNavigationsContextKey = (( new RawContextKey('canNavigateForwardInNavigationLocations', false, ( localize(
|
|
87
|
-
|
|
87
|
+
13440,
|
|
88
88
|
"Whether it is possible to navigate forward in editor navigation locations history"
|
|
89
89
|
))))).bindTo(this.contextKeyService);
|
|
90
90
|
this.canNavigateToLastNavigationLocationContextKey = (( new RawContextKey('canNavigateToLastNavigationLocation', false, ( localize(
|
|
91
|
-
|
|
91
|
+
13441,
|
|
92
92
|
"Whether it is possible to navigate to the last editor navigation location"
|
|
93
93
|
))))).bindTo(this.contextKeyService);
|
|
94
94
|
this.canNavigateBackInEditsContextKey = (( new RawContextKey('canNavigateBackInEditLocations', false, ( localize(
|
|
95
|
-
|
|
95
|
+
13442,
|
|
96
96
|
"Whether it is possible to navigate back in editor edit locations history"
|
|
97
97
|
))))).bindTo(this.contextKeyService);
|
|
98
98
|
this.canNavigateForwardInEditsContextKey = (( new RawContextKey('canNavigateForwardInEditLocations', false, ( localize(
|
|
99
|
-
|
|
99
|
+
13443,
|
|
100
100
|
"Whether it is possible to navigate forward in editor edit locations history"
|
|
101
101
|
))))).bindTo(this.contextKeyService);
|
|
102
102
|
this.canNavigateToLastEditLocationContextKey = (( new RawContextKey('canNavigateToLastEditLocation', false, ( localize(
|
|
103
|
-
|
|
103
|
+
13444,
|
|
104
104
|
"Whether it is possible to navigate to the last editor edit location"
|
|
105
105
|
))))).bindTo(this.contextKeyService);
|
|
106
|
-
this.canReopenClosedEditorContextKey = (( new RawContextKey('canReopenClosedEditor', false, ( localize(
|
|
106
|
+
this.canReopenClosedEditorContextKey = (( new RawContextKey('canReopenClosedEditor', false, ( localize(13445, "Whether it is possible to reopen the last closed editor"))))).bindTo(this.contextKeyService);
|
|
107
107
|
this.registerListeners();
|
|
108
108
|
if (this.editorService.activeEditorPane) {
|
|
109
109
|
this.onDidActiveEditorChange();
|
|
@@ -132,23 +132,23 @@ let ProgressService = class ProgressService extends Disposable {
|
|
|
132
132
|
let title;
|
|
133
133
|
const source = options.source && typeof options.source !== 'string' ? options.source.label : options.source;
|
|
134
134
|
if (progressTitle && progressMessage) {
|
|
135
|
-
text = ( localize(
|
|
136
|
-
title = source ? ( localize(
|
|
135
|
+
text = ( localize(13572, "{0}: {1}", progressTitle, progressMessage));
|
|
136
|
+
title = source ? ( localize(13573, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
|
|
137
137
|
}
|
|
138
138
|
else if (progressTitle) {
|
|
139
139
|
text = progressTitle;
|
|
140
|
-
title = source ? ( localize(
|
|
140
|
+
title = source ? ( localize(13574, "[{0}]: {1}", source, progressTitle)) : text;
|
|
141
141
|
}
|
|
142
142
|
else if (progressMessage) {
|
|
143
143
|
text = progressMessage;
|
|
144
|
-
title = source ? ( localize(
|
|
144
|
+
title = source ? ( localize(13574, "[{0}]: {1}", source, progressMessage)) : text;
|
|
145
145
|
}
|
|
146
146
|
else {
|
|
147
147
|
this.updateWindowProgress(idx + 1);
|
|
148
148
|
return;
|
|
149
149
|
}
|
|
150
150
|
const statusEntryProperties = {
|
|
151
|
-
name: ( localize(
|
|
151
|
+
name: ( localize(13575, "Progress Message")),
|
|
152
152
|
text,
|
|
153
153
|
showProgress: options.type || true,
|
|
154
154
|
ariaLabel: text,
|
|
@@ -244,7 +244,7 @@ let ProgressService = class ProgressService extends Disposable {
|
|
|
244
244
|
if (options.cancellable) {
|
|
245
245
|
const cancelAction = new (class extends Action {
|
|
246
246
|
constructor() {
|
|
247
|
-
super('progress.cancel', typeof options.cancellable === 'string' ? options.cancellable : ( localize(
|
|
247
|
+
super('progress.cancel', typeof options.cancellable === 'string' ? options.cancellable : ( localize(13576, "Cancel")), undefined, true);
|
|
248
248
|
}
|
|
249
249
|
async run() {
|
|
250
250
|
progressStateModel.cancel();
|
|
@@ -422,8 +422,8 @@ let ProgressService = class ProgressService extends Disposable {
|
|
|
422
422
|
const buttons = options.buttons || [];
|
|
423
423
|
if (!options.sticky) {
|
|
424
424
|
buttons.push(options.cancellable
|
|
425
|
-
? (typeof options.cancellable === 'boolean' ? ( localize(
|
|
426
|
-
: ( localize(
|
|
425
|
+
? (typeof options.cancellable === 'boolean' ? ( localize(13576, "Cancel")) : options.cancellable)
|
|
426
|
+
: ( localize(13577, "Dismiss")));
|
|
427
427
|
}
|
|
428
428
|
dialog = ( new Dialog(
|
|
429
429
|
this.layoutService.activeContainer,
|
|
@@ -346,7 +346,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
|
|
|
346
346
|
const container = this.viewContainersRegistry.registerViewContainer({
|
|
347
347
|
id,
|
|
348
348
|
ctorDescriptor: ( new SyncDescriptor(ViewPaneContainer, [id, { mergeViewWithContainerWhenSingleView: true }])),
|
|
349
|
-
title: { value: ( localize(
|
|
349
|
+
title: { value: ( localize(13942, "User View Container")), original: 'User View Container' },
|
|
350
350
|
icon: location === ViewContainerLocation.Sidebar ? defaultViewIcon : undefined,
|
|
351
351
|
storageId: getViewContainerStorageId(id),
|
|
352
352
|
hideIfEmpty: true
|
|
@@ -560,7 +560,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
|
|
|
560
560
|
title: viewDescriptor.name,
|
|
561
561
|
metadata: {
|
|
562
562
|
description: ( localize2(
|
|
563
|
-
|
|
563
|
+
13943,
|
|
564
564
|
'Toggles the visibility of the {0} view if the view container it is located in is visible',
|
|
565
565
|
viewDescriptor.name.value
|
|
566
566
|
))
|
|
@@ -591,10 +591,10 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
|
|
|
591
591
|
super({
|
|
592
592
|
id: `${viewDescriptor.id}.removeView`,
|
|
593
593
|
viewPaneContainerId: viewContainerModel.viewContainer.id,
|
|
594
|
-
title: ( localize(
|
|
594
|
+
title: ( localize(13944, "Hide '{0}'", viewDescriptor.name.value)),
|
|
595
595
|
metadata: {
|
|
596
596
|
description: ( localize2(
|
|
597
|
-
|
|
597
|
+
13945,
|
|
598
598
|
'Hides the {0} view if it is visible and the view container it is located in is visible',
|
|
599
599
|
viewDescriptor.name.value
|
|
600
600
|
))
|
|
@@ -624,7 +624,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
|
|
|
624
624
|
constructor() {
|
|
625
625
|
super({
|
|
626
626
|
id: `${viewContainer.id}.resetViewContainerLocation`,
|
|
627
|
-
title: ( localize2(
|
|
627
|
+
title: ( localize2(13946, "Reset Location")),
|
|
628
628
|
menu: [{
|
|
629
629
|
id: MenuId.ViewContainerTitleContext,
|
|
630
630
|
group: '1_viewActions',
|