@codingame/monaco-vscode-view-common-service-override 4.5.1 → 5.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +3 -3
- package/viewCommon.js +3 -6
- 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 +142 -221
- package/vscode/src/vs/workbench/browser/actions/listCommands.js +49 -45
- package/vscode/src/vs/workbench/browser/actions/navigationActions.js +7 -30
- package/vscode/src/vs/workbench/browser/media/style.css.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.js +67 -138
- package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.js +25 -38
- package/vscode/src/vs/workbench/browser/parts/auxiliarybar/media/auxiliaryBarPart.css.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/compositeBar.js +26 -27
- package/vscode/src/vs/workbench/browser/parts/compositePart.js +20 -34
- package/vscode/src/vs/workbench/browser/parts/editor/auxiliaryEditorPart.js +7 -4
- package/vscode/src/vs/workbench/browser/parts/editor/editor.contribution.js +216 -765
- 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 +54 -19
- package/vscode/src/vs/workbench/browser/parts/editor/editorParts.js +122 -72
- package/vscode/src/vs/workbench/browser/parts/paneCompositeBar.js +51 -54
- package/vscode/src/vs/workbench/browser/parts/paneCompositePart.js +44 -44
- package/vscode/src/vs/workbench/browser/parts/panel/panelPart.js +25 -26
- package/vscode/src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarActions.js +2 -5
- package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarPart.js +22 -22
- 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 +59 -88
- 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 +39 -113
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editorGutter.js +1 -0
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView.js +13 -19
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/codeEditorView.js +1 -0
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.js +35 -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 +41 -43
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/scrollSynchronizer.js +6 -5
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.js +13 -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/webview/browser/webviewFindWidget.js +5 -3
- 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/webviewViewPane.js +13 -11
- package/vscode/src/vs/workbench/contrib/webviewView/browser/webviewViewService.js +2 -2
- package/vscode/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.js +79 -49
- package/vscode/src/vs/workbench/services/driver/browser/driver.js +9 -7
- 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/vscode/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.js
CHANGED
|
@@ -29,8 +29,10 @@ import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommon
|
|
|
29
29
|
import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
|
|
30
30
|
import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
|
|
31
31
|
import { nativeHoverDelegate } from 'vscode/vscode/vs/platform/hover/browser/hover';
|
|
32
|
+
import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
|
|
32
33
|
|
|
33
34
|
var LanguageStatus_1;
|
|
35
|
+
const _moduleId = "vs/workbench/contrib/languageStatus/browser/languageStatus.contribution";
|
|
34
36
|
class LanguageStatusViewModel {
|
|
35
37
|
constructor(combined, dedicated) {
|
|
36
38
|
this.combined = combined;
|
|
@@ -54,46 +56,47 @@ let StoredCounter = class StoredCounter {
|
|
|
54
56
|
return n;
|
|
55
57
|
}
|
|
56
58
|
};
|
|
57
|
-
StoredCounter = ( __decorate([
|
|
58
|
-
( __param(0, IStorageService))
|
|
59
|
-
], StoredCounter));
|
|
59
|
+
StoredCounter = ( (__decorate([
|
|
60
|
+
( (__param(0, IStorageService)))
|
|
61
|
+
], StoredCounter)));
|
|
60
62
|
let LanguageStatusContribution = class LanguageStatusContribution extends Disposable {
|
|
61
63
|
constructor(instantiationService, editorGroupService, editorService) {
|
|
62
64
|
super();
|
|
63
|
-
const mainInstantiationService = instantiationService.createChild(( new ServiceCollection([IEditorService, editorService.createScoped('main', this._store)])));
|
|
65
|
+
const mainInstantiationService = instantiationService.createChild(( (new ServiceCollection([IEditorService, editorService.createScoped('main', this._store)]))));
|
|
64
66
|
this._register(mainInstantiationService.createInstance(LanguageStatus));
|
|
65
67
|
this._register(editorGroupService.onDidCreateAuxiliaryEditorPart(({ instantiationService, disposables }) => {
|
|
66
68
|
disposables.add(instantiationService.createInstance(LanguageStatus));
|
|
67
69
|
}));
|
|
68
70
|
}
|
|
69
71
|
};
|
|
70
|
-
LanguageStatusContribution = ( __decorate([
|
|
71
|
-
( __param(0, IInstantiationService)),
|
|
72
|
-
( __param(1, IEditorGroupsService)),
|
|
73
|
-
( __param(2, IEditorService))
|
|
74
|
-
], LanguageStatusContribution));
|
|
72
|
+
LanguageStatusContribution = ( (__decorate([
|
|
73
|
+
( (__param(0, IInstantiationService))),
|
|
74
|
+
( (__param(1, IEditorGroupsService))),
|
|
75
|
+
( (__param(2, IEditorService)))
|
|
76
|
+
], LanguageStatusContribution)));
|
|
75
77
|
let LanguageStatus = class LanguageStatus {
|
|
76
78
|
static { LanguageStatus_1 = this; }
|
|
77
79
|
static { this._id = 'status.languageStatus'; }
|
|
78
80
|
static { this._keyDedicatedItems = 'languageStatus.dedicated'; }
|
|
79
|
-
constructor(_languageStatusService, _statusBarService, _editorService, _openerService, _storageService) {
|
|
81
|
+
constructor(_languageStatusService, _statusBarService, _editorService, _hoverService, _openerService, _storageService) {
|
|
80
82
|
this._languageStatusService = _languageStatusService;
|
|
81
83
|
this._statusBarService = _statusBarService;
|
|
82
84
|
this._editorService = _editorService;
|
|
85
|
+
this._hoverService = _hoverService;
|
|
83
86
|
this._openerService = _openerService;
|
|
84
87
|
this._storageService = _storageService;
|
|
85
|
-
this._disposables = ( new DisposableStore());
|
|
86
|
-
this._dedicated = ( new Set());
|
|
87
|
-
this._dedicatedEntries = ( new Map());
|
|
88
|
-
this._renderDisposables = ( new DisposableStore());
|
|
88
|
+
this._disposables = ( (new DisposableStore()));
|
|
89
|
+
this._dedicated = ( (new Set()));
|
|
90
|
+
this._dedicatedEntries = ( (new Map()));
|
|
91
|
+
this._renderDisposables = ( (new DisposableStore()));
|
|
89
92
|
_storageService.onDidChangeValue(0 , LanguageStatus_1._keyDedicatedItems, this._disposables)(this._handleStorageChange, this, this._disposables);
|
|
90
93
|
this._restoreState();
|
|
91
|
-
this._interactionCounter = ( new StoredCounter(_storageService, 'languageStatus.interactCount'));
|
|
94
|
+
this._interactionCounter = ( (new StoredCounter(_storageService, 'languageStatus.interactCount')));
|
|
92
95
|
_languageStatusService.onDidChange(this._update, this, this._disposables);
|
|
93
96
|
_editorService.onDidActiveEditorChange(this._update, this, this._disposables);
|
|
94
97
|
this._update();
|
|
95
98
|
_statusBarService.onDidChangeEntryVisibility(e => {
|
|
96
|
-
if (!e.visible && ( this._dedicated.has(e.id))) {
|
|
99
|
+
if (!e.visible && ( (this._dedicated.has(e.id)))) {
|
|
97
100
|
this._dedicated.delete(e.id);
|
|
98
101
|
this._update();
|
|
99
102
|
this._storeState();
|
|
@@ -103,7 +106,7 @@ let LanguageStatus = class LanguageStatus {
|
|
|
103
106
|
dispose() {
|
|
104
107
|
this._disposables.dispose();
|
|
105
108
|
this._combinedEntry?.dispose();
|
|
106
|
-
dispose(( this._dedicatedEntries.values()));
|
|
109
|
+
dispose(( (this._dedicatedEntries.values())));
|
|
107
110
|
this._renderDisposables.dispose();
|
|
108
111
|
}
|
|
109
112
|
_handleStorageChange() {
|
|
@@ -114,7 +117,7 @@ let LanguageStatus = class LanguageStatus {
|
|
|
114
117
|
const raw = this._storageService.get(LanguageStatus_1._keyDedicatedItems, 0 , '[]');
|
|
115
118
|
try {
|
|
116
119
|
const ids = JSON.parse(raw);
|
|
117
|
-
this._dedicated = ( new Set(ids));
|
|
120
|
+
this._dedicated = ( (new Set(ids)));
|
|
118
121
|
}
|
|
119
122
|
catch {
|
|
120
123
|
this._dedicated.clear();
|
|
@@ -125,24 +128,28 @@ let LanguageStatus = class LanguageStatus {
|
|
|
125
128
|
this._storageService.remove(LanguageStatus_1._keyDedicatedItems, 0 );
|
|
126
129
|
}
|
|
127
130
|
else {
|
|
128
|
-
const raw = JSON.stringify(Array.from(( this._dedicated.keys())));
|
|
131
|
+
const raw = JSON.stringify(Array.from(( (this._dedicated.keys()))));
|
|
129
132
|
this._storageService.store(LanguageStatus_1._keyDedicatedItems, raw, 0 , 0 );
|
|
130
133
|
}
|
|
131
134
|
}
|
|
132
135
|
_createViewModel(editor) {
|
|
133
136
|
if (!editor?.hasModel()) {
|
|
134
|
-
return (
|
|
137
|
+
return (
|
|
138
|
+
(new LanguageStatusViewModel([], []))
|
|
139
|
+
);
|
|
135
140
|
}
|
|
136
141
|
const all = this._languageStatusService.getLanguageStatus(editor.getModel());
|
|
137
142
|
const combined = [];
|
|
138
143
|
const dedicated = [];
|
|
139
144
|
for (const item of all) {
|
|
140
|
-
if (( this._dedicated.has(item.id))) {
|
|
145
|
+
if (( (this._dedicated.has(item.id)))) {
|
|
141
146
|
dedicated.push(item);
|
|
142
147
|
}
|
|
143
148
|
combined.push(item);
|
|
144
149
|
}
|
|
145
|
-
return (
|
|
150
|
+
return (
|
|
151
|
+
(new LanguageStatusViewModel(combined, dedicated))
|
|
152
|
+
);
|
|
146
153
|
}
|
|
147
154
|
_update() {
|
|
148
155
|
const editor = getCodeEditor(this._editorService.activeTextEditorControl);
|
|
@@ -171,17 +178,8 @@ let LanguageStatus = class LanguageStatus {
|
|
|
171
178
|
isOneBusy = isOneBusy || (!isPinned && status.busy);
|
|
172
179
|
}
|
|
173
180
|
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
|
-
)),
|
|
181
|
+
name: ( localizeWithPath(_moduleId, 0, "Editor Language Status")),
|
|
182
|
+
ariaLabel: ( localizeWithPath(_moduleId, 1, "Editor Language Status: {0}", ariaLabels.join(', next: '))),
|
|
185
183
|
tooltip: element,
|
|
186
184
|
command: ShowTooltipCommand,
|
|
187
185
|
text: isOneBusy ? `${text}\u00A0\u00A0$(sync~spin)` : text,
|
|
@@ -213,18 +211,18 @@ let LanguageStatus = class LanguageStatus {
|
|
|
213
211
|
if (!userHasInteractedWithStatus) {
|
|
214
212
|
const hoverTarget = targetWindow.document.querySelector('.monaco-workbench .context-view');
|
|
215
213
|
if (hoverTarget instanceof HTMLElement) {
|
|
216
|
-
const observer = ( new MutationObserver(() => {
|
|
214
|
+
const observer = ( (new MutationObserver(() => {
|
|
217
215
|
if (targetWindow.document.contains(element)) {
|
|
218
216
|
this._interactionCounter.increment();
|
|
219
217
|
observer.disconnect();
|
|
220
218
|
}
|
|
221
|
-
}));
|
|
219
|
+
})));
|
|
222
220
|
observer.observe(hoverTarget, { childList: true, subtree: true });
|
|
223
221
|
this._renderDisposables.add(toDisposable(() => observer.disconnect()));
|
|
224
222
|
}
|
|
225
223
|
}
|
|
226
224
|
}
|
|
227
|
-
const newDedicatedEntries = ( new Map());
|
|
225
|
+
const newDedicatedEntries = ( (new Map()));
|
|
228
226
|
for (const status of model.dedicated) {
|
|
229
227
|
const props = LanguageStatus_1._asStatusbarEntry(status);
|
|
230
228
|
let entry = this._dedicatedEntries.get(status.id);
|
|
@@ -237,7 +235,7 @@ let LanguageStatus = class LanguageStatus {
|
|
|
237
235
|
}
|
|
238
236
|
newDedicatedEntries.set(status.id, entry);
|
|
239
237
|
}
|
|
240
|
-
dispose(( this._dedicatedEntries.values()));
|
|
238
|
+
dispose(( (this._dedicatedEntries.values())));
|
|
241
239
|
this._dedicatedEntries = newDedicatedEntries;
|
|
242
240
|
}
|
|
243
241
|
_renderStatus(status, showSeverity, isPinned, store) {
|
|
@@ -269,40 +267,32 @@ let LanguageStatus = class LanguageStatus {
|
|
|
269
267
|
element.appendChild(right);
|
|
270
268
|
const { command } = status;
|
|
271
269
|
if (command) {
|
|
272
|
-
store.add(( new Link(right, {
|
|
270
|
+
store.add(( (new Link(right, {
|
|
273
271
|
label: command.title,
|
|
274
272
|
title: command.tooltip,
|
|
275
|
-
href: ( ( URI.from({
|
|
273
|
+
href: ( (( (URI.from({
|
|
276
274
|
scheme: 'command', path: command.id, query: command.arguments && JSON.stringify(command.arguments)
|
|
277
|
-
})).toString())
|
|
278
|
-
}, { hoverDelegate: nativeHoverDelegate }, this._openerService)));
|
|
275
|
+
}))).toString()))
|
|
276
|
+
}, { hoverDelegate: nativeHoverDelegate }, this._hoverService, this._openerService))));
|
|
279
277
|
}
|
|
280
|
-
const actionBar = ( new ActionBar(right, { hoverDelegate: nativeHoverDelegate }));
|
|
278
|
+
const actionBar = ( (new ActionBar(right, { hoverDelegate: nativeHoverDelegate })));
|
|
281
279
|
store.add(actionBar);
|
|
282
280
|
let action;
|
|
283
281
|
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, () => {
|
|
282
|
+
action = ( (new Action('pin', ( localizeWithPath(_moduleId, 2, "Add to Status Bar")), ThemeIcon.asClassName(Codicon.pin), true, () => {
|
|
289
283
|
this._dedicated.add(status.id);
|
|
290
284
|
this._statusBarService.updateEntryVisibility(status.id, true);
|
|
291
285
|
this._update();
|
|
292
286
|
this._storeState();
|
|
293
|
-
}));
|
|
287
|
+
})));
|
|
294
288
|
}
|
|
295
289
|
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, () => {
|
|
290
|
+
action = ( (new Action('unpin', ( localizeWithPath(_moduleId, 3, "Remove from Status Bar")), ThemeIcon.asClassName(Codicon.pinned), true, () => {
|
|
301
291
|
this._dedicated.delete(status.id);
|
|
302
292
|
this._statusBarService.updateEntryVisibility(status.id, false);
|
|
303
293
|
this._update();
|
|
304
294
|
this._storeState();
|
|
305
|
-
}));
|
|
295
|
+
})));
|
|
306
296
|
}
|
|
307
297
|
actionBar.push(action, { icon: true, label: false });
|
|
308
298
|
store.add(action);
|
|
@@ -329,7 +319,7 @@ let LanguageStatus = class LanguageStatus {
|
|
|
329
319
|
append(target, ...parts);
|
|
330
320
|
}
|
|
331
321
|
else {
|
|
332
|
-
store.add(( new Link(target, node, undefined, this._openerService)));
|
|
322
|
+
store.add(( (new Link(target, node, undefined, this._hoverService, this._openerService))));
|
|
333
323
|
}
|
|
334
324
|
}
|
|
335
325
|
}
|
|
@@ -339,21 +329,10 @@ let LanguageStatus = class LanguageStatus {
|
|
|
339
329
|
}
|
|
340
330
|
const textValue = typeof status.label === 'string' ? status.label : status.label.value;
|
|
341
331
|
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
|
-
)) };
|
|
332
|
+
return { label: ( localizeWithPath(_moduleId, 4, '{0}, {1}', textValue, status.detail)) };
|
|
349
333
|
}
|
|
350
334
|
else {
|
|
351
|
-
return { label: ( localizeWithPath(
|
|
352
|
-
'vs/workbench/contrib/languageStatus/browser/languageStatus.contribution',
|
|
353
|
-
'aria.2',
|
|
354
|
-
'{0}',
|
|
355
|
-
textValue
|
|
356
|
-
)) };
|
|
335
|
+
return { label: ( localizeWithPath(_moduleId, 5, '{0}', textValue)) };
|
|
357
336
|
}
|
|
358
337
|
}
|
|
359
338
|
static _asStatusbarEntry(item) {
|
|
@@ -366,38 +345,30 @@ let LanguageStatus = class LanguageStatus {
|
|
|
366
345
|
}
|
|
367
346
|
const textValue = typeof item.label === 'string' ? item.label : item.label.shortValue;
|
|
368
347
|
return {
|
|
369
|
-
name: ( localizeWithPath(
|
|
370
|
-
'vs/workbench/contrib/languageStatus/browser/languageStatus.contribution',
|
|
371
|
-
'name.pattern',
|
|
372
|
-
'{0} (Language Status)',
|
|
373
|
-
item.name
|
|
374
|
-
)),
|
|
348
|
+
name: ( localizeWithPath(_moduleId, 6, '{0} (Language Status)', item.name)),
|
|
375
349
|
text: item.busy ? `${textValue}\u00A0\u00A0$(sync~spin)` : textValue,
|
|
376
350
|
ariaLabel: LanguageStatus_1._accessibilityInformation(item).label,
|
|
377
351
|
role: item.accessibilityInfo?.role,
|
|
378
|
-
tooltip: item.command?.tooltip || ( new MarkdownString(item.detail, { isTrusted: true, supportThemeIcons: true })),
|
|
352
|
+
tooltip: item.command?.tooltip || ( (new MarkdownString(item.detail, { isTrusted: true, supportThemeIcons: true }))),
|
|
379
353
|
kind,
|
|
380
354
|
command: item.command
|
|
381
355
|
};
|
|
382
356
|
}
|
|
383
357
|
};
|
|
384
|
-
LanguageStatus = LanguageStatus_1 = ( __decorate([
|
|
385
|
-
( __param(0, ILanguageStatusService)),
|
|
386
|
-
( __param(1, IStatusbarService)),
|
|
387
|
-
( __param(2, IEditorService)),
|
|
388
|
-
( __param(3,
|
|
389
|
-
( __param(4,
|
|
390
|
-
|
|
391
|
-
|
|
358
|
+
LanguageStatus = LanguageStatus_1 = ( (__decorate([
|
|
359
|
+
( (__param(0, ILanguageStatusService))),
|
|
360
|
+
( (__param(1, IStatusbarService))),
|
|
361
|
+
( (__param(2, IEditorService))),
|
|
362
|
+
( (__param(3, IHoverService))),
|
|
363
|
+
( (__param(4, IOpenerService))),
|
|
364
|
+
( (__param(5, IStorageService)))
|
|
365
|
+
], LanguageStatus)));
|
|
366
|
+
( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(LanguageStatusContribution, 3 );
|
|
392
367
|
registerAction2(class extends Action2 {
|
|
393
368
|
constructor() {
|
|
394
369
|
super({
|
|
395
370
|
id: 'editor.inlayHints.Reset',
|
|
396
|
-
title: ( localize2WithPath(
|
|
397
|
-
'vs/workbench/contrib/languageStatus/browser/languageStatus.contribution',
|
|
398
|
-
'reset',
|
|
399
|
-
"Reset Language Status Interaction Counter"
|
|
400
|
-
)),
|
|
371
|
+
title: ( localize2WithPath(_moduleId, 7, "Reset Language Status Interaction Counter")),
|
|
401
372
|
category: Categories.View,
|
|
402
373
|
f1: true
|
|
403
374
|
});
|
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 };
|