@codingame/monaco-vscode-view-common-service-override 4.5.0 → 4.5.2
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 +1 -1
- package/package.json +3 -3
- package/vscode/src/vs/base/browser/ui/grid/grid.js +12 -12
- package/vscode/src/vs/base/browser/ui/grid/gridview.js +26 -26
- package/vscode/src/vs/platform/languagePacks/common/localizedStrings.js +4 -3
- package/vscode/src/vs/workbench/api/browser/viewsExtensionPoint.js +127 -220
- package/vscode/src/vs/workbench/browser/actions/listCommands.js +43 -44
- package/vscode/src/vs/workbench/browser/actions/navigationActions.js +7 -30
- package/vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.js +67 -138
- package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.js +21 -36
- package/vscode/src/vs/workbench/browser/parts/compositeBar.js +26 -27
- package/vscode/src/vs/workbench/browser/parts/compositePart.js +17 -31
- package/vscode/src/vs/workbench/browser/parts/editor/editor.contribution.js +215 -764
- package/vscode/src/vs/workbench/browser/parts/editor/editorConfiguration.js +27 -42
- package/vscode/src/vs/workbench/browser/parts/editor/editorDropTarget.js +24 -23
- package/vscode/src/vs/workbench/browser/parts/editor/editorPart.js +3 -3
- package/vscode/src/vs/workbench/browser/parts/editor/editorParts.js +31 -33
- package/vscode/src/vs/workbench/browser/parts/paneCompositeBar.js +51 -54
- package/vscode/src/vs/workbench/browser/parts/paneCompositePart.js +38 -41
- package/vscode/src/vs/workbench/browser/parts/panel/panelPart.js +21 -24
- package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarActions.js +2 -5
- package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarPart.js +17 -20
- package/vscode/src/vs/workbench/browser/window.js +41 -92
- package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.js +41 -78
- package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.js +23 -46
- package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyTree.js +36 -27
- package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditorInputFactory.js +1 -1
- package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditors.js +1 -1
- package/vscode/src/vs/workbench/contrib/customEditor/common/contributedCustomEditors.js +14 -15
- package/vscode/src/vs/workbench/contrib/customEditor/common/customEditor.js +10 -11
- package/vscode/src/vs/workbench/contrib/customEditor/common/customEditorModelManager.js +1 -1
- package/vscode/src/vs/workbench/contrib/customEditor/common/extensionPoint.js +25 -52
- package/vscode/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.js +55 -87
- package/vscode/src/vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution.js +18 -48
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/commands.js +61 -150
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/devCommands.js +15 -70
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution.js +9 -20
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/colors.js +14 -65
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.js +38 -113
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView.js +12 -19
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.js +34 -75
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView.js +16 -37
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.js +40 -43
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.js +12 -11
- package/vscode/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.js +24 -61
- package/vscode/src/vs/workbench/contrib/sash/browser/sash.contribution.js +7 -6
- package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution.js +37 -70
- package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.js +23 -46
- package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.js +26 -27
- package/vscode/src/vs/workbench/contrib/webview/browser/overlayWebview.js +2 -2
- package/vscode/src/vs/workbench/contrib/webview/browser/webviewElement.js +50 -52
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewCommands.js +18 -34
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution.js +7 -10
- package/vscode/src/vs/workbench/contrib/webviewView/browser/webviewViewService.js +2 -2
- package/vscode/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.js +45 -46
- package/vscode/src/vs/workbench/services/driver/browser/driver.js +8 -6
- package/vscode/src/vs/workbench/services/editor/browser/editorResolverService.js +45 -68
- package/vscode/src/vs/workbench/services/history/browser/historyService.js +95 -98
- package/vscode/src/vs/workbench/services/progress/browser/progressService.js +34 -74
- package/vscode/src/vs/workbench/services/views/browser/viewDescriptorService.js +69 -67
- package/vscode/src/vs/workbench/services/views/common/viewContainerModel.js +52 -47
- package/viewCommon.d.ts +0 -5
package/vscode/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.js
CHANGED
|
@@ -31,6 +31,7 @@ import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/commo
|
|
|
31
31
|
import { nativeHoverDelegate } from 'vscode/vscode/vs/platform/hover/browser/hover';
|
|
32
32
|
|
|
33
33
|
var LanguageStatus_1;
|
|
34
|
+
const _moduleId = "vs/workbench/contrib/languageStatus/browser/languageStatus.contribution";
|
|
34
35
|
class LanguageStatusViewModel {
|
|
35
36
|
constructor(combined, dedicated) {
|
|
36
37
|
this.combined = combined;
|
|
@@ -54,24 +55,24 @@ let StoredCounter = class StoredCounter {
|
|
|
54
55
|
return n;
|
|
55
56
|
}
|
|
56
57
|
};
|
|
57
|
-
StoredCounter = ( __decorate([
|
|
58
|
-
( __param(0, IStorageService))
|
|
59
|
-
], StoredCounter));
|
|
58
|
+
StoredCounter = ( (__decorate([
|
|
59
|
+
( (__param(0, IStorageService)))
|
|
60
|
+
], StoredCounter)));
|
|
60
61
|
let LanguageStatusContribution = class LanguageStatusContribution extends Disposable {
|
|
61
62
|
constructor(instantiationService, editorGroupService, editorService) {
|
|
62
63
|
super();
|
|
63
|
-
const mainInstantiationService = instantiationService.createChild(( new ServiceCollection([IEditorService, editorService.createScoped('main', this._store)])));
|
|
64
|
+
const mainInstantiationService = instantiationService.createChild(( (new ServiceCollection([IEditorService, editorService.createScoped('main', this._store)]))));
|
|
64
65
|
this._register(mainInstantiationService.createInstance(LanguageStatus));
|
|
65
66
|
this._register(editorGroupService.onDidCreateAuxiliaryEditorPart(({ instantiationService, disposables }) => {
|
|
66
67
|
disposables.add(instantiationService.createInstance(LanguageStatus));
|
|
67
68
|
}));
|
|
68
69
|
}
|
|
69
70
|
};
|
|
70
|
-
LanguageStatusContribution = ( __decorate([
|
|
71
|
-
( __param(0, IInstantiationService)),
|
|
72
|
-
( __param(1, IEditorGroupsService)),
|
|
73
|
-
( __param(2, IEditorService))
|
|
74
|
-
], LanguageStatusContribution));
|
|
71
|
+
LanguageStatusContribution = ( (__decorate([
|
|
72
|
+
( (__param(0, IInstantiationService))),
|
|
73
|
+
( (__param(1, IEditorGroupsService))),
|
|
74
|
+
( (__param(2, IEditorService)))
|
|
75
|
+
], LanguageStatusContribution)));
|
|
75
76
|
let LanguageStatus = class LanguageStatus {
|
|
76
77
|
static { LanguageStatus_1 = this; }
|
|
77
78
|
static { this._id = 'status.languageStatus'; }
|
|
@@ -82,18 +83,18 @@ let LanguageStatus = class LanguageStatus {
|
|
|
82
83
|
this._editorService = _editorService;
|
|
83
84
|
this._openerService = _openerService;
|
|
84
85
|
this._storageService = _storageService;
|
|
85
|
-
this._disposables = ( new DisposableStore());
|
|
86
|
-
this._dedicated = ( new Set());
|
|
87
|
-
this._dedicatedEntries = ( new Map());
|
|
88
|
-
this._renderDisposables = ( new DisposableStore());
|
|
86
|
+
this._disposables = ( (new DisposableStore()));
|
|
87
|
+
this._dedicated = ( (new Set()));
|
|
88
|
+
this._dedicatedEntries = ( (new Map()));
|
|
89
|
+
this._renderDisposables = ( (new DisposableStore()));
|
|
89
90
|
_storageService.onDidChangeValue(0 , LanguageStatus_1._keyDedicatedItems, this._disposables)(this._handleStorageChange, this, this._disposables);
|
|
90
91
|
this._restoreState();
|
|
91
|
-
this._interactionCounter = ( new StoredCounter(_storageService, 'languageStatus.interactCount'));
|
|
92
|
+
this._interactionCounter = ( (new StoredCounter(_storageService, 'languageStatus.interactCount')));
|
|
92
93
|
_languageStatusService.onDidChange(this._update, this, this._disposables);
|
|
93
94
|
_editorService.onDidActiveEditorChange(this._update, this, this._disposables);
|
|
94
95
|
this._update();
|
|
95
96
|
_statusBarService.onDidChangeEntryVisibility(e => {
|
|
96
|
-
if (!e.visible && ( this._dedicated.has(e.id))) {
|
|
97
|
+
if (!e.visible && ( (this._dedicated.has(e.id)))) {
|
|
97
98
|
this._dedicated.delete(e.id);
|
|
98
99
|
this._update();
|
|
99
100
|
this._storeState();
|
|
@@ -103,7 +104,7 @@ let LanguageStatus = class LanguageStatus {
|
|
|
103
104
|
dispose() {
|
|
104
105
|
this._disposables.dispose();
|
|
105
106
|
this._combinedEntry?.dispose();
|
|
106
|
-
dispose(( this._dedicatedEntries.values()));
|
|
107
|
+
dispose(( (this._dedicatedEntries.values())));
|
|
107
108
|
this._renderDisposables.dispose();
|
|
108
109
|
}
|
|
109
110
|
_handleStorageChange() {
|
|
@@ -114,7 +115,7 @@ let LanguageStatus = class LanguageStatus {
|
|
|
114
115
|
const raw = this._storageService.get(LanguageStatus_1._keyDedicatedItems, 0 , '[]');
|
|
115
116
|
try {
|
|
116
117
|
const ids = JSON.parse(raw);
|
|
117
|
-
this._dedicated = ( new Set(ids));
|
|
118
|
+
this._dedicated = ( (new Set(ids)));
|
|
118
119
|
}
|
|
119
120
|
catch {
|
|
120
121
|
this._dedicated.clear();
|
|
@@ -125,24 +126,28 @@ let LanguageStatus = class LanguageStatus {
|
|
|
125
126
|
this._storageService.remove(LanguageStatus_1._keyDedicatedItems, 0 );
|
|
126
127
|
}
|
|
127
128
|
else {
|
|
128
|
-
const raw = JSON.stringify(Array.from(( this._dedicated.keys())));
|
|
129
|
+
const raw = JSON.stringify(Array.from(( (this._dedicated.keys()))));
|
|
129
130
|
this._storageService.store(LanguageStatus_1._keyDedicatedItems, raw, 0 , 0 );
|
|
130
131
|
}
|
|
131
132
|
}
|
|
132
133
|
_createViewModel(editor) {
|
|
133
134
|
if (!editor?.hasModel()) {
|
|
134
|
-
return (
|
|
135
|
+
return (
|
|
136
|
+
(new LanguageStatusViewModel([], []))
|
|
137
|
+
);
|
|
135
138
|
}
|
|
136
139
|
const all = this._languageStatusService.getLanguageStatus(editor.getModel());
|
|
137
140
|
const combined = [];
|
|
138
141
|
const dedicated = [];
|
|
139
142
|
for (const item of all) {
|
|
140
|
-
if (( this._dedicated.has(item.id))) {
|
|
143
|
+
if (( (this._dedicated.has(item.id)))) {
|
|
141
144
|
dedicated.push(item);
|
|
142
145
|
}
|
|
143
146
|
combined.push(item);
|
|
144
147
|
}
|
|
145
|
-
return (
|
|
148
|
+
return (
|
|
149
|
+
(new LanguageStatusViewModel(combined, dedicated))
|
|
150
|
+
);
|
|
146
151
|
}
|
|
147
152
|
_update() {
|
|
148
153
|
const editor = getCodeEditor(this._editorService.activeTextEditorControl);
|
|
@@ -171,17 +176,8 @@ let LanguageStatus = class LanguageStatus {
|
|
|
171
176
|
isOneBusy = isOneBusy || (!isPinned && status.busy);
|
|
172
177
|
}
|
|
173
178
|
const props = {
|
|
174
|
-
name: ( localizeWithPath(
|
|
175
|
-
|
|
176
|
-
'langStatus.name',
|
|
177
|
-
"Editor Language Status"
|
|
178
|
-
)),
|
|
179
|
-
ariaLabel: ( localizeWithPath(
|
|
180
|
-
'vs/workbench/contrib/languageStatus/browser/languageStatus.contribution',
|
|
181
|
-
'langStatus.aria',
|
|
182
|
-
"Editor Language Status: {0}",
|
|
183
|
-
ariaLabels.join(', next: ')
|
|
184
|
-
)),
|
|
179
|
+
name: ( localizeWithPath(_moduleId, 0, "Editor Language Status")),
|
|
180
|
+
ariaLabel: ( localizeWithPath(_moduleId, 1, "Editor Language Status: {0}", ariaLabels.join(', next: '))),
|
|
185
181
|
tooltip: element,
|
|
186
182
|
command: ShowTooltipCommand,
|
|
187
183
|
text: isOneBusy ? `${text}\u00A0\u00A0$(sync~spin)` : text,
|
|
@@ -213,18 +209,18 @@ let LanguageStatus = class LanguageStatus {
|
|
|
213
209
|
if (!userHasInteractedWithStatus) {
|
|
214
210
|
const hoverTarget = targetWindow.document.querySelector('.monaco-workbench .context-view');
|
|
215
211
|
if (hoverTarget instanceof HTMLElement) {
|
|
216
|
-
const observer = ( new MutationObserver(() => {
|
|
212
|
+
const observer = ( (new MutationObserver(() => {
|
|
217
213
|
if (targetWindow.document.contains(element)) {
|
|
218
214
|
this._interactionCounter.increment();
|
|
219
215
|
observer.disconnect();
|
|
220
216
|
}
|
|
221
|
-
}));
|
|
217
|
+
})));
|
|
222
218
|
observer.observe(hoverTarget, { childList: true, subtree: true });
|
|
223
219
|
this._renderDisposables.add(toDisposable(() => observer.disconnect()));
|
|
224
220
|
}
|
|
225
221
|
}
|
|
226
222
|
}
|
|
227
|
-
const newDedicatedEntries = ( new Map());
|
|
223
|
+
const newDedicatedEntries = ( (new Map()));
|
|
228
224
|
for (const status of model.dedicated) {
|
|
229
225
|
const props = LanguageStatus_1._asStatusbarEntry(status);
|
|
230
226
|
let entry = this._dedicatedEntries.get(status.id);
|
|
@@ -237,7 +233,7 @@ let LanguageStatus = class LanguageStatus {
|
|
|
237
233
|
}
|
|
238
234
|
newDedicatedEntries.set(status.id, entry);
|
|
239
235
|
}
|
|
240
|
-
dispose(( this._dedicatedEntries.values()));
|
|
236
|
+
dispose(( (this._dedicatedEntries.values())));
|
|
241
237
|
this._dedicatedEntries = newDedicatedEntries;
|
|
242
238
|
}
|
|
243
239
|
_renderStatus(status, showSeverity, isPinned, store) {
|
|
@@ -269,40 +265,32 @@ let LanguageStatus = class LanguageStatus {
|
|
|
269
265
|
element.appendChild(right);
|
|
270
266
|
const { command } = status;
|
|
271
267
|
if (command) {
|
|
272
|
-
store.add(( new Link(right, {
|
|
268
|
+
store.add(( (new Link(right, {
|
|
273
269
|
label: command.title,
|
|
274
270
|
title: command.tooltip,
|
|
275
|
-
href: ( ( URI.from({
|
|
271
|
+
href: ( (( (URI.from({
|
|
276
272
|
scheme: 'command', path: command.id, query: command.arguments && JSON.stringify(command.arguments)
|
|
277
|
-
})).toString())
|
|
278
|
-
}, { hoverDelegate: nativeHoverDelegate }, this._openerService)));
|
|
273
|
+
}))).toString()))
|
|
274
|
+
}, { hoverDelegate: nativeHoverDelegate }, this._openerService))));
|
|
279
275
|
}
|
|
280
|
-
const actionBar = ( new ActionBar(right, { hoverDelegate: nativeHoverDelegate }));
|
|
276
|
+
const actionBar = ( (new ActionBar(right, { hoverDelegate: nativeHoverDelegate })));
|
|
281
277
|
store.add(actionBar);
|
|
282
278
|
let action;
|
|
283
279
|
if (!isPinned) {
|
|
284
|
-
action = ( new Action('pin', ( localizeWithPath(
|
|
285
|
-
'vs/workbench/contrib/languageStatus/browser/languageStatus.contribution',
|
|
286
|
-
'pin',
|
|
287
|
-
"Add to Status Bar"
|
|
288
|
-
)), ThemeIcon.asClassName(Codicon.pin), true, () => {
|
|
280
|
+
action = ( (new Action('pin', ( localizeWithPath(_moduleId, 2, "Add to Status Bar")), ThemeIcon.asClassName(Codicon.pin), true, () => {
|
|
289
281
|
this._dedicated.add(status.id);
|
|
290
282
|
this._statusBarService.updateEntryVisibility(status.id, true);
|
|
291
283
|
this._update();
|
|
292
284
|
this._storeState();
|
|
293
|
-
}));
|
|
285
|
+
})));
|
|
294
286
|
}
|
|
295
287
|
else {
|
|
296
|
-
action = ( new Action('unpin', ( localizeWithPath(
|
|
297
|
-
'vs/workbench/contrib/languageStatus/browser/languageStatus.contribution',
|
|
298
|
-
'unpin',
|
|
299
|
-
"Remove from Status Bar"
|
|
300
|
-
)), ThemeIcon.asClassName(Codicon.pinned), true, () => {
|
|
288
|
+
action = ( (new Action('unpin', ( localizeWithPath(_moduleId, 3, "Remove from Status Bar")), ThemeIcon.asClassName(Codicon.pinned), true, () => {
|
|
301
289
|
this._dedicated.delete(status.id);
|
|
302
290
|
this._statusBarService.updateEntryVisibility(status.id, false);
|
|
303
291
|
this._update();
|
|
304
292
|
this._storeState();
|
|
305
|
-
}));
|
|
293
|
+
})));
|
|
306
294
|
}
|
|
307
295
|
actionBar.push(action, { icon: true, label: false });
|
|
308
296
|
store.add(action);
|
|
@@ -329,7 +317,7 @@ let LanguageStatus = class LanguageStatus {
|
|
|
329
317
|
append(target, ...parts);
|
|
330
318
|
}
|
|
331
319
|
else {
|
|
332
|
-
store.add(( new Link(target, node, undefined, this._openerService)));
|
|
320
|
+
store.add(( (new Link(target, node, undefined, this._openerService))));
|
|
333
321
|
}
|
|
334
322
|
}
|
|
335
323
|
}
|
|
@@ -339,21 +327,10 @@ let LanguageStatus = class LanguageStatus {
|
|
|
339
327
|
}
|
|
340
328
|
const textValue = typeof status.label === 'string' ? status.label : status.label.value;
|
|
341
329
|
if (status.detail) {
|
|
342
|
-
return { label: ( localizeWithPath(
|
|
343
|
-
'vs/workbench/contrib/languageStatus/browser/languageStatus.contribution',
|
|
344
|
-
'aria.1',
|
|
345
|
-
'{0}, {1}',
|
|
346
|
-
textValue,
|
|
347
|
-
status.detail
|
|
348
|
-
)) };
|
|
330
|
+
return { label: ( localizeWithPath(_moduleId, 4, '{0}, {1}', textValue, status.detail)) };
|
|
349
331
|
}
|
|
350
332
|
else {
|
|
351
|
-
return { label: ( localizeWithPath(
|
|
352
|
-
'vs/workbench/contrib/languageStatus/browser/languageStatus.contribution',
|
|
353
|
-
'aria.2',
|
|
354
|
-
'{0}',
|
|
355
|
-
textValue
|
|
356
|
-
)) };
|
|
333
|
+
return { label: ( localizeWithPath(_moduleId, 5, '{0}', textValue)) };
|
|
357
334
|
}
|
|
358
335
|
}
|
|
359
336
|
static _asStatusbarEntry(item) {
|
|
@@ -366,38 +343,29 @@ let LanguageStatus = class LanguageStatus {
|
|
|
366
343
|
}
|
|
367
344
|
const textValue = typeof item.label === 'string' ? item.label : item.label.shortValue;
|
|
368
345
|
return {
|
|
369
|
-
name: ( localizeWithPath(
|
|
370
|
-
'vs/workbench/contrib/languageStatus/browser/languageStatus.contribution',
|
|
371
|
-
'name.pattern',
|
|
372
|
-
'{0} (Language Status)',
|
|
373
|
-
item.name
|
|
374
|
-
)),
|
|
346
|
+
name: ( localizeWithPath(_moduleId, 6, '{0} (Language Status)', item.name)),
|
|
375
347
|
text: item.busy ? `${textValue}\u00A0\u00A0$(sync~spin)` : textValue,
|
|
376
348
|
ariaLabel: LanguageStatus_1._accessibilityInformation(item).label,
|
|
377
349
|
role: item.accessibilityInfo?.role,
|
|
378
|
-
tooltip: item.command?.tooltip || ( new MarkdownString(item.detail, { isTrusted: true, supportThemeIcons: true })),
|
|
350
|
+
tooltip: item.command?.tooltip || ( (new MarkdownString(item.detail, { isTrusted: true, supportThemeIcons: true }))),
|
|
379
351
|
kind,
|
|
380
352
|
command: item.command
|
|
381
353
|
};
|
|
382
354
|
}
|
|
383
355
|
};
|
|
384
|
-
LanguageStatus = LanguageStatus_1 = ( __decorate([
|
|
385
|
-
( __param(0, ILanguageStatusService)),
|
|
386
|
-
( __param(1, IStatusbarService)),
|
|
387
|
-
( __param(2, IEditorService)),
|
|
388
|
-
( __param(3, IOpenerService)),
|
|
389
|
-
( __param(4, IStorageService))
|
|
390
|
-
], LanguageStatus));
|
|
391
|
-
( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(LanguageStatusContribution, 3 );
|
|
356
|
+
LanguageStatus = LanguageStatus_1 = ( (__decorate([
|
|
357
|
+
( (__param(0, ILanguageStatusService))),
|
|
358
|
+
( (__param(1, IStatusbarService))),
|
|
359
|
+
( (__param(2, IEditorService))),
|
|
360
|
+
( (__param(3, IOpenerService))),
|
|
361
|
+
( (__param(4, IStorageService)))
|
|
362
|
+
], LanguageStatus)));
|
|
363
|
+
( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(LanguageStatusContribution, 3 );
|
|
392
364
|
registerAction2(class extends Action2 {
|
|
393
365
|
constructor() {
|
|
394
366
|
super({
|
|
395
367
|
id: 'editor.inlayHints.Reset',
|
|
396
|
-
title: ( localize2WithPath(
|
|
397
|
-
'vs/workbench/contrib/languageStatus/browser/languageStatus.contribution',
|
|
398
|
-
'reset',
|
|
399
|
-
"Reset Language Status Interaction Counter"
|
|
400
|
-
)),
|
|
368
|
+
title: ( localize2WithPath(_moduleId, 7, "Reset Language Status Interaction Counter")),
|
|
401
369
|
category: Categories.View,
|
|
402
370
|
f1: true
|
|
403
371
|
});
|
package/vscode/src/vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution.js
CHANGED
|
@@ -10,17 +10,16 @@ import { localizeWithPath } from 'vscode/vscode/vs/nls';
|
|
|
10
10
|
import { FoldingController } from 'vscode/vscode/vs/editor/contrib/folding/browser/folding';
|
|
11
11
|
import { ColorDetector } from 'vscode/vscode/vs/editor/contrib/colorPicker/browser/colorDetector';
|
|
12
12
|
|
|
13
|
+
const _moduleId = "vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution";
|
|
13
14
|
const openSettingsCommand = 'workbench.action.openSettings';
|
|
14
|
-
const configureSettingsLabel = ( localizeWithPath(
|
|
15
|
-
'vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution',
|
|
16
|
-
'status.button.configure',
|
|
17
|
-
"Configure"
|
|
18
|
-
));
|
|
15
|
+
const configureSettingsLabel = ( localizeWithPath(_moduleId, 0, "Configure"));
|
|
19
16
|
let LimitIndicatorContribution = class LimitIndicatorContribution extends Disposable {
|
|
20
17
|
constructor(editorService, languageStatusService) {
|
|
21
18
|
super();
|
|
22
|
-
const accessors = [( new ColorDecorationAccessor()), ( new FoldingRangeAccessor())];
|
|
23
|
-
const statusEntries = ( accessors.map(
|
|
19
|
+
const accessors = [( (new ColorDecorationAccessor())), ( (new FoldingRangeAccessor()))];
|
|
20
|
+
const statusEntries = ( (accessors.map(
|
|
21
|
+
indicator => ( (new LanguageStatusEntry(languageStatusService, indicator)))
|
|
22
|
+
)));
|
|
24
23
|
statusEntries.forEach(entry => this._register(entry));
|
|
25
24
|
let control;
|
|
26
25
|
const onActiveEditorChanged = () => {
|
|
@@ -36,28 +35,16 @@ let LimitIndicatorContribution = class LimitIndicatorContribution extends Dispos
|
|
|
36
35
|
onActiveEditorChanged();
|
|
37
36
|
}
|
|
38
37
|
};
|
|
39
|
-
LimitIndicatorContribution = ( __decorate([
|
|
40
|
-
( __param(0, IEditorService)),
|
|
41
|
-
( __param(1, ILanguageStatusService))
|
|
42
|
-
], LimitIndicatorContribution));
|
|
38
|
+
LimitIndicatorContribution = ( (__decorate([
|
|
39
|
+
( (__param(0, IEditorService))),
|
|
40
|
+
( (__param(1, ILanguageStatusService)))
|
|
41
|
+
], LimitIndicatorContribution)));
|
|
43
42
|
class ColorDecorationAccessor {
|
|
44
43
|
constructor() {
|
|
45
44
|
this.id = 'decoratorsLimitInfo';
|
|
46
|
-
this.name = ( localizeWithPath(
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
'Color Decorator Status'
|
|
50
|
-
));
|
|
51
|
-
this.label = ( localizeWithPath(
|
|
52
|
-
'vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution',
|
|
53
|
-
'status.limitedColorDecorators.short',
|
|
54
|
-
'Color Decorators'
|
|
55
|
-
));
|
|
56
|
-
this.source = ( localizeWithPath(
|
|
57
|
-
'vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution',
|
|
58
|
-
'colorDecoratorsStatusItem.source',
|
|
59
|
-
'Color Decorators'
|
|
60
|
-
));
|
|
45
|
+
this.name = ( localizeWithPath(_moduleId, 1, 'Color Decorator Status'));
|
|
46
|
+
this.label = ( localizeWithPath(_moduleId, 2, 'Color Decorators'));
|
|
47
|
+
this.source = ( localizeWithPath(_moduleId, 3, 'Color Decorators'));
|
|
61
48
|
this.settingsId = 'editor.colorDecoratorsLimit';
|
|
62
49
|
}
|
|
63
50
|
getLimitReporter(editor) {
|
|
@@ -67,21 +54,9 @@ class ColorDecorationAccessor {
|
|
|
67
54
|
class FoldingRangeAccessor {
|
|
68
55
|
constructor() {
|
|
69
56
|
this.id = 'foldingLimitInfo';
|
|
70
|
-
this.name = ( localizeWithPath(
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
'Folding Status'
|
|
74
|
-
));
|
|
75
|
-
this.label = ( localizeWithPath(
|
|
76
|
-
'vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution',
|
|
77
|
-
'status.limitedFoldingRanges.short',
|
|
78
|
-
'Folding Ranges'
|
|
79
|
-
));
|
|
80
|
-
this.source = ( localizeWithPath(
|
|
81
|
-
'vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution',
|
|
82
|
-
'foldingRangesStatusItem.source',
|
|
83
|
-
'Folding'
|
|
84
|
-
));
|
|
57
|
+
this.name = ( localizeWithPath(_moduleId, 4, 'Folding Status'));
|
|
58
|
+
this.label = ( localizeWithPath(_moduleId, 5, 'Folding Ranges'));
|
|
59
|
+
this.source = ( localizeWithPath(_moduleId, 6, 'Folding'));
|
|
85
60
|
this.settingsId = 'editor.foldingMaximumRegions';
|
|
86
61
|
}
|
|
87
62
|
getLimitReporter(editor) {
|
|
@@ -123,12 +98,7 @@ class LanguageStatusEntry {
|
|
|
123
98
|
name: this.accessor.name,
|
|
124
99
|
severity: Severity$1.Warning,
|
|
125
100
|
label: this.accessor.label,
|
|
126
|
-
detail: ( localizeWithPath(
|
|
127
|
-
'vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution',
|
|
128
|
-
'status.limited.details',
|
|
129
|
-
'only {0} shown for performance reasons',
|
|
130
|
-
info.limited
|
|
131
|
-
)),
|
|
101
|
+
detail: ( localizeWithPath(_moduleId, 7, 'only {0} shown for performance reasons', info.limited)),
|
|
132
102
|
command: { id: openSettingsCommand, arguments: [this.accessor.settingsId], title: configureSettingsLabel },
|
|
133
103
|
accessibilityInfo: undefined,
|
|
134
104
|
source: this.accessor.source,
|
|
@@ -142,6 +112,6 @@ class LanguageStatusEntry {
|
|
|
142
112
|
this._indicatorChangeListener = undefined;
|
|
143
113
|
}
|
|
144
114
|
}
|
|
145
|
-
( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(LimitIndicatorContribution, 3 );
|
|
115
|
+
( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(LimitIndicatorContribution, 3 );
|
|
146
116
|
|
|
147
117
|
export { LimitIndicatorContribution };
|