@codingame/monaco-vscode-markers-service-override 1.83.1 → 1.83.3-next.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 +2 -2
- package/vscode/src/vs/workbench/contrib/markers/browser/markers.contribution.js +39 -39
- package/vscode/src/vs/workbench/contrib/markers/browser/markersTable.js +47 -50
- package/vscode/src/vs/workbench/contrib/markers/browser/markersTreeViewer.js +83 -97
- package/vscode/src/vs/workbench/contrib/markers/browser/markersView.js +5 -5
- package/vscode/src/vs/workbench/contrib/markers/browser/messages.js +47 -156
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-markers-service-override",
|
|
3
|
-
"version": "1.83.
|
|
3
|
+
"version": "1.83.3-next.0",
|
|
4
4
|
"keywords": [],
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "CodinGame",
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
"module": "index.js",
|
|
19
19
|
"types": "index.d.ts",
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"vscode": "npm:@codingame/monaco-vscode-api@1.83.
|
|
21
|
+
"vscode": "npm:@codingame/monaco-vscode-api@1.83.3-next.0",
|
|
22
22
|
"monaco-editor": "0.44.0"
|
|
23
23
|
}
|
|
24
24
|
}
|
|
@@ -3,7 +3,7 @@ import { ContextKeyExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/
|
|
|
3
3
|
import { Extensions } from 'monaco-editor/esm/vs/platform/configuration/common/configurationRegistry.js';
|
|
4
4
|
import { Categories } from 'monaco-editor/esm/vs/platform/action/common/actionCommonCategories.js';
|
|
5
5
|
import { KeybindingsRegistry } from 'monaco-editor/esm/vs/platform/keybinding/common/keybindingsRegistry.js';
|
|
6
|
-
import {
|
|
6
|
+
import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
|
|
7
7
|
import { Marker, ResourceMarkers, RelatedInformation } from './markersModel.js';
|
|
8
8
|
import { MarkersView } from './markersView.js';
|
|
9
9
|
import { registerAction2, MenuId, Action2 } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
|
|
@@ -108,7 +108,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
108
108
|
},
|
|
109
109
|
}
|
|
110
110
|
});
|
|
111
|
-
const markersViewIcon = registerIcon('markers-view-icon', Codicon.warning, (
|
|
111
|
+
const markersViewIcon = registerIcon('markers-view-icon', Codicon.warning, localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'markersViewIcon', 'View icon of the markers view.'));
|
|
112
112
|
const VIEW_CONTAINER = ( Registry.as(Extensions$1.ViewContainersRegistry)).registerViewContainer({
|
|
113
113
|
id: Markers.MARKERS_CONTAINER_ID,
|
|
114
114
|
title: { value: Messages.MARKERS_PANEL_TITLE_PROBLEMS, original: Messages.MARKERS_PANEL_ORIGINAL_TITLE_PROBLEMS },
|
|
@@ -130,7 +130,7 @@ const VIEW_CONTAINER = ( Registry.as(Extensions$1.ViewContainersRegistry)).regis
|
|
|
130
130
|
ctorDescriptor: ( new SyncDescriptor(MarkersView)),
|
|
131
131
|
openCommandActionDescriptor: {
|
|
132
132
|
id: 'workbench.actions.view.problems',
|
|
133
|
-
mnemonicTitle: (
|
|
133
|
+
mnemonicTitle: localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', { key: 'miMarker', comment: ['&& denotes a mnemonic'] }, "&&Problems"),
|
|
134
134
|
keybindings: { primary: 2048 | 1024 | 43 },
|
|
135
135
|
order: 0,
|
|
136
136
|
}
|
|
@@ -140,7 +140,7 @@ registerAction2(class extends ViewAction {
|
|
|
140
140
|
constructor() {
|
|
141
141
|
super({
|
|
142
142
|
id: `workbench.actions.table.${Markers.MARKERS_VIEW_ID}.viewAsTree`,
|
|
143
|
-
title: (
|
|
143
|
+
title: localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'viewAsTree', "View as Tree"),
|
|
144
144
|
menu: {
|
|
145
145
|
id: MenuId.ViewTitle,
|
|
146
146
|
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID)), ( MarkersContextKeys.MarkersViewModeContextKey.isEqualTo("table" )))),
|
|
@@ -159,7 +159,7 @@ registerAction2(class extends ViewAction {
|
|
|
159
159
|
constructor() {
|
|
160
160
|
super({
|
|
161
161
|
id: `workbench.actions.table.${Markers.MARKERS_VIEW_ID}.viewAsTable`,
|
|
162
|
-
title: (
|
|
162
|
+
title: localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'viewAsTable', "View as Table"),
|
|
163
163
|
menu: {
|
|
164
164
|
id: MenuId.ViewTitle,
|
|
165
165
|
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID)), ( MarkersContextKeys.MarkersViewModeContextKey.isEqualTo("tree" )))),
|
|
@@ -178,11 +178,11 @@ registerAction2(class extends ViewAction {
|
|
|
178
178
|
constructor() {
|
|
179
179
|
super({
|
|
180
180
|
id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleErrors`,
|
|
181
|
-
title: (
|
|
182
|
-
category: (
|
|
181
|
+
title: localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'toggle errors', "Toggle Errors"),
|
|
182
|
+
category: localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'problems', "Problems"),
|
|
183
183
|
toggled: {
|
|
184
184
|
condition: MarkersContextKeys.ShowErrorsFilterContextKey,
|
|
185
|
-
title: (
|
|
185
|
+
title: localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'errors', "Show Errors")
|
|
186
186
|
},
|
|
187
187
|
menu: {
|
|
188
188
|
id: viewFilterSubmenu,
|
|
@@ -201,11 +201,11 @@ registerAction2(class extends ViewAction {
|
|
|
201
201
|
constructor() {
|
|
202
202
|
super({
|
|
203
203
|
id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleWarnings`,
|
|
204
|
-
title: (
|
|
205
|
-
category: (
|
|
204
|
+
title: localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'toggle warnings', "Toggle Warnings"),
|
|
205
|
+
category: localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'problems', "Problems"),
|
|
206
206
|
toggled: {
|
|
207
207
|
condition: MarkersContextKeys.ShowWarningsFilterContextKey,
|
|
208
|
-
title: (
|
|
208
|
+
title: localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'warnings', "Show Warnings")
|
|
209
209
|
},
|
|
210
210
|
menu: {
|
|
211
211
|
id: viewFilterSubmenu,
|
|
@@ -224,11 +224,11 @@ registerAction2(class extends ViewAction {
|
|
|
224
224
|
constructor() {
|
|
225
225
|
super({
|
|
226
226
|
id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleInfos`,
|
|
227
|
-
title: (
|
|
228
|
-
category: (
|
|
227
|
+
title: localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'toggle infos', "Toggle Infos"),
|
|
228
|
+
category: localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'problems', "Problems"),
|
|
229
229
|
toggled: {
|
|
230
230
|
condition: MarkersContextKeys.ShowInfoFilterContextKey,
|
|
231
|
-
title: (
|
|
231
|
+
title: localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'Infos', "Show Infos")
|
|
232
232
|
},
|
|
233
233
|
menu: {
|
|
234
234
|
id: viewFilterSubmenu,
|
|
@@ -247,11 +247,11 @@ registerAction2(class extends ViewAction {
|
|
|
247
247
|
constructor() {
|
|
248
248
|
super({
|
|
249
249
|
id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleActiveFile`,
|
|
250
|
-
title: (
|
|
251
|
-
category: (
|
|
250
|
+
title: localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'toggle active file', "Toggle Active File"),
|
|
251
|
+
category: localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'problems', "Problems"),
|
|
252
252
|
toggled: {
|
|
253
253
|
condition: MarkersContextKeys.ShowActiveFileFilterContextKey,
|
|
254
|
-
title: (
|
|
254
|
+
title: localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'Active File', "Show Active File Only")
|
|
255
255
|
},
|
|
256
256
|
menu: {
|
|
257
257
|
id: viewFilterSubmenu,
|
|
@@ -270,11 +270,11 @@ registerAction2(class extends ViewAction {
|
|
|
270
270
|
constructor() {
|
|
271
271
|
super({
|
|
272
272
|
id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleExcludedFiles`,
|
|
273
|
-
title: (
|
|
274
|
-
category: (
|
|
273
|
+
title: localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'toggle Excluded Files', "Toggle Excluded Files"),
|
|
274
|
+
category: localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'problems', "Problems"),
|
|
275
275
|
toggled: {
|
|
276
276
|
condition: MarkersContextKeys.ShowExcludedFilesFilterContextKey,
|
|
277
|
-
title: (
|
|
277
|
+
title: localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'Excluded Files', "Hide Excluded Files")
|
|
278
278
|
},
|
|
279
279
|
menu: {
|
|
280
280
|
id: viewFilterSubmenu,
|
|
@@ -307,7 +307,7 @@ registerAction2(class extends ViewAction {
|
|
|
307
307
|
const when = ( ContextKeyExpr.and(( FocusedViewContext.isEqualTo(Markers.MARKERS_VIEW_ID)), MarkersContextKeys.MarkersTreeVisibilityContextKey, ( MarkersContextKeys.RelatedInformationFocusContextKey.toNegated())));
|
|
308
308
|
super({
|
|
309
309
|
id: Markers.MARKER_COPY_ACTION_ID,
|
|
310
|
-
title: { value: (
|
|
310
|
+
title: { value: localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'copyMarker', "Copy"), original: 'Copy' },
|
|
311
311
|
menu: {
|
|
312
312
|
id: MenuId.ProblemsPanelContext,
|
|
313
313
|
when,
|
|
@@ -347,7 +347,7 @@ registerAction2(class extends ViewAction {
|
|
|
347
347
|
constructor() {
|
|
348
348
|
super({
|
|
349
349
|
id: Markers.MARKER_COPY_MESSAGE_ACTION_ID,
|
|
350
|
-
title: { value: (
|
|
350
|
+
title: { value: localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'copyMessage', "Copy Message"), original: 'Copy Message' },
|
|
351
351
|
menu: {
|
|
352
352
|
id: MenuId.ProblemsPanelContext,
|
|
353
353
|
when: MarkersContextKeys.MarkerFocusContextKey,
|
|
@@ -368,7 +368,7 @@ registerAction2(class extends ViewAction {
|
|
|
368
368
|
constructor() {
|
|
369
369
|
super({
|
|
370
370
|
id: Markers.RELATED_INFORMATION_COPY_MESSAGE_ACTION_ID,
|
|
371
|
-
title: { value: (
|
|
371
|
+
title: { value: localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'copyMessage', "Copy Message"), original: 'Copy Message' },
|
|
372
372
|
menu: {
|
|
373
373
|
id: MenuId.ProblemsPanelContext,
|
|
374
374
|
when: MarkersContextKeys.RelatedInformationFocusContextKey,
|
|
@@ -389,7 +389,7 @@ registerAction2(class extends ViewAction {
|
|
|
389
389
|
constructor() {
|
|
390
390
|
super({
|
|
391
391
|
id: Markers.FOCUS_PROBLEMS_FROM_FILTER,
|
|
392
|
-
title: (
|
|
392
|
+
title: localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'focusProblemsList', "Focus problems view"),
|
|
393
393
|
keybinding: {
|
|
394
394
|
when: MarkersContextKeys.MarkerViewFilterFocusContextKey,
|
|
395
395
|
weight: 200 ,
|
|
@@ -406,7 +406,7 @@ registerAction2(class extends ViewAction {
|
|
|
406
406
|
constructor() {
|
|
407
407
|
super({
|
|
408
408
|
id: Markers.MARKERS_VIEW_FOCUS_FILTER,
|
|
409
|
-
title: (
|
|
409
|
+
title: localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'focusProblemsFilter', "Focus problems filter"),
|
|
410
410
|
keybinding: {
|
|
411
411
|
when: ( FocusedViewContext.isEqualTo(Markers.MARKERS_VIEW_ID)),
|
|
412
412
|
weight: 200 ,
|
|
@@ -423,8 +423,8 @@ registerAction2(class extends ViewAction {
|
|
|
423
423
|
constructor() {
|
|
424
424
|
super({
|
|
425
425
|
id: Markers.MARKERS_VIEW_SHOW_MULTILINE_MESSAGE,
|
|
426
|
-
title: { value: (
|
|
427
|
-
category: (
|
|
426
|
+
title: { value: localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'show multiline', "Show message in multiple lines"), original: 'Problems: Show message in multiple lines' },
|
|
427
|
+
category: localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'problems', "Problems"),
|
|
428
428
|
menu: {
|
|
429
429
|
id: MenuId.CommandPalette,
|
|
430
430
|
when: ( ContextKeyExpr.has(getVisbileViewContextKey(Markers.MARKERS_VIEW_ID)))
|
|
@@ -440,8 +440,8 @@ registerAction2(class extends ViewAction {
|
|
|
440
440
|
constructor() {
|
|
441
441
|
super({
|
|
442
442
|
id: Markers.MARKERS_VIEW_SHOW_SINGLELINE_MESSAGE,
|
|
443
|
-
title: { value: (
|
|
444
|
-
category: (
|
|
443
|
+
title: { value: localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'show singleline', "Show message in single line"), original: 'Problems: Show message in single line' },
|
|
444
|
+
category: localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'problems', "Problems"),
|
|
445
445
|
menu: {
|
|
446
446
|
id: MenuId.CommandPalette,
|
|
447
447
|
when: ( ContextKeyExpr.has(getVisbileViewContextKey(Markers.MARKERS_VIEW_ID)))
|
|
@@ -457,8 +457,8 @@ registerAction2(class extends ViewAction {
|
|
|
457
457
|
constructor() {
|
|
458
458
|
super({
|
|
459
459
|
id: Markers.MARKERS_VIEW_CLEAR_FILTER_TEXT,
|
|
460
|
-
title: (
|
|
461
|
-
category: (
|
|
460
|
+
title: localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'clearFiltersText', "Clear filters text"),
|
|
461
|
+
category: localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'problems', "Problems"),
|
|
462
462
|
keybinding: {
|
|
463
463
|
when: MarkersContextKeys.MarkerViewFilterFocusContextKey,
|
|
464
464
|
weight: 200 ,
|
|
@@ -475,7 +475,7 @@ registerAction2(class extends ViewAction {
|
|
|
475
475
|
constructor() {
|
|
476
476
|
super({
|
|
477
477
|
id: `workbench.actions.treeView.${Markers.MARKERS_VIEW_ID}.collapseAll`,
|
|
478
|
-
title: (
|
|
478
|
+
title: localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'collapseAll', "Collapse All"),
|
|
479
479
|
menu: {
|
|
480
480
|
id: MenuId.ViewTitle,
|
|
481
481
|
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID)), ( MarkersContextKeys.MarkersViewModeContextKey.isEqualTo("tree" )))),
|
|
@@ -519,7 +519,7 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
|
|
|
519
519
|
const markersStatistics = this.markerService.getStatistics();
|
|
520
520
|
const tooltip = this.getMarkersTooltip(markersStatistics);
|
|
521
521
|
return {
|
|
522
|
-
name: (
|
|
522
|
+
name: localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'status.problems', "Problems"),
|
|
523
523
|
text: this.getMarkersText(markersStatistics),
|
|
524
524
|
ariaLabel: tooltip,
|
|
525
525
|
tooltip,
|
|
@@ -527,9 +527,9 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
|
|
|
527
527
|
};
|
|
528
528
|
}
|
|
529
529
|
getMarkersTooltip(stats) {
|
|
530
|
-
const errorTitle = (n) => (
|
|
531
|
-
const warningTitle = (n) => (
|
|
532
|
-
const infoTitle = (n) => (
|
|
530
|
+
const errorTitle = (n) => localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'totalErrors', "Errors: {0}", n);
|
|
531
|
+
const warningTitle = (n) => localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'totalWarnings', "Warnings: {0}", n);
|
|
532
|
+
const infoTitle = (n) => localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'totalInfos', "Infos: {0}", n);
|
|
533
533
|
const titles = [];
|
|
534
534
|
if (stats.errors > 0) {
|
|
535
535
|
titles.push(errorTitle(stats.errors));
|
|
@@ -541,7 +541,7 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
|
|
|
541
541
|
titles.push(infoTitle(stats.infos));
|
|
542
542
|
}
|
|
543
543
|
if (titles.length === 0) {
|
|
544
|
-
return (
|
|
544
|
+
return localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'noProblems', "No Problems");
|
|
545
545
|
}
|
|
546
546
|
return titles.join(', ');
|
|
547
547
|
}
|
|
@@ -555,7 +555,7 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
|
|
|
555
555
|
return problemsText.join(' ');
|
|
556
556
|
}
|
|
557
557
|
packNumber(n) {
|
|
558
|
-
const manyProblems = (
|
|
558
|
+
const manyProblems = localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'manyProblems', "10K+");
|
|
559
559
|
return n > 9999 ? manyProblems : n > 999 ? ( n.toString()).charAt(0) + 'K' : ( n.toString());
|
|
560
560
|
}
|
|
561
561
|
};
|
|
@@ -576,7 +576,7 @@ let ActivityUpdater = class ActivityUpdater extends Disposable {
|
|
|
576
576
|
updateBadge() {
|
|
577
577
|
const { errors, warnings, infos } = this.markerService.getStatistics();
|
|
578
578
|
const total = errors + warnings + infos;
|
|
579
|
-
const message = (
|
|
579
|
+
const message = localizeWithPath('vs/workbench/contrib/markers/browser/markers.contribution', 'totalProblems', 'Total {0} Problems', total);
|
|
580
580
|
this.activity.value = this.activityService.showViewActivity(Markers.MARKERS_VIEW_ID, { badge: ( new NumberBadge(total, () => message)) });
|
|
581
581
|
}
|
|
582
582
|
};
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
|
|
2
|
-
import {
|
|
2
|
+
import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
|
|
3
3
|
import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
|
|
4
4
|
import { Event } from 'monaco-editor/esm/vs/base/common/event.js';
|
|
5
5
|
import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
|
|
@@ -36,10 +36,10 @@ let MarkerSeverityColumnRenderer = class MarkerSeverityColumnRenderer {
|
|
|
36
36
|
const severityColumn = dom.append(container, $('.severity'));
|
|
37
37
|
const icon = dom.append(severityColumn, $(''));
|
|
38
38
|
const actionBarColumn = dom.append(container, $('.actions'));
|
|
39
|
-
const actionBar = (
|
|
39
|
+
const actionBar = ( new ActionBar(actionBarColumn, {
|
|
40
40
|
actionViewItemProvider: (action) => action.id === QuickFixAction.ID ? this.instantiationService.createInstance(QuickFixActionViewItem, action) : undefined,
|
|
41
41
|
animated: false
|
|
42
|
-
}))
|
|
42
|
+
}));
|
|
43
43
|
return { actionBar, icon };
|
|
44
44
|
}
|
|
45
45
|
renderElement(element, index, templateData, height) {
|
|
@@ -49,8 +49,8 @@ let MarkerSeverityColumnRenderer = class MarkerSeverityColumnRenderer {
|
|
|
49
49
|
container.classList.toggle('quickFix', enabled);
|
|
50
50
|
}
|
|
51
51
|
};
|
|
52
|
-
templateData.icon.title = (
|
|
53
|
-
templateData.icon.className = `marker-icon ${(
|
|
52
|
+
templateData.icon.title = ( MarkerSeverity.toString(element.marker.severity));
|
|
53
|
+
templateData.icon.className = `marker-icon ${( Severity.toString(MarkerSeverity.toSeverity(element.marker.severity)))} codicon ${SeverityIcon.className(MarkerSeverity.toSeverity(element.marker.severity))}`;
|
|
54
54
|
templateData.actionBar.clear();
|
|
55
55
|
const viewModel = this.markersViewModel.getViewModel(element);
|
|
56
56
|
if (viewModel) {
|
|
@@ -68,9 +68,9 @@ let MarkerSeverityColumnRenderer = class MarkerSeverityColumnRenderer {
|
|
|
68
68
|
}
|
|
69
69
|
disposeTemplate(templateData) { }
|
|
70
70
|
};
|
|
71
|
-
MarkerSeverityColumnRenderer = MarkerSeverityColumnRenderer_1 = (
|
|
72
|
-
(
|
|
73
|
-
], MarkerSeverityColumnRenderer))
|
|
71
|
+
MarkerSeverityColumnRenderer = MarkerSeverityColumnRenderer_1 = ( __decorate([
|
|
72
|
+
( __param(1, IInstantiationService))
|
|
73
|
+
], MarkerSeverityColumnRenderer));
|
|
74
74
|
let MarkerCodeColumnRenderer = class MarkerCodeColumnRenderer {
|
|
75
75
|
static { MarkerCodeColumnRenderer_1 = this; }
|
|
76
76
|
static { this.TEMPLATE_ID = 'code'; }
|
|
@@ -80,11 +80,11 @@ let MarkerCodeColumnRenderer = class MarkerCodeColumnRenderer {
|
|
|
80
80
|
}
|
|
81
81
|
renderTemplate(container) {
|
|
82
82
|
const codeColumn = dom.append(container, $('.code'));
|
|
83
|
-
const sourceLabel = (
|
|
83
|
+
const sourceLabel = ( new HighlightedLabel(codeColumn));
|
|
84
84
|
sourceLabel.element.classList.add('source-label');
|
|
85
|
-
const codeLabel = (
|
|
85
|
+
const codeLabel = ( new HighlightedLabel(codeColumn));
|
|
86
86
|
codeLabel.element.classList.add('code-label');
|
|
87
|
-
const codeLink = (
|
|
87
|
+
const codeLink = ( new Link(codeColumn, { href: '', label: '' }, {}, this.openerService));
|
|
88
88
|
return { codeColumn, sourceLabel, codeLabel, codeLink };
|
|
89
89
|
}
|
|
90
90
|
renderElement(element, index, templateData, height) {
|
|
@@ -101,11 +101,11 @@ let MarkerCodeColumnRenderer = class MarkerCodeColumnRenderer {
|
|
|
101
101
|
templateData.codeColumn.classList.add('code-link');
|
|
102
102
|
templateData.codeColumn.title = `${element.marker.source} (${element.marker.code.value})`;
|
|
103
103
|
templateData.sourceLabel.set(element.marker.source, element.sourceMatches);
|
|
104
|
-
const codeLinkLabel = (
|
|
104
|
+
const codeLinkLabel = ( new HighlightedLabel($('.code-link-label')));
|
|
105
105
|
codeLinkLabel.set(element.marker.code.value, element.codeMatches);
|
|
106
106
|
templateData.codeLink.link = {
|
|
107
|
-
href: (
|
|
108
|
-
title: (
|
|
107
|
+
href: ( element.marker.code.target.toString()),
|
|
108
|
+
title: ( element.marker.code.target.toString()),
|
|
109
109
|
label: codeLinkLabel.element,
|
|
110
110
|
};
|
|
111
111
|
}
|
|
@@ -117,9 +117,9 @@ let MarkerCodeColumnRenderer = class MarkerCodeColumnRenderer {
|
|
|
117
117
|
}
|
|
118
118
|
disposeTemplate(templateData) { }
|
|
119
119
|
};
|
|
120
|
-
MarkerCodeColumnRenderer = MarkerCodeColumnRenderer_1 = (
|
|
121
|
-
(
|
|
122
|
-
], MarkerCodeColumnRenderer))
|
|
120
|
+
MarkerCodeColumnRenderer = MarkerCodeColumnRenderer_1 = ( __decorate([
|
|
121
|
+
( __param(0, IOpenerService))
|
|
122
|
+
], MarkerCodeColumnRenderer));
|
|
123
123
|
class MarkerMessageColumnRenderer {
|
|
124
124
|
constructor() {
|
|
125
125
|
this.templateId = MarkerMessageColumnRenderer.TEMPLATE_ID;
|
|
@@ -127,7 +127,7 @@ class MarkerMessageColumnRenderer {
|
|
|
127
127
|
static { this.TEMPLATE_ID = 'message'; }
|
|
128
128
|
renderTemplate(container) {
|
|
129
129
|
const columnElement = dom.append(container, $('.message'));
|
|
130
|
-
const highlightedLabel = (
|
|
130
|
+
const highlightedLabel = ( new HighlightedLabel(columnElement));
|
|
131
131
|
return { columnElement, highlightedLabel };
|
|
132
132
|
}
|
|
133
133
|
renderElement(element, index, templateData, height) {
|
|
@@ -145,9 +145,9 @@ let MarkerFileColumnRenderer = class MarkerFileColumnRenderer {
|
|
|
145
145
|
}
|
|
146
146
|
renderTemplate(container) {
|
|
147
147
|
const columnElement = dom.append(container, $('.file'));
|
|
148
|
-
const fileLabel = (
|
|
148
|
+
const fileLabel = ( new HighlightedLabel(columnElement));
|
|
149
149
|
fileLabel.element.classList.add('file-label');
|
|
150
|
-
const positionLabel = (
|
|
150
|
+
const positionLabel = ( new HighlightedLabel(columnElement));
|
|
151
151
|
positionLabel.element.classList.add('file-position');
|
|
152
152
|
return { columnElement, fileLabel, positionLabel };
|
|
153
153
|
}
|
|
@@ -159,9 +159,9 @@ let MarkerFileColumnRenderer = class MarkerFileColumnRenderer {
|
|
|
159
159
|
}
|
|
160
160
|
disposeTemplate(templateData) { }
|
|
161
161
|
};
|
|
162
|
-
MarkerFileColumnRenderer = MarkerFileColumnRenderer_1 = (
|
|
163
|
-
(
|
|
164
|
-
], MarkerFileColumnRenderer))
|
|
162
|
+
MarkerFileColumnRenderer = MarkerFileColumnRenderer_1 = ( __decorate([
|
|
163
|
+
( __param(0, ILabelService))
|
|
164
|
+
], MarkerFileColumnRenderer));
|
|
165
165
|
class MarkerOwnerColumnRenderer {
|
|
166
166
|
constructor() {
|
|
167
167
|
this.templateId = MarkerOwnerColumnRenderer.TEMPLATE_ID;
|
|
@@ -169,7 +169,7 @@ class MarkerOwnerColumnRenderer {
|
|
|
169
169
|
static { this.TEMPLATE_ID = 'owner'; }
|
|
170
170
|
renderTemplate(container) {
|
|
171
171
|
const columnElement = dom.append(container, $('.owner'));
|
|
172
|
-
const highlightedLabel = (
|
|
172
|
+
const highlightedLabel = ( new HighlightedLabel(columnElement));
|
|
173
173
|
return { columnElement, highlightedLabel };
|
|
174
174
|
}
|
|
175
175
|
renderElement(element, index, templateData, height) {
|
|
@@ -198,7 +198,7 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
198
198
|
this.instantiationService = instantiationService;
|
|
199
199
|
this.labelService = labelService;
|
|
200
200
|
this._itemCount = 0;
|
|
201
|
-
this.table = this.instantiationService.createInstance(WorkbenchTable, 'Markers', this.container, (
|
|
201
|
+
this.table = this.instantiationService.createInstance(WorkbenchTable, 'Markers', this.container, ( new MarkersTableVirtualDelegate()), [
|
|
202
202
|
{
|
|
203
203
|
label: '',
|
|
204
204
|
tooltip: '',
|
|
@@ -209,7 +209,7 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
209
209
|
project(row) { return row; }
|
|
210
210
|
},
|
|
211
211
|
{
|
|
212
|
-
label: (
|
|
212
|
+
label: localizeWithPath('vs/workbench/contrib/markers/browser/markersTable', 'codeColumnLabel', "Code"),
|
|
213
213
|
tooltip: '',
|
|
214
214
|
weight: 1,
|
|
215
215
|
minimumWidth: 100,
|
|
@@ -218,21 +218,21 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
218
218
|
project(row) { return row; }
|
|
219
219
|
},
|
|
220
220
|
{
|
|
221
|
-
label: (
|
|
221
|
+
label: localizeWithPath('vs/workbench/contrib/markers/browser/markersTable', 'messageColumnLabel', "Message"),
|
|
222
222
|
tooltip: '',
|
|
223
223
|
weight: 4,
|
|
224
224
|
templateId: MarkerMessageColumnRenderer.TEMPLATE_ID,
|
|
225
225
|
project(row) { return row; }
|
|
226
226
|
},
|
|
227
227
|
{
|
|
228
|
-
label: (
|
|
228
|
+
label: localizeWithPath('vs/workbench/contrib/markers/browser/markersTable', 'fileColumnLabel', "File"),
|
|
229
229
|
tooltip: '',
|
|
230
230
|
weight: 2,
|
|
231
231
|
templateId: MarkerFileColumnRenderer.TEMPLATE_ID,
|
|
232
232
|
project(row) { return row; }
|
|
233
233
|
},
|
|
234
234
|
{
|
|
235
|
-
label: (
|
|
235
|
+
label: localizeWithPath('vs/workbench/contrib/markers/browser/markersTable', 'sourceColumnLabel', "Source"),
|
|
236
236
|
tooltip: '',
|
|
237
237
|
weight: 1,
|
|
238
238
|
minimumWidth: 100,
|
|
@@ -248,15 +248,12 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
248
248
|
this.instantiationService.createInstance(MarkerOwnerColumnRenderer),
|
|
249
249
|
], options);
|
|
250
250
|
const list = this.table.domNode.querySelector('.monaco-list-rows');
|
|
251
|
-
const onRowHover = Event.chain(this._register((
|
|
251
|
+
const onRowHover = Event.chain(this._register(( new DomEmitter(list, 'mouseover'))).event, $ => ( ( $.map(
|
|
252
252
|
e => dom.findParentWithClass(e.target, 'monaco-list-row', 'monaco-list-rows')
|
|
253
|
-
))
|
|
253
|
+
))
|
|
254
254
|
.filter(((e) => !!e))
|
|
255
|
-
.map(e => parseInt(e.getAttribute('data-index')))))
|
|
256
|
-
const onListLeave = (
|
|
257
|
-
this._register(( (new DomEmitter(list, 'mouseleave')))).event,
|
|
258
|
-
() => -1
|
|
259
|
-
)));
|
|
255
|
+
.map(e => parseInt(e.getAttribute('data-index')))));
|
|
256
|
+
const onListLeave = ( Event.map(this._register(( new DomEmitter(list, 'mouseleave'))).event, () => -1));
|
|
260
257
|
const onRowHoverOrLeave = Event.latch(Event.any(onRowHover, onListLeave));
|
|
261
258
|
const onRowPermanentHover = Event.debounce(onRowHoverOrLeave, (_, e) => e, 500);
|
|
262
259
|
this._register(onRowPermanentHover(e => {
|
|
@@ -290,7 +287,7 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
290
287
|
}
|
|
291
288
|
getFocus() {
|
|
292
289
|
const focus = this.table.getFocus();
|
|
293
|
-
return focus.length > 0 ? [...(
|
|
290
|
+
return focus.length > 0 ? [...( focus.map(f => this.table.row(f)))] : [];
|
|
294
291
|
}
|
|
295
292
|
getHTMLElement() {
|
|
296
293
|
return this.table.getHTMLElement();
|
|
@@ -300,7 +297,7 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
300
297
|
}
|
|
301
298
|
getSelection() {
|
|
302
299
|
const selection = this.table.getSelection();
|
|
303
|
-
return selection.length > 0 ? [...(
|
|
300
|
+
return selection.length > 0 ? [...( selection.map(i => this.table.row(i)))] : [];
|
|
304
301
|
}
|
|
305
302
|
getVisibleItemCount() {
|
|
306
303
|
return this._itemCount;
|
|
@@ -317,14 +314,14 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
317
314
|
const items = [];
|
|
318
315
|
for (const resourceMarker of this.resourceMarkers) {
|
|
319
316
|
for (const marker of resourceMarker.markers) {
|
|
320
|
-
if ((
|
|
317
|
+
if (( unsupportedSchemas.has(marker.resource.scheme))) {
|
|
321
318
|
continue;
|
|
322
319
|
}
|
|
323
320
|
if (this.filterOptions.excludesMatcher.matches(marker.resource)) {
|
|
324
321
|
continue;
|
|
325
322
|
}
|
|
326
323
|
if (this.filterOptions.includesMatcher.matches(marker.resource)) {
|
|
327
|
-
items.push((
|
|
324
|
+
items.push(( new MarkerTableItem(marker)));
|
|
328
325
|
continue;
|
|
329
326
|
}
|
|
330
327
|
const matchesSeverity = this.filterOptions.showErrors && MarkerSeverity.Error === marker.marker.severity ||
|
|
@@ -341,18 +338,18 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
341
338
|
const ownerMatches = FilterOptions._messageFilter(this.filterOptions.textFilter.text, marker.marker.owner) ?? undefined;
|
|
342
339
|
const matched = sourceMatches || codeMatches || messageMatches || fileMatches || ownerMatches;
|
|
343
340
|
if ((matched && !this.filterOptions.textFilter.negate) || (!matched && this.filterOptions.textFilter.negate)) {
|
|
344
|
-
items.push((
|
|
341
|
+
items.push(( new MarkerTableItem(
|
|
345
342
|
marker,
|
|
346
343
|
sourceMatches,
|
|
347
344
|
codeMatches,
|
|
348
345
|
messageMatches,
|
|
349
346
|
fileMatches,
|
|
350
347
|
ownerMatches
|
|
351
|
-
)))
|
|
348
|
+
)));
|
|
352
349
|
}
|
|
353
350
|
continue;
|
|
354
351
|
}
|
|
355
|
-
items.push((
|
|
352
|
+
items.push(( new MarkerTableItem(marker)));
|
|
356
353
|
}
|
|
357
354
|
}
|
|
358
355
|
this._itemCount = items.length;
|
|
@@ -398,9 +395,9 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
398
395
|
setMarkerSelection(selection, focus) {
|
|
399
396
|
if (this.isVisible()) {
|
|
400
397
|
if (selection && selection.length > 0) {
|
|
401
|
-
this.table.setSelection((
|
|
398
|
+
this.table.setSelection(( selection.map(m => this.findMarkerIndex(m))));
|
|
402
399
|
if (focus && focus.length > 0) {
|
|
403
|
-
this.table.setFocus((
|
|
400
|
+
this.table.setFocus(( focus.map(f => this.findMarkerIndex(f))));
|
|
404
401
|
}
|
|
405
402
|
else {
|
|
406
403
|
this.table.setFocus([this.findMarkerIndex(selection[0])]);
|
|
@@ -439,7 +436,7 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
439
436
|
const selectedElement = this.getSelection();
|
|
440
437
|
if (selectedElement && selectedElement.length > 0) {
|
|
441
438
|
if (selectedElement[0] instanceof Marker) {
|
|
442
|
-
if ((
|
|
439
|
+
if (( resource.has(selectedElement[0].marker.resource))) {
|
|
443
440
|
return true;
|
|
444
441
|
}
|
|
445
442
|
}
|
|
@@ -447,9 +444,9 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
447
444
|
return false;
|
|
448
445
|
}
|
|
449
446
|
};
|
|
450
|
-
MarkersTable = (
|
|
451
|
-
(
|
|
452
|
-
(
|
|
453
|
-
], MarkersTable))
|
|
447
|
+
MarkersTable = ( __decorate([
|
|
448
|
+
( __param(5, IInstantiationService)),
|
|
449
|
+
( __param(6, ILabelService))
|
|
450
|
+
], MarkersTable));
|
|
454
451
|
|
|
455
452
|
export { MarkersTable };
|
|
@@ -18,7 +18,7 @@ import { FilterOptions } from './markersFilterOptions.js';
|
|
|
18
18
|
import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
|
|
19
19
|
import { isUndefinedOrNull } from 'monaco-editor/esm/vs/base/common/types.js';
|
|
20
20
|
import { Action } from 'monaco-editor/esm/vs/base/common/actions.js';
|
|
21
|
-
import {
|
|
21
|
+
import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
|
|
22
22
|
import { createCancelablePromise, Delayer } from 'monaco-editor/esm/vs/base/common/async.js';
|
|
23
23
|
import { IModelService } from 'monaco-editor/esm/vs/editor/common/services/model.js';
|
|
24
24
|
import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
|
|
@@ -45,9 +45,7 @@ let MarkersWidgetAccessibilityProvider = class MarkersWidgetAccessibilityProvide
|
|
|
45
45
|
this.labelService = labelService;
|
|
46
46
|
}
|
|
47
47
|
getWidgetAriaLabel() {
|
|
48
|
-
return (
|
|
49
|
-
(localize('problemsView', "Problems View"))
|
|
50
|
-
);
|
|
48
|
+
return localizeWithPath('vs/workbench/contrib/markers/browser/markersTreeViewer', 'problemsView', "Problems View");
|
|
51
49
|
}
|
|
52
50
|
getAriaLabel(element) {
|
|
53
51
|
if (element instanceof ResourceMarkers) {
|
|
@@ -63,9 +61,9 @@ let MarkersWidgetAccessibilityProvider = class MarkersWidgetAccessibilityProvide
|
|
|
63
61
|
return null;
|
|
64
62
|
}
|
|
65
63
|
};
|
|
66
|
-
MarkersWidgetAccessibilityProvider = (
|
|
67
|
-
(
|
|
68
|
-
], MarkersWidgetAccessibilityProvider))
|
|
64
|
+
MarkersWidgetAccessibilityProvider = ( __decorate([
|
|
65
|
+
( __param(0, ILabelService))
|
|
66
|
+
], MarkersWidgetAccessibilityProvider));
|
|
69
67
|
class VirtualDelegate {
|
|
70
68
|
static { this.LINE_HEIGHT = 22; }
|
|
71
69
|
constructor(markersViewState) {
|
|
@@ -96,8 +94,8 @@ let ResourceMarkersRenderer = class ResourceMarkersRenderer {
|
|
|
96
94
|
this.labels = labels;
|
|
97
95
|
this.labelService = labelService;
|
|
98
96
|
this.fileService = fileService;
|
|
99
|
-
this.renderedNodes = (
|
|
100
|
-
this.disposables = (
|
|
97
|
+
this.renderedNodes = ( new Map());
|
|
98
|
+
this.disposables = ( new DisposableStore());
|
|
101
99
|
this.templateId = "rm" ;
|
|
102
100
|
onDidChangeRenderNodeCount(this.onDidChangeRenderNodeCount, this, this.disposables);
|
|
103
101
|
}
|
|
@@ -105,7 +103,7 @@ let ResourceMarkersRenderer = class ResourceMarkersRenderer {
|
|
|
105
103
|
const resourceLabelContainer = dom.append(container, dom.$('.resource-label-container'));
|
|
106
104
|
const resourceLabel = this.labels.create(resourceLabelContainer, { supportHighlights: true });
|
|
107
105
|
const badgeWrapper = dom.append(container, dom.$('.count-badge-wrapper'));
|
|
108
|
-
const count = (
|
|
106
|
+
const count = ( new CountBadge(badgeWrapper, {}, defaultCountBadgeStyles));
|
|
109
107
|
return { count, resourceLabel };
|
|
110
108
|
}
|
|
111
109
|
renderElement(node, _, templateData) {
|
|
@@ -140,10 +138,10 @@ let ResourceMarkersRenderer = class ResourceMarkersRenderer {
|
|
|
140
138
|
this.disposables.dispose();
|
|
141
139
|
}
|
|
142
140
|
};
|
|
143
|
-
ResourceMarkersRenderer = (
|
|
144
|
-
(
|
|
145
|
-
(
|
|
146
|
-
], ResourceMarkersRenderer))
|
|
141
|
+
ResourceMarkersRenderer = ( __decorate([
|
|
142
|
+
( __param(2, ILabelService)),
|
|
143
|
+
( __param(3, IFileService))
|
|
144
|
+
], ResourceMarkersRenderer));
|
|
147
145
|
let MarkerRenderer = class MarkerRenderer {
|
|
148
146
|
constructor(markersViewState, instantiationService, openerService) {
|
|
149
147
|
this.markersViewState = markersViewState;
|
|
@@ -153,12 +151,12 @@ let MarkerRenderer = class MarkerRenderer {
|
|
|
153
151
|
}
|
|
154
152
|
renderTemplate(container) {
|
|
155
153
|
const data = Object.create(null);
|
|
156
|
-
data.markerWidget = (
|
|
154
|
+
data.markerWidget = ( new MarkerWidget(
|
|
157
155
|
container,
|
|
158
156
|
this.markersViewState,
|
|
159
157
|
this.openerService,
|
|
160
158
|
this.instantiationService
|
|
161
|
-
))
|
|
159
|
+
));
|
|
162
160
|
return data;
|
|
163
161
|
}
|
|
164
162
|
renderElement(node, _, templateData) {
|
|
@@ -168,18 +166,12 @@ let MarkerRenderer = class MarkerRenderer {
|
|
|
168
166
|
templateData.markerWidget.dispose();
|
|
169
167
|
}
|
|
170
168
|
};
|
|
171
|
-
MarkerRenderer = (
|
|
172
|
-
(
|
|
173
|
-
(
|
|
174
|
-
], MarkerRenderer))
|
|
175
|
-
const expandedIcon = registerIcon('markers-view-multi-line-expanded', Codicon.chevronUp, (
|
|
176
|
-
|
|
177
|
-
'Icon indicating that multiple lines are shown in the markers view.'
|
|
178
|
-
))));
|
|
179
|
-
const collapsedIcon = registerIcon('markers-view-multi-line-collapsed', Codicon.chevronDown, ( (localize(
|
|
180
|
-
'collapsedIcon',
|
|
181
|
-
'Icon indicating that multiple lines are collapsed in the markers view.'
|
|
182
|
-
))));
|
|
169
|
+
MarkerRenderer = ( __decorate([
|
|
170
|
+
( __param(1, IInstantiationService)),
|
|
171
|
+
( __param(2, IOpenerService))
|
|
172
|
+
], MarkerRenderer));
|
|
173
|
+
const expandedIcon = registerIcon('markers-view-multi-line-expanded', Codicon.chevronUp, localizeWithPath('vs/workbench/contrib/markers/browser/markersTreeViewer', 'expandedIcon', 'Icon indicating that multiple lines are shown in the markers view.'));
|
|
174
|
+
const collapsedIcon = registerIcon('markers-view-multi-line-collapsed', Codicon.chevronDown, localizeWithPath('vs/workbench/contrib/markers/browser/markersTreeViewer', 'collapsedIcon', 'Icon indicating that multiple lines are collapsed in the markers view.'));
|
|
183
175
|
const toggleMultilineAction = 'problems.action.toggleMultiline';
|
|
184
176
|
class ToggleMultilineActionViewItem extends ActionViewItem {
|
|
185
177
|
render(container) {
|
|
@@ -200,10 +192,10 @@ class MarkerWidget extends Disposable {
|
|
|
200
192
|
this.parent = parent;
|
|
201
193
|
this.markersViewModel = markersViewModel;
|
|
202
194
|
this._openerService = _openerService;
|
|
203
|
-
this.disposables = this._register((
|
|
204
|
-
this.actionBar = this._register((
|
|
195
|
+
this.disposables = this._register(( new DisposableStore()));
|
|
196
|
+
this.actionBar = this._register(( new ActionBar(dom.append(parent, dom.$('.actions')), {
|
|
205
197
|
actionViewItemProvider: (action) => action.id === QuickFixAction.ID ? _instantiationService.createInstance(QuickFixActionViewItem, action) : undefined
|
|
206
|
-
})))
|
|
198
|
+
})));
|
|
207
199
|
this.iconContainer = dom.append(parent, dom.$(''));
|
|
208
200
|
this.icon = dom.append(this.iconContainer, dom.$(''));
|
|
209
201
|
this.messageAndDetailsContainer = dom.append(parent, dom.$('.marker-message-details-container'));
|
|
@@ -212,7 +204,7 @@ class MarkerWidget extends Disposable {
|
|
|
212
204
|
this.actionBar.clear();
|
|
213
205
|
this.disposables.clear();
|
|
214
206
|
dom.clearNode(this.messageAndDetailsContainer);
|
|
215
|
-
this.iconContainer.className = `marker-icon ${(
|
|
207
|
+
this.iconContainer.className = `marker-icon ${( Severity.toString(MarkerSeverity.toSeverity(element.marker.severity)))}`;
|
|
216
208
|
this.icon.className = `codicon ${SeverityIcon.className(MarkerSeverity.toSeverity(element.marker.severity))}`;
|
|
217
209
|
this.renderQuickfixActionbar(element);
|
|
218
210
|
this.renderMessageAndDetails(element, filterData);
|
|
@@ -239,22 +231,20 @@ class MarkerWidget extends Disposable {
|
|
|
239
231
|
}
|
|
240
232
|
}
|
|
241
233
|
renderMultilineActionbar(marker, parent) {
|
|
242
|
-
const multilineActionbar = this.disposables.add((
|
|
234
|
+
const multilineActionbar = this.disposables.add(( new ActionBar(dom.append(parent, dom.$('.multiline-actions')), {
|
|
243
235
|
actionViewItemProvider: (action) => {
|
|
244
236
|
if (action.id === toggleMultilineAction) {
|
|
245
|
-
return (
|
|
246
|
-
(new ToggleMultilineActionViewItem(undefined, action, { icon: true }))
|
|
247
|
-
);
|
|
237
|
+
return ( new ToggleMultilineActionViewItem(undefined, action, { icon: true }));
|
|
248
238
|
}
|
|
249
239
|
return undefined;
|
|
250
240
|
}
|
|
251
|
-
})))
|
|
241
|
+
})));
|
|
252
242
|
this.disposables.add(toDisposable(() => multilineActionbar.dispose()));
|
|
253
243
|
const viewModel = this.markersViewModel.getViewModel(marker);
|
|
254
244
|
const multiline = viewModel && viewModel.multiline;
|
|
255
|
-
const action = (
|
|
245
|
+
const action = ( new Action(toggleMultilineAction));
|
|
256
246
|
action.enabled = !!viewModel && marker.lines.length > 1;
|
|
257
|
-
action.tooltip = multiline ? (
|
|
247
|
+
action.tooltip = multiline ? localizeWithPath('vs/workbench/contrib/markers/browser/markersTreeViewer', 'single line', "Show message in single line") : localizeWithPath('vs/workbench/contrib/markers/browser/markersTreeViewer', 'multi line', "Show message in multiple lines");
|
|
258
248
|
action.class = ThemeIcon.asClassName(multiline ? expandedIcon : collapsedIcon);
|
|
259
249
|
action.run = () => { if (viewModel) {
|
|
260
250
|
viewModel.multiline = !viewModel.multiline;
|
|
@@ -271,7 +261,7 @@ class MarkerWidget extends Disposable {
|
|
|
271
261
|
for (let index = 0; index < (multiline ? lines.length : 1); index++) {
|
|
272
262
|
const lineElement = dom.append(this.messageAndDetailsContainer, dom.$('.marker-message-line'));
|
|
273
263
|
const messageElement = dom.append(lineElement, dom.$('.marker-message'));
|
|
274
|
-
const highlightedLabel = (
|
|
264
|
+
const highlightedLabel = ( new HighlightedLabel(messageElement));
|
|
275
265
|
highlightedLabel.set(lines[index].length > 1000 ? `${lines[index].substring(0, 1000)}...` : lines[index], lineMatches[index]);
|
|
276
266
|
if (lines[index] === '') {
|
|
277
267
|
lineElement.style.height = `${VirtualDelegate.LINE_HEIGHT}px`;
|
|
@@ -284,25 +274,25 @@ class MarkerWidget extends Disposable {
|
|
|
284
274
|
renderDetails(marker, filterData, parent) {
|
|
285
275
|
parent.classList.add('details-container');
|
|
286
276
|
if (marker.source || marker.code) {
|
|
287
|
-
const source = (
|
|
277
|
+
const source = ( new HighlightedLabel(dom.append(parent, dom.$('.marker-source'))));
|
|
288
278
|
const sourceMatches = filterData && filterData.sourceMatches || [];
|
|
289
279
|
source.set(marker.source, sourceMatches);
|
|
290
280
|
if (marker.code) {
|
|
291
281
|
if (typeof marker.code === 'string') {
|
|
292
|
-
const code = (
|
|
282
|
+
const code = ( new HighlightedLabel(dom.append(parent, dom.$('.marker-code'))));
|
|
293
283
|
const codeMatches = filterData && filterData.codeMatches || [];
|
|
294
284
|
code.set(marker.code, codeMatches);
|
|
295
285
|
}
|
|
296
286
|
else {
|
|
297
287
|
const container = dom.$('.marker-code');
|
|
298
|
-
const code = (
|
|
299
|
-
const link = (
|
|
300
|
-
this.disposables.add((
|
|
288
|
+
const code = ( new HighlightedLabel(container));
|
|
289
|
+
const link = ( marker.code.target.toString(true));
|
|
290
|
+
this.disposables.add(( new Link(
|
|
301
291
|
parent,
|
|
302
292
|
{ href: link, label: container, title: link },
|
|
303
293
|
undefined,
|
|
304
294
|
this._openerService
|
|
305
|
-
)))
|
|
295
|
+
)));
|
|
306
296
|
const codeMatches = filterData && filterData.codeMatches || [];
|
|
307
297
|
code.set(marker.code.value, codeMatches);
|
|
308
298
|
}
|
|
@@ -321,12 +311,12 @@ let RelatedInformationRenderer = class RelatedInformationRenderer {
|
|
|
321
311
|
const data = Object.create(null);
|
|
322
312
|
dom.append(container, dom.$('.actions'));
|
|
323
313
|
dom.append(container, dom.$('.icon'));
|
|
324
|
-
data.resourceLabel = (
|
|
314
|
+
data.resourceLabel = ( new HighlightedLabel(dom.append(container, dom.$('.related-info-resource'))));
|
|
325
315
|
data.lnCol = dom.append(container, dom.$('span.marker-line'));
|
|
326
316
|
const separator = dom.append(container, dom.$('span.related-info-resource-separator'));
|
|
327
317
|
separator.textContent = ':';
|
|
328
318
|
separator.style.paddingRight = '4px';
|
|
329
|
-
data.description = (
|
|
319
|
+
data.description = ( new HighlightedLabel(dom.append(container, dom.$('.marker-description'))));
|
|
330
320
|
return data;
|
|
331
321
|
}
|
|
332
322
|
renderElement(node, _, templateData) {
|
|
@@ -342,9 +332,9 @@ let RelatedInformationRenderer = class RelatedInformationRenderer {
|
|
|
342
332
|
disposeTemplate(templateData) {
|
|
343
333
|
}
|
|
344
334
|
};
|
|
345
|
-
RelatedInformationRenderer = (
|
|
346
|
-
(
|
|
347
|
-
], RelatedInformationRenderer))
|
|
335
|
+
RelatedInformationRenderer = ( __decorate([
|
|
336
|
+
( __param(0, ILabelService))
|
|
337
|
+
], RelatedInformationRenderer));
|
|
348
338
|
class Filter {
|
|
349
339
|
constructor(options) {
|
|
350
340
|
this.options = options;
|
|
@@ -361,7 +351,7 @@ class Filter {
|
|
|
361
351
|
}
|
|
362
352
|
}
|
|
363
353
|
filterResourceMarkers(resourceMarkers) {
|
|
364
|
-
if ((
|
|
354
|
+
if (( unsupportedSchemas.has(resourceMarkers.resource.scheme))) {
|
|
365
355
|
return false;
|
|
366
356
|
}
|
|
367
357
|
if (this.options.excludesMatcher.matches(resourceMarkers.resource)) {
|
|
@@ -395,7 +385,7 @@ class Filter {
|
|
|
395
385
|
}
|
|
396
386
|
const sourceMatches = marker.marker.source ? FilterOptions._filter(this.options.textFilter.text, marker.marker.source) : undefined;
|
|
397
387
|
const codeMatches = marker.marker.code ? FilterOptions._filter(this.options.textFilter.text, typeof marker.marker.code === 'string' ? marker.marker.code : marker.marker.code.value) : undefined;
|
|
398
|
-
const matched = sourceMatches || codeMatches || (
|
|
388
|
+
const matched = sourceMatches || codeMatches || ( lineMatches.some(lineMatch => lineMatch.length > 0));
|
|
399
389
|
if (matched && !this.options.textFilter.negate) {
|
|
400
390
|
return { visibility: true, data: { type: 1 , lineMatches, sourceMatches: sourceMatches || [], codeMatches: codeMatches || [] } };
|
|
401
391
|
}
|
|
@@ -434,7 +424,7 @@ let MarkerViewModel = class MarkerViewModel extends Disposable {
|
|
|
434
424
|
this.instantiationService = instantiationService;
|
|
435
425
|
this.editorService = editorService;
|
|
436
426
|
this.languageFeaturesService = languageFeaturesService;
|
|
437
|
-
this._onDidChange = this._register((
|
|
427
|
+
this._onDidChange = this._register(( new Emitter()));
|
|
438
428
|
this.onDidChange = this._onDidChange.event;
|
|
439
429
|
this.modelPromise = null;
|
|
440
430
|
this.codeActionsPromise = null;
|
|
@@ -481,12 +471,12 @@ let MarkerViewModel = class MarkerViewModel extends Disposable {
|
|
|
481
471
|
if (model) {
|
|
482
472
|
if (!this.codeActionsPromise) {
|
|
483
473
|
this.codeActionsPromise = createCancelablePromise(cancellationToken => {
|
|
484
|
-
return getCodeActions(this.languageFeaturesService.codeActionProvider, model, (
|
|
474
|
+
return getCodeActions(this.languageFeaturesService.codeActionProvider, model, ( new Range(
|
|
485
475
|
this.marker.range.startLineNumber,
|
|
486
476
|
this.marker.range.startColumn,
|
|
487
477
|
this.marker.range.endLineNumber,
|
|
488
478
|
this.marker.range.endColumn
|
|
489
|
-
))
|
|
479
|
+
)), {
|
|
490
480
|
type: 1 , triggerAction: CodeActionTriggerSource.ProblemsView, filter: { include: CodeActionKind.QuickFix }
|
|
491
481
|
}, Progress.None, cancellationToken).then(actions => {
|
|
492
482
|
return this._register(actions);
|
|
@@ -499,18 +489,16 @@ let MarkerViewModel = class MarkerViewModel extends Disposable {
|
|
|
499
489
|
});
|
|
500
490
|
}
|
|
501
491
|
toActions(codeActions) {
|
|
502
|
-
return (
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
|
|
508
|
-
()
|
|
509
|
-
|
|
510
|
-
|
|
511
|
-
|
|
512
|
-
)))))
|
|
513
|
-
);
|
|
492
|
+
return ( codeActions.validActions.map(item => ( new Action(
|
|
493
|
+
item.action.command ? item.action.command.id : item.action.title,
|
|
494
|
+
item.action.title,
|
|
495
|
+
undefined,
|
|
496
|
+
true,
|
|
497
|
+
() => {
|
|
498
|
+
return this.openFileAtMarker(this.marker)
|
|
499
|
+
.then(() => this.instantiationService.invokeFunction(applyCodeAction, item, ApplyCodeActionReason.FromProblemsView));
|
|
500
|
+
}
|
|
501
|
+
))));
|
|
514
502
|
}
|
|
515
503
|
openFileAtMarker(element) {
|
|
516
504
|
const { resource, selection } = { resource: element.resource, selection: element.range };
|
|
@@ -532,15 +520,13 @@ let MarkerViewModel = class MarkerViewModel extends Disposable {
|
|
|
532
520
|
if (waitForModel) {
|
|
533
521
|
if (!this.modelPromise) {
|
|
534
522
|
this.modelPromise = createCancelablePromise(cancellationToken => {
|
|
535
|
-
return (
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
|
|
542
|
-
}))
|
|
543
|
-
);
|
|
523
|
+
return ( new Promise((c) => {
|
|
524
|
+
this._register(this.modelService.onModelAdded(model => {
|
|
525
|
+
if (isEqual(model.uri, this.marker.resource)) {
|
|
526
|
+
c(model);
|
|
527
|
+
}
|
|
528
|
+
}));
|
|
529
|
+
}));
|
|
544
530
|
});
|
|
545
531
|
}
|
|
546
532
|
return this.modelPromise;
|
|
@@ -548,26 +534,26 @@ let MarkerViewModel = class MarkerViewModel extends Disposable {
|
|
|
548
534
|
return Promise.resolve(null);
|
|
549
535
|
}
|
|
550
536
|
};
|
|
551
|
-
MarkerViewModel = (
|
|
552
|
-
(
|
|
553
|
-
(
|
|
554
|
-
(
|
|
555
|
-
(
|
|
556
|
-
], MarkerViewModel))
|
|
537
|
+
MarkerViewModel = ( __decorate([
|
|
538
|
+
( __param(1, IModelService)),
|
|
539
|
+
( __param(2, IInstantiationService)),
|
|
540
|
+
( __param(3, IEditorService)),
|
|
541
|
+
( __param(4, ILanguageFeaturesService))
|
|
542
|
+
], MarkerViewModel));
|
|
557
543
|
let MarkersViewModel = class MarkersViewModel extends Disposable {
|
|
558
544
|
constructor(multiline = true, viewMode = "tree" , contextKeyService, instantiationService) {
|
|
559
545
|
super();
|
|
560
546
|
this.contextKeyService = contextKeyService;
|
|
561
547
|
this.instantiationService = instantiationService;
|
|
562
|
-
this._onDidChange = this._register((
|
|
548
|
+
this._onDidChange = this._register(( new Emitter()));
|
|
563
549
|
this.onDidChange = this._onDidChange.event;
|
|
564
|
-
this._onDidChangeViewMode = this._register((
|
|
550
|
+
this._onDidChangeViewMode = this._register(( new Emitter()));
|
|
565
551
|
this.onDidChangeViewMode = this._onDidChangeViewMode.event;
|
|
566
|
-
this.markersViewStates = (
|
|
567
|
-
this.markersPerResource = (
|
|
552
|
+
this.markersViewStates = ( new Map());
|
|
553
|
+
this.markersPerResource = ( new Map());
|
|
568
554
|
this.bulkUpdate = false;
|
|
569
555
|
this.hoveredMarker = null;
|
|
570
|
-
this.hoverDelayer = (
|
|
556
|
+
this.hoverDelayer = ( new Delayer(300));
|
|
571
557
|
this._multiline = true;
|
|
572
558
|
this._viewMode = "tree" ;
|
|
573
559
|
this._multiline = multiline;
|
|
@@ -576,7 +562,7 @@ let MarkersViewModel = class MarkersViewModel extends Disposable {
|
|
|
576
562
|
this.viewModeContextKey.set(viewMode);
|
|
577
563
|
}
|
|
578
564
|
add(marker) {
|
|
579
|
-
if (!(
|
|
565
|
+
if (!( this.markersViewStates.has(marker.id))) {
|
|
580
566
|
const viewModel = this.instantiationService.createInstance(MarkerViewModel, marker);
|
|
581
567
|
const disposables = [viewModel];
|
|
582
568
|
viewModel.multiline = this.multiline;
|
|
@@ -586,13 +572,13 @@ let MarkersViewModel = class MarkersViewModel extends Disposable {
|
|
|
586
572
|
}
|
|
587
573
|
}, this, disposables);
|
|
588
574
|
this.markersViewStates.set(marker.id, { viewModel, disposables });
|
|
589
|
-
const markers = this.markersPerResource.get((
|
|
575
|
+
const markers = this.markersPerResource.get(( marker.resource.toString())) || [];
|
|
590
576
|
markers.push(marker);
|
|
591
|
-
this.markersPerResource.set((
|
|
577
|
+
this.markersPerResource.set(( marker.resource.toString()), markers);
|
|
592
578
|
}
|
|
593
579
|
}
|
|
594
580
|
remove(resource) {
|
|
595
|
-
const markers = this.markersPerResource.get((
|
|
581
|
+
const markers = this.markersPerResource.get(( resource.toString())) || [];
|
|
596
582
|
for (const marker of markers) {
|
|
597
583
|
const value = this.markersViewStates.get(marker.id);
|
|
598
584
|
if (value) {
|
|
@@ -603,7 +589,7 @@ let MarkersViewModel = class MarkersViewModel extends Disposable {
|
|
|
603
589
|
this.hoveredMarker = null;
|
|
604
590
|
}
|
|
605
591
|
}
|
|
606
|
-
this.markersPerResource.delete((
|
|
592
|
+
this.markersPerResource.delete(( resource.toString()));
|
|
607
593
|
}
|
|
608
594
|
getViewModel(marker) {
|
|
609
595
|
const value = this.markersViewStates.get(marker.id);
|
|
@@ -664,9 +650,9 @@ let MarkersViewModel = class MarkersViewModel extends Disposable {
|
|
|
664
650
|
super.dispose();
|
|
665
651
|
}
|
|
666
652
|
};
|
|
667
|
-
MarkersViewModel = (
|
|
668
|
-
(
|
|
669
|
-
(
|
|
670
|
-
], MarkersViewModel))
|
|
653
|
+
MarkersViewModel = ( __decorate([
|
|
654
|
+
( __param(2, IContextKeyService)),
|
|
655
|
+
( __param(3, IInstantiationService))
|
|
656
|
+
], MarkersViewModel));
|
|
671
657
|
|
|
672
658
|
export { Filter, MarkerRenderer, MarkerViewModel, MarkersViewModel, MarkersWidgetAccessibilityProvider, RelatedInformationRenderer, ResourceMarkersRenderer, VirtualDelegate };
|
|
@@ -12,7 +12,7 @@ import Messages from './messages.js';
|
|
|
12
12
|
import { RangeHighlightDecorations } from 'vscode/vscode/vs/workbench/browser/codeeditor';
|
|
13
13
|
import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
|
|
14
14
|
import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
|
|
15
|
-
import {
|
|
15
|
+
import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
|
|
16
16
|
import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
|
|
17
17
|
import { Iterable } from 'monaco-editor/esm/vs/base/common/iterator.js';
|
|
18
18
|
import { Event, Relay } from 'monaco-editor/esm/vs/base/common/event.js';
|
|
@@ -158,7 +158,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
|
|
|
158
158
|
this.filterWidget.focus();
|
|
159
159
|
}
|
|
160
160
|
updateBadge(total, filtered) {
|
|
161
|
-
this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : (
|
|
161
|
+
this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : localizeWithPath('vs/workbench/contrib/markers/browser/markersView', 'showing filtered problems', "Showing {0} of {1}", filtered, total));
|
|
162
162
|
}
|
|
163
163
|
checkMoreFilters() {
|
|
164
164
|
this.filterWidget.checkMoreFilters(!this.filters.showErrors || !this.filters.showWarnings || !this.filters.showInfos || this.filters.excludedFiles || this.filters.activeFile);
|
|
@@ -538,10 +538,10 @@ let MarkersView = class MarkersView extends FilterViewPane {
|
|
|
538
538
|
else {
|
|
539
539
|
this.messageBoxContainer.style.display = 'none';
|
|
540
540
|
if (filtered === total) {
|
|
541
|
-
this.setAriaLabel((
|
|
541
|
+
this.setAriaLabel(localizeWithPath('vs/workbench/contrib/markers/browser/markersView', 'No problems filtered', "Showing {0} problems", total));
|
|
542
542
|
}
|
|
543
543
|
else {
|
|
544
|
-
this.setAriaLabel((
|
|
544
|
+
this.setAriaLabel(localizeWithPath('vs/workbench/contrib/markers/browser/markersView', 'problems filtered', "Showing {0} of {1} problems", filtered, total));
|
|
545
545
|
}
|
|
546
546
|
this.messageBoxContainer.removeAttribute('tabIndex');
|
|
547
547
|
}
|
|
@@ -558,7 +558,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
|
|
|
558
558
|
const span1 = dom.append(container, dom.$('span'));
|
|
559
559
|
span1.textContent = Messages.MARKERS_PANEL_NO_PROBLEMS_FILTERS;
|
|
560
560
|
const link = dom.append(container, dom.$('a.messageAction'));
|
|
561
|
-
link.textContent = (
|
|
561
|
+
link.textContent = localizeWithPath('vs/workbench/contrib/markers/browser/markersView', 'clearFilter', "Clear Filters");
|
|
562
562
|
link.setAttribute('tabIndex', '0');
|
|
563
563
|
const span2 = dom.append(container, dom.$('span'));
|
|
564
564
|
span2.textContent = '.';
|
|
@@ -3,171 +3,62 @@ import { basename } from 'monaco-editor/esm/vs/base/common/resources.js';
|
|
|
3
3
|
import { MarkerSeverity } from 'monaco-editor/esm/vs/platform/markers/common/markers.js';
|
|
4
4
|
|
|
5
5
|
class Messages {
|
|
6
|
-
static { this.MARKERS_PANEL_TOGGLE_LABEL =
|
|
7
|
-
static { this.MARKERS_PANEL_SHOW_LABEL =
|
|
8
|
-
static { this.PROBLEMS_PANEL_CONFIGURATION_TITLE =
|
|
9
|
-
static { this.PROBLEMS_PANEL_CONFIGURATION_AUTO_REVEAL = (
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
)
|
|
13
|
-
static { this.
|
|
14
|
-
|
|
15
|
-
"Controls the default view mode of the Problems view."
|
|
16
|
-
)); }
|
|
17
|
-
static { this.PROBLEMS_PANEL_CONFIGURATION_SHOW_CURRENT_STATUS = ( nls.localize(
|
|
18
|
-
'problems.panel.configuration.showCurrentInStatus',
|
|
19
|
-
"When enabled shows the current problem in the status bar."
|
|
20
|
-
)); }
|
|
21
|
-
static { this.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER = ( nls.localize(
|
|
22
|
-
'problems.panel.configuration.compareOrder',
|
|
23
|
-
"Controls the order in which problems are navigated."
|
|
24
|
-
)); }
|
|
25
|
-
static { this.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER_SEVERITY = ( nls.localize(
|
|
26
|
-
'problems.panel.configuration.compareOrder.severity',
|
|
27
|
-
"Navigate problems ordered by severity"
|
|
28
|
-
)); }
|
|
29
|
-
static { this.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER_POSITION = ( nls.localize(
|
|
30
|
-
'problems.panel.configuration.compareOrder.position',
|
|
31
|
-
"Navigate problems ordered by position"
|
|
32
|
-
)); }
|
|
6
|
+
static { this.MARKERS_PANEL_TOGGLE_LABEL = nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'problems.view.toggle.label', "Toggle Problems (Errors, Warnings, Infos)"); }
|
|
7
|
+
static { this.MARKERS_PANEL_SHOW_LABEL = nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'problems.view.focus.label', "Focus Problems (Errors, Warnings, Infos)"); }
|
|
8
|
+
static { this.PROBLEMS_PANEL_CONFIGURATION_TITLE = nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'problems.panel.configuration.title', "Problems View"); }
|
|
9
|
+
static { this.PROBLEMS_PANEL_CONFIGURATION_AUTO_REVEAL = nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'problems.panel.configuration.autoreveal', "Controls whether Problems view should automatically reveal files when opening them."); }
|
|
10
|
+
static { this.PROBLEMS_PANEL_CONFIGURATION_VIEW_MODE = nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'problems.panel.configuration.viewMode', "Controls the default view mode of the Problems view."); }
|
|
11
|
+
static { this.PROBLEMS_PANEL_CONFIGURATION_SHOW_CURRENT_STATUS = nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'problems.panel.configuration.showCurrentInStatus', "When enabled shows the current problem in the status bar."); }
|
|
12
|
+
static { this.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER = nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'problems.panel.configuration.compareOrder', "Controls the order in which problems are navigated."); }
|
|
13
|
+
static { this.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER_SEVERITY = nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'problems.panel.configuration.compareOrder.severity', "Navigate problems ordered by severity"); }
|
|
14
|
+
static { this.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER_POSITION = nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'problems.panel.configuration.compareOrder.position', "Navigate problems ordered by position"); }
|
|
33
15
|
static { this.MARKERS_PANEL_ORIGINAL_TITLE_PROBLEMS = 'Problems'; }
|
|
34
|
-
static { this.MARKERS_PANEL_TITLE_PROBLEMS =
|
|
35
|
-
static { this.MARKERS_PANEL_NO_PROBLEMS_BUILT = (
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
)
|
|
39
|
-
static { this.
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
)
|
|
43
|
-
static { this.
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
)
|
|
47
|
-
static { this.
|
|
48
|
-
static { this.
|
|
49
|
-
static { this.
|
|
50
|
-
static { this.
|
|
51
|
-
static { this.
|
|
52
|
-
static { this.
|
|
53
|
-
static { this.
|
|
54
|
-
static { this.
|
|
55
|
-
static { this.
|
|
56
|
-
static { this.
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
)); }
|
|
60
|
-
static { this.
|
|
61
|
-
static { this.MARKERS_PANEL_FILTER_WARNINGS = ( nls.localize('markers.panel.filter.warnings', "warnings")); }
|
|
62
|
-
static { this.MARKERS_PANEL_FILTER_INFOS = ( nls.localize('markers.panel.filter.infos', "infos")); }
|
|
63
|
-
static { this.MARKERS_PANEL_SINGLE_ERROR_LABEL = ( nls.localize('markers.panel.single.error.label', "1 Error")); }
|
|
64
|
-
static { this.MARKERS_PANEL_MULTIPLE_ERRORS_LABEL = (noOfErrors) => { return ( nls.localize('markers.panel.multiple.errors.label', "{0} Errors", '' + noOfErrors)); }; }
|
|
65
|
-
static { this.MARKERS_PANEL_SINGLE_WARNING_LABEL = ( nls.localize('markers.panel.single.warning.label', "1 Warning")); }
|
|
66
|
-
static { this.MARKERS_PANEL_MULTIPLE_WARNINGS_LABEL = (noOfWarnings) => { return ( nls.localize('markers.panel.multiple.warnings.label', "{0} Warnings", '' + noOfWarnings)); }; }
|
|
67
|
-
static { this.MARKERS_PANEL_SINGLE_INFO_LABEL = ( nls.localize('markers.panel.single.info.label', "1 Info")); }
|
|
68
|
-
static { this.MARKERS_PANEL_MULTIPLE_INFOS_LABEL = (noOfInfos) => { return ( nls.localize('markers.panel.multiple.infos.label', "{0} Infos", '' + noOfInfos)); }; }
|
|
69
|
-
static { this.MARKERS_PANEL_SINGLE_UNKNOWN_LABEL = ( nls.localize('markers.panel.single.unknown.label', "1 Unknown")); }
|
|
70
|
-
static { this.MARKERS_PANEL_MULTIPLE_UNKNOWNS_LABEL = (noOfUnknowns) => { return ( nls.localize('markers.panel.multiple.unknowns.label', "{0} Unknowns", '' + noOfUnknowns)); }; }
|
|
71
|
-
static { this.MARKERS_PANEL_AT_LINE_COL_NUMBER = (ln, col) => { return ( nls.localize('markers.panel.at.ln.col.number', "[Ln {0}, Col {1}]", '' + ln, '' + col)); }; }
|
|
72
|
-
static { this.MARKERS_TREE_ARIA_LABEL_RESOURCE = (noOfProblems, fileName, folder) => { return ( nls.localize(
|
|
73
|
-
'problems.tree.aria.label.resource',
|
|
74
|
-
"{0} problems in file {1} of folder {2}",
|
|
75
|
-
noOfProblems,
|
|
76
|
-
fileName,
|
|
77
|
-
folder
|
|
78
|
-
)); }; }
|
|
16
|
+
static { this.MARKERS_PANEL_TITLE_PROBLEMS = nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'markers.panel.title.problems', "Problems"); }
|
|
17
|
+
static { this.MARKERS_PANEL_NO_PROBLEMS_BUILT = nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'markers.panel.no.problems.build', "No problems have been detected in the workspace."); }
|
|
18
|
+
static { this.MARKERS_PANEL_NO_PROBLEMS_ACTIVE_FILE_BUILT = nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'markers.panel.no.problems.activeFile.build', "No problems have been detected in the current file."); }
|
|
19
|
+
static { this.MARKERS_PANEL_NO_PROBLEMS_FILTERS = nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'markers.panel.no.problems.filters', "No results found with provided filter criteria."); }
|
|
20
|
+
static { this.MARKERS_PANEL_ACTION_TOOLTIP_MORE_FILTERS = nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'markers.panel.action.moreFilters', "More Filters..."); }
|
|
21
|
+
static { this.MARKERS_PANEL_FILTER_LABEL_SHOW_ERRORS = nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'markers.panel.filter.showErrors', "Show Errors"); }
|
|
22
|
+
static { this.MARKERS_PANEL_FILTER_LABEL_SHOW_WARNINGS = nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'markers.panel.filter.showWarnings', "Show Warnings"); }
|
|
23
|
+
static { this.MARKERS_PANEL_FILTER_LABEL_SHOW_INFOS = nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'markers.panel.filter.showInfos', "Show Infos"); }
|
|
24
|
+
static { this.MARKERS_PANEL_FILTER_LABEL_EXCLUDED_FILES = nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'markers.panel.filter.useFilesExclude', "Hide Excluded Files"); }
|
|
25
|
+
static { this.MARKERS_PANEL_FILTER_LABEL_ACTIVE_FILE = nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'markers.panel.filter.activeFile', "Show Active File Only"); }
|
|
26
|
+
static { this.MARKERS_PANEL_ACTION_TOOLTIP_FILTER = nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'markers.panel.action.filter', "Filter Problems"); }
|
|
27
|
+
static { this.MARKERS_PANEL_ACTION_TOOLTIP_QUICKFIX = nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'markers.panel.action.quickfix', "Show fixes"); }
|
|
28
|
+
static { this.MARKERS_PANEL_FILTER_ARIA_LABEL = nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'markers.panel.filter.ariaLabel', "Filter Problems"); }
|
|
29
|
+
static { this.MARKERS_PANEL_FILTER_PLACEHOLDER = nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'markers.panel.filter.placeholder', "Filter (e.g. text, **/*.ts, !**/node_modules/**)"); }
|
|
30
|
+
static { this.MARKERS_PANEL_FILTER_ERRORS = nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'markers.panel.filter.errors', "errors"); }
|
|
31
|
+
static { this.MARKERS_PANEL_FILTER_WARNINGS = nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'markers.panel.filter.warnings', "warnings"); }
|
|
32
|
+
static { this.MARKERS_PANEL_FILTER_INFOS = nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'markers.panel.filter.infos', "infos"); }
|
|
33
|
+
static { this.MARKERS_PANEL_SINGLE_ERROR_LABEL = nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'markers.panel.single.error.label', "1 Error"); }
|
|
34
|
+
static { this.MARKERS_PANEL_MULTIPLE_ERRORS_LABEL = (noOfErrors) => { return nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'markers.panel.multiple.errors.label', "{0} Errors", '' + noOfErrors); }; }
|
|
35
|
+
static { this.MARKERS_PANEL_SINGLE_WARNING_LABEL = nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'markers.panel.single.warning.label', "1 Warning"); }
|
|
36
|
+
static { this.MARKERS_PANEL_MULTIPLE_WARNINGS_LABEL = (noOfWarnings) => { return nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'markers.panel.multiple.warnings.label', "{0} Warnings", '' + noOfWarnings); }; }
|
|
37
|
+
static { this.MARKERS_PANEL_SINGLE_INFO_LABEL = nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'markers.panel.single.info.label', "1 Info"); }
|
|
38
|
+
static { this.MARKERS_PANEL_MULTIPLE_INFOS_LABEL = (noOfInfos) => { return nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'markers.panel.multiple.infos.label', "{0} Infos", '' + noOfInfos); }; }
|
|
39
|
+
static { this.MARKERS_PANEL_SINGLE_UNKNOWN_LABEL = nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'markers.panel.single.unknown.label', "1 Unknown"); }
|
|
40
|
+
static { this.MARKERS_PANEL_MULTIPLE_UNKNOWNS_LABEL = (noOfUnknowns) => { return nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'markers.panel.multiple.unknowns.label', "{0} Unknowns", '' + noOfUnknowns); }; }
|
|
41
|
+
static { this.MARKERS_PANEL_AT_LINE_COL_NUMBER = (ln, col) => { return nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'markers.panel.at.ln.col.number', "[Ln {0}, Col {1}]", '' + ln, '' + col); }; }
|
|
42
|
+
static { this.MARKERS_TREE_ARIA_LABEL_RESOURCE = (noOfProblems, fileName, folder) => { return nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'problems.tree.aria.label.resource', "{0} problems in file {1} of folder {2}", noOfProblems, fileName, folder); }; }
|
|
79
43
|
static { this.MARKERS_TREE_ARIA_LABEL_MARKER = (marker) => {
|
|
80
|
-
const relatedInformationMessage = marker.relatedInformation.length ? (
|
|
81
|
-
'problems.tree.aria.label.marker.relatedInformation',
|
|
82
|
-
" This problem has references to {0} locations.",
|
|
83
|
-
marker.relatedInformation.length
|
|
84
|
-
)) : '';
|
|
44
|
+
const relatedInformationMessage = marker.relatedInformation.length ? nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'problems.tree.aria.label.marker.relatedInformation', " This problem has references to {0} locations.", marker.relatedInformation.length) : '';
|
|
85
45
|
switch (marker.marker.severity) {
|
|
86
46
|
case MarkerSeverity.Error:
|
|
87
|
-
return marker.marker.source ? (
|
|
88
|
-
'problems.tree.aria.label.error.marker',
|
|
89
|
-
"Error: {0} at line {1} and character {2}.{3} generated by {4}",
|
|
90
|
-
marker.marker.message,
|
|
91
|
-
marker.marker.startLineNumber,
|
|
92
|
-
marker.marker.startColumn,
|
|
93
|
-
relatedInformationMessage,
|
|
94
|
-
marker.marker.source
|
|
95
|
-
))
|
|
96
|
-
: ( nls.localize(
|
|
97
|
-
'problems.tree.aria.label.error.marker.nosource',
|
|
98
|
-
"Error: {0} at line {1} and character {2}.{3}",
|
|
99
|
-
marker.marker.message,
|
|
100
|
-
marker.marker.startLineNumber,
|
|
101
|
-
marker.marker.startColumn,
|
|
102
|
-
relatedInformationMessage
|
|
103
|
-
));
|
|
47
|
+
return marker.marker.source ? nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'problems.tree.aria.label.error.marker', "Error: {0} at line {1} and character {2}.{3} generated by {4}", marker.marker.message, marker.marker.startLineNumber, marker.marker.startColumn, relatedInformationMessage, marker.marker.source)
|
|
48
|
+
: nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'problems.tree.aria.label.error.marker.nosource', "Error: {0} at line {1} and character {2}.{3}", marker.marker.message, marker.marker.startLineNumber, marker.marker.startColumn, relatedInformationMessage);
|
|
104
49
|
case MarkerSeverity.Warning:
|
|
105
|
-
return marker.marker.source ? (
|
|
106
|
-
'problems.tree.aria.label.warning.marker',
|
|
107
|
-
"Warning: {0} at line {1} and character {2}.{3} generated by {4}",
|
|
108
|
-
marker.marker.message,
|
|
109
|
-
marker.marker.startLineNumber,
|
|
110
|
-
marker.marker.startColumn,
|
|
111
|
-
relatedInformationMessage,
|
|
112
|
-
marker.marker.source
|
|
113
|
-
))
|
|
114
|
-
: ( nls.localize(
|
|
115
|
-
'problems.tree.aria.label.warning.marker.nosource',
|
|
116
|
-
"Warning: {0} at line {1} and character {2}.{3}",
|
|
117
|
-
marker.marker.message,
|
|
118
|
-
marker.marker.startLineNumber,
|
|
119
|
-
marker.marker.startColumn,
|
|
120
|
-
relatedInformationMessage,
|
|
121
|
-
relatedInformationMessage
|
|
122
|
-
));
|
|
50
|
+
return marker.marker.source ? nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'problems.tree.aria.label.warning.marker', "Warning: {0} at line {1} and character {2}.{3} generated by {4}", marker.marker.message, marker.marker.startLineNumber, marker.marker.startColumn, relatedInformationMessage, marker.marker.source)
|
|
51
|
+
: nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'problems.tree.aria.label.warning.marker.nosource', "Warning: {0} at line {1} and character {2}.{3}", marker.marker.message, marker.marker.startLineNumber, marker.marker.startColumn, relatedInformationMessage, relatedInformationMessage);
|
|
123
52
|
case MarkerSeverity.Info:
|
|
124
|
-
return marker.marker.source ? (
|
|
125
|
-
'problems.tree.aria.label.info.marker',
|
|
126
|
-
"Info: {0} at line {1} and character {2}.{3} generated by {4}",
|
|
127
|
-
marker.marker.message,
|
|
128
|
-
marker.marker.startLineNumber,
|
|
129
|
-
marker.marker.startColumn,
|
|
130
|
-
relatedInformationMessage,
|
|
131
|
-
marker.marker.source
|
|
132
|
-
))
|
|
133
|
-
: ( nls.localize(
|
|
134
|
-
'problems.tree.aria.label.info.marker.nosource',
|
|
135
|
-
"Info: {0} at line {1} and character {2}.{3}",
|
|
136
|
-
marker.marker.message,
|
|
137
|
-
marker.marker.startLineNumber,
|
|
138
|
-
marker.marker.startColumn,
|
|
139
|
-
relatedInformationMessage
|
|
140
|
-
));
|
|
53
|
+
return marker.marker.source ? nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'problems.tree.aria.label.info.marker', "Info: {0} at line {1} and character {2}.{3} generated by {4}", marker.marker.message, marker.marker.startLineNumber, marker.marker.startColumn, relatedInformationMessage, marker.marker.source)
|
|
54
|
+
: nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'problems.tree.aria.label.info.marker.nosource', "Info: {0} at line {1} and character {2}.{3}", marker.marker.message, marker.marker.startLineNumber, marker.marker.startColumn, relatedInformationMessage);
|
|
141
55
|
default:
|
|
142
|
-
return marker.marker.source ? (
|
|
143
|
-
'problems.tree.aria.label.marker',
|
|
144
|
-
"Problem: {0} at line {1} and character {2}.{3} generated by {4}",
|
|
145
|
-
marker.marker.source,
|
|
146
|
-
marker.marker.message,
|
|
147
|
-
marker.marker.startLineNumber,
|
|
148
|
-
marker.marker.startColumn,
|
|
149
|
-
relatedInformationMessage,
|
|
150
|
-
marker.marker.source
|
|
151
|
-
))
|
|
152
|
-
: ( nls.localize(
|
|
153
|
-
'problems.tree.aria.label.marker.nosource',
|
|
154
|
-
"Problem: {0} at line {1} and character {2}.{3}",
|
|
155
|
-
marker.marker.message,
|
|
156
|
-
marker.marker.startLineNumber,
|
|
157
|
-
marker.marker.startColumn,
|
|
158
|
-
relatedInformationMessage
|
|
159
|
-
));
|
|
56
|
+
return marker.marker.source ? nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'problems.tree.aria.label.marker', "Problem: {0} at line {1} and character {2}.{3} generated by {4}", marker.marker.source, marker.marker.message, marker.marker.startLineNumber, marker.marker.startColumn, relatedInformationMessage, marker.marker.source)
|
|
57
|
+
: nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'problems.tree.aria.label.marker.nosource', "Problem: {0} at line {1} and character {2}.{3}", marker.marker.message, marker.marker.startLineNumber, marker.marker.startColumn, relatedInformationMessage);
|
|
160
58
|
}
|
|
161
59
|
}; }
|
|
162
|
-
static { this.MARKERS_TREE_ARIA_LABEL_RELATED_INFORMATION = (relatedInformation) => (
|
|
163
|
-
|
|
164
|
-
"{0} at line {1} and character {2} in {3}",
|
|
165
|
-
relatedInformation.message,
|
|
166
|
-
relatedInformation.startLineNumber,
|
|
167
|
-
relatedInformation.startColumn,
|
|
168
|
-
basename(relatedInformation.resource)
|
|
169
|
-
)); }
|
|
170
|
-
static { this.SHOW_ERRORS_WARNINGS_ACTION_LABEL = ( nls.localize('errors.warnings.show.label', "Show Errors and Warnings")); }
|
|
60
|
+
static { this.MARKERS_TREE_ARIA_LABEL_RELATED_INFORMATION = (relatedInformation) => nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'problems.tree.aria.label.relatedinfo.message', "{0} at line {1} and character {2} in {3}", relatedInformation.message, relatedInformation.startLineNumber, relatedInformation.startColumn, basename(relatedInformation.resource)); }
|
|
61
|
+
static { this.SHOW_ERRORS_WARNINGS_ACTION_LABEL = nls.localizeWithPath('vs/workbench/contrib/markers/browser/messages', 'errors.warnings.show.label', "Show Errors and Warnings"); }
|
|
171
62
|
}
|
|
172
63
|
|
|
173
64
|
export { Messages as default };
|