@codingame/monaco-vscode-markers-service-override 9.0.3 → 10.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 +2 -2
- package/vscode/src/vs/workbench/contrib/markers/browser/markers.contribution.js +67 -70
- package/vscode/src/vs/workbench/contrib/markers/browser/markersFileDecorations.js +4 -5
- package/vscode/src/vs/workbench/contrib/markers/browser/markersTable.js +6 -6
- package/vscode/src/vs/workbench/contrib/markers/browser/markersTreeViewer.js +22 -36
- package/vscode/src/vs/workbench/contrib/markers/browser/markersView.js +12 -15
- package/vscode/src/vs/workbench/contrib/markers/browser/messages.js +47 -47
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-markers-service-override",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "10.0.0",
|
|
4
4
|
"keywords": [],
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "CodinGame",
|
|
@@ -26,6 +26,6 @@
|
|
|
26
26
|
}
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"vscode": "npm:@codingame/monaco-vscode-api@
|
|
29
|
+
"vscode": "npm:@codingame/monaco-vscode-api@10.0.0"
|
|
30
30
|
}
|
|
31
31
|
}
|
|
@@ -3,23 +3,20 @@ import './markersFileDecorations.js';
|
|
|
3
3
|
import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
|
|
4
4
|
import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
|
|
5
5
|
import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
|
|
6
|
-
import { KeybindingsRegistry
|
|
7
|
-
import { KeyCode, KeyMod } from 'vscode/vscode/vs/base/common/keyCodes';
|
|
6
|
+
import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
|
|
8
7
|
import { localize, localize2 } from 'vscode/vscode/vs/nls';
|
|
9
8
|
import { Marker, ResourceMarkers, RelatedInformation } from './markersModel.js';
|
|
10
9
|
import { MarkersView } from './markersView.js';
|
|
11
10
|
import { registerAction2, MenuId, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
|
|
12
11
|
import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
|
|
13
|
-
import { Markers, MarkersContextKeys
|
|
12
|
+
import { Markers, MarkersContextKeys } from 'vscode/vscode/vs/workbench/contrib/markers/common/markers';
|
|
14
13
|
import Messages from './messages.js';
|
|
15
14
|
import { Extensions as Extensions$2 } from 'vscode/vscode/vs/workbench/common/contributions';
|
|
16
|
-
import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
|
|
17
15
|
import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService.service';
|
|
18
16
|
import { Disposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
19
|
-
import { StatusbarAlignment } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
|
|
20
17
|
import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
|
|
21
18
|
import { IMarkerService } from 'vscode/vscode/vs/platform/markers/common/markers.service';
|
|
22
|
-
import { Extensions as Extensions$1
|
|
19
|
+
import { Extensions as Extensions$1 } from 'vscode/vscode/vs/workbench/common/views';
|
|
23
20
|
import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
|
|
24
21
|
import { FocusedViewContext, getVisbileViewContextKey } from 'vscode/vscode/vs/workbench/common/contextkeys';
|
|
25
22
|
import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
|
|
@@ -35,12 +32,12 @@ import { problemsConfigurationNodeBase } from 'vscode/vscode/vs/workbench/common
|
|
|
35
32
|
|
|
36
33
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
37
34
|
id: Markers.MARKER_OPEN_ACTION_ID,
|
|
38
|
-
weight:
|
|
35
|
+
weight: 200 ,
|
|
39
36
|
when: ( (ContextKeyExpr.and(MarkersContextKeys.MarkerFocusContextKey))),
|
|
40
|
-
primary:
|
|
37
|
+
primary: 3 ,
|
|
41
38
|
mac: {
|
|
42
|
-
primary:
|
|
43
|
-
secondary: [
|
|
39
|
+
primary: 3 ,
|
|
40
|
+
secondary: [2048 | 18 ]
|
|
44
41
|
},
|
|
45
42
|
handler: (accessor, args) => {
|
|
46
43
|
const markersView = accessor.get(IViewsService).getActiveViewWithId(Markers.MARKERS_VIEW_ID);
|
|
@@ -49,11 +46,11 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
49
46
|
});
|
|
50
47
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
51
48
|
id: Markers.MARKER_OPEN_SIDE_ACTION_ID,
|
|
52
|
-
weight:
|
|
49
|
+
weight: 200 ,
|
|
53
50
|
when: ( (ContextKeyExpr.and(MarkersContextKeys.MarkerFocusContextKey))),
|
|
54
|
-
primary:
|
|
51
|
+
primary: 2048 | 3 ,
|
|
55
52
|
mac: {
|
|
56
|
-
primary:
|
|
53
|
+
primary: 256 | 3
|
|
57
54
|
},
|
|
58
55
|
handler: (accessor, args) => {
|
|
59
56
|
const markersView = accessor.get(IViewsService).getActiveViewWithId(Markers.MARKERS_VIEW_ID);
|
|
@@ -62,7 +59,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
62
59
|
});
|
|
63
60
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
64
61
|
id: Markers.MARKER_SHOW_PANEL_ID,
|
|
65
|
-
weight:
|
|
62
|
+
weight: 200 ,
|
|
66
63
|
when: undefined,
|
|
67
64
|
primary: undefined,
|
|
68
65
|
handler: async (accessor, args) => {
|
|
@@ -71,9 +68,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
71
68
|
});
|
|
72
69
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
73
70
|
id: Markers.MARKER_SHOW_QUICK_FIX,
|
|
74
|
-
weight:
|
|
71
|
+
weight: 200 ,
|
|
75
72
|
when: MarkersContextKeys.MarkerFocusContextKey,
|
|
76
|
-
primary:
|
|
73
|
+
primary: 2048 | 89 ,
|
|
77
74
|
handler: (accessor, args) => {
|
|
78
75
|
const markersView = accessor.get(IViewsService).getActiveViewWithId(Markers.MARKERS_VIEW_ID);
|
|
79
76
|
const focusedElement = markersView.getFocusElement();
|
|
@@ -113,7 +110,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
113
110
|
},
|
|
114
111
|
}
|
|
115
112
|
});
|
|
116
|
-
const markersViewIcon = registerIcon('markers-view-icon', Codicon.warning, ( localize(
|
|
113
|
+
const markersViewIcon = registerIcon('markers-view-icon', Codicon.warning, ( localize(2342, 'View icon of the markers view.')));
|
|
117
114
|
const VIEW_CONTAINER = ( (Registry.as(Extensions$1.ViewContainersRegistry))).registerViewContainer({
|
|
118
115
|
id: Markers.MARKERS_CONTAINER_ID,
|
|
119
116
|
title: Messages.MARKERS_PANEL_TITLE_PROBLEMS,
|
|
@@ -125,7 +122,7 @@ const VIEW_CONTAINER = ( (Registry.as(Extensions$1.ViewContainersRegistry))).reg
|
|
|
125
122
|
[Markers.MARKERS_CONTAINER_ID, { mergeViewWithContainerWhenSingleView: true }]
|
|
126
123
|
))),
|
|
127
124
|
storageId: Markers.MARKERS_VIEW_STORAGE_ID,
|
|
128
|
-
},
|
|
125
|
+
}, 1 , { doNotRegisterOpenCommand: true });
|
|
129
126
|
( (Registry.as(Extensions$1.ViewsRegistry))).registerViews([{
|
|
130
127
|
id: Markers.MARKERS_VIEW_ID,
|
|
131
128
|
containerIcon: markersViewIcon,
|
|
@@ -135,8 +132,8 @@ const VIEW_CONTAINER = ( (Registry.as(Extensions$1.ViewContainersRegistry))).reg
|
|
|
135
132
|
ctorDescriptor: ( (new SyncDescriptor(MarkersView))),
|
|
136
133
|
openCommandActionDescriptor: {
|
|
137
134
|
id: 'workbench.actions.view.problems',
|
|
138
|
-
mnemonicTitle: ( localize(
|
|
139
|
-
keybindings: { primary:
|
|
135
|
+
mnemonicTitle: ( localize(2343, "&&Problems")),
|
|
136
|
+
keybindings: { primary: 2048 | 1024 | 43 },
|
|
140
137
|
order: 0,
|
|
141
138
|
}
|
|
142
139
|
}], VIEW_CONTAINER);
|
|
@@ -145,12 +142,12 @@ registerAction2(class extends ViewAction {
|
|
|
145
142
|
constructor() {
|
|
146
143
|
super({
|
|
147
144
|
id: `workbench.actions.table.${Markers.MARKERS_VIEW_ID}.viewAsTree`,
|
|
148
|
-
title: ( localize(
|
|
145
|
+
title: ( localize(2344, "View as Tree")),
|
|
149
146
|
menu: {
|
|
150
147
|
id: MenuId.ViewTitle,
|
|
151
148
|
when: ( (ContextKeyExpr.and(
|
|
152
149
|
(ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID)),
|
|
153
|
-
(MarkersContextKeys.MarkersViewModeContextKey.isEqualTo(
|
|
150
|
+
(MarkersContextKeys.MarkersViewModeContextKey.isEqualTo("table" ))
|
|
154
151
|
))),
|
|
155
152
|
group: 'navigation',
|
|
156
153
|
order: 3
|
|
@@ -160,19 +157,19 @@ registerAction2(class extends ViewAction {
|
|
|
160
157
|
});
|
|
161
158
|
}
|
|
162
159
|
async runInView(serviceAccessor, view) {
|
|
163
|
-
view.setViewMode(
|
|
160
|
+
view.setViewMode("tree" );
|
|
164
161
|
}
|
|
165
162
|
});
|
|
166
163
|
registerAction2(class extends ViewAction {
|
|
167
164
|
constructor() {
|
|
168
165
|
super({
|
|
169
166
|
id: `workbench.actions.table.${Markers.MARKERS_VIEW_ID}.viewAsTable`,
|
|
170
|
-
title: ( localize(
|
|
167
|
+
title: ( localize(2345, "View as Table")),
|
|
171
168
|
menu: {
|
|
172
169
|
id: MenuId.ViewTitle,
|
|
173
170
|
when: ( (ContextKeyExpr.and(
|
|
174
171
|
(ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID)),
|
|
175
|
-
(MarkersContextKeys.MarkersViewModeContextKey.isEqualTo(
|
|
172
|
+
(MarkersContextKeys.MarkersViewModeContextKey.isEqualTo("tree" ))
|
|
176
173
|
))),
|
|
177
174
|
group: 'navigation',
|
|
178
175
|
order: 3
|
|
@@ -182,15 +179,15 @@ registerAction2(class extends ViewAction {
|
|
|
182
179
|
});
|
|
183
180
|
}
|
|
184
181
|
async runInView(serviceAccessor, view) {
|
|
185
|
-
view.setViewMode(
|
|
182
|
+
view.setViewMode("table" );
|
|
186
183
|
}
|
|
187
184
|
});
|
|
188
185
|
registerAction2(class extends ViewAction {
|
|
189
186
|
constructor() {
|
|
190
187
|
super({
|
|
191
188
|
id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleErrors`,
|
|
192
|
-
title: ( localize(
|
|
193
|
-
category: ( localize(
|
|
189
|
+
title: ( localize(2346, "Show Errors")),
|
|
190
|
+
category: ( localize(2347, "Problems")),
|
|
194
191
|
toggled: MarkersContextKeys.ShowErrorsFilterContextKey,
|
|
195
192
|
menu: {
|
|
196
193
|
id: viewFilterSubmenu,
|
|
@@ -209,8 +206,8 @@ registerAction2(class extends ViewAction {
|
|
|
209
206
|
constructor() {
|
|
210
207
|
super({
|
|
211
208
|
id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleWarnings`,
|
|
212
|
-
title: ( localize(
|
|
213
|
-
category: ( localize(
|
|
209
|
+
title: ( localize(2348, "Show Warnings")),
|
|
210
|
+
category: ( localize(2347, "Problems")),
|
|
214
211
|
toggled: MarkersContextKeys.ShowWarningsFilterContextKey,
|
|
215
212
|
menu: {
|
|
216
213
|
id: viewFilterSubmenu,
|
|
@@ -229,8 +226,8 @@ registerAction2(class extends ViewAction {
|
|
|
229
226
|
constructor() {
|
|
230
227
|
super({
|
|
231
228
|
id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleInfos`,
|
|
232
|
-
title: ( localize(
|
|
233
|
-
category: ( localize(
|
|
229
|
+
title: ( localize(2349, "Show Infos")),
|
|
230
|
+
category: ( localize(2347, "Problems")),
|
|
234
231
|
toggled: MarkersContextKeys.ShowInfoFilterContextKey,
|
|
235
232
|
menu: {
|
|
236
233
|
id: viewFilterSubmenu,
|
|
@@ -249,8 +246,8 @@ registerAction2(class extends ViewAction {
|
|
|
249
246
|
constructor() {
|
|
250
247
|
super({
|
|
251
248
|
id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleActiveFile`,
|
|
252
|
-
title: ( localize(
|
|
253
|
-
category: ( localize(
|
|
249
|
+
title: ( localize(2350, "Show Active File Only")),
|
|
250
|
+
category: ( localize(2347, "Problems")),
|
|
254
251
|
toggled: MarkersContextKeys.ShowActiveFileFilterContextKey,
|
|
255
252
|
menu: {
|
|
256
253
|
id: viewFilterSubmenu,
|
|
@@ -269,8 +266,8 @@ registerAction2(class extends ViewAction {
|
|
|
269
266
|
constructor() {
|
|
270
267
|
super({
|
|
271
268
|
id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleExcludedFiles`,
|
|
272
|
-
title: ( localize(
|
|
273
|
-
category: ( localize(
|
|
269
|
+
title: ( localize(2351, "Show Excluded Files")),
|
|
270
|
+
category: ( localize(2347, "Problems")),
|
|
274
271
|
toggled: ( (MarkersContextKeys.ShowExcludedFilesFilterContextKey.negate())),
|
|
275
272
|
menu: {
|
|
276
273
|
id: viewFilterSubmenu,
|
|
@@ -307,15 +304,15 @@ registerAction2(class extends ViewAction {
|
|
|
307
304
|
)));
|
|
308
305
|
super({
|
|
309
306
|
id: Markers.MARKER_COPY_ACTION_ID,
|
|
310
|
-
title: ( localize2(
|
|
307
|
+
title: ( localize2(2352, 'Copy')),
|
|
311
308
|
menu: {
|
|
312
309
|
id: MenuId.ProblemsPanelContext,
|
|
313
310
|
when,
|
|
314
311
|
group: 'navigation'
|
|
315
312
|
},
|
|
316
313
|
keybinding: {
|
|
317
|
-
weight:
|
|
318
|
-
primary:
|
|
314
|
+
weight: 200 ,
|
|
315
|
+
primary: 2048 | 33 ,
|
|
319
316
|
when
|
|
320
317
|
},
|
|
321
318
|
viewId: Markers.MARKERS_VIEW_ID
|
|
@@ -347,7 +344,7 @@ registerAction2(class extends ViewAction {
|
|
|
347
344
|
constructor() {
|
|
348
345
|
super({
|
|
349
346
|
id: Markers.MARKER_COPY_MESSAGE_ACTION_ID,
|
|
350
|
-
title: ( localize2(
|
|
347
|
+
title: ( localize2(2353, 'Copy Message')),
|
|
351
348
|
menu: {
|
|
352
349
|
id: MenuId.ProblemsPanelContext,
|
|
353
350
|
when: MarkersContextKeys.MarkerFocusContextKey,
|
|
@@ -368,7 +365,7 @@ registerAction2(class extends ViewAction {
|
|
|
368
365
|
constructor() {
|
|
369
366
|
super({
|
|
370
367
|
id: Markers.RELATED_INFORMATION_COPY_MESSAGE_ACTION_ID,
|
|
371
|
-
title: ( localize2(
|
|
368
|
+
title: ( localize2(2353, 'Copy Message')),
|
|
372
369
|
menu: {
|
|
373
370
|
id: MenuId.ProblemsPanelContext,
|
|
374
371
|
when: MarkersContextKeys.RelatedInformationFocusContextKey,
|
|
@@ -389,11 +386,11 @@ registerAction2(class extends ViewAction {
|
|
|
389
386
|
constructor() {
|
|
390
387
|
super({
|
|
391
388
|
id: Markers.FOCUS_PROBLEMS_FROM_FILTER,
|
|
392
|
-
title: ( localize(
|
|
389
|
+
title: ( localize(2354, "Focus problems view")),
|
|
393
390
|
keybinding: {
|
|
394
391
|
when: MarkersContextKeys.MarkerViewFilterFocusContextKey,
|
|
395
|
-
weight:
|
|
396
|
-
primary:
|
|
392
|
+
weight: 200 ,
|
|
393
|
+
primary: 2048 | 18
|
|
397
394
|
},
|
|
398
395
|
viewId: Markers.MARKERS_VIEW_ID
|
|
399
396
|
});
|
|
@@ -406,11 +403,11 @@ registerAction2(class extends ViewAction {
|
|
|
406
403
|
constructor() {
|
|
407
404
|
super({
|
|
408
405
|
id: Markers.MARKERS_VIEW_FOCUS_FILTER,
|
|
409
|
-
title: ( localize(
|
|
406
|
+
title: ( localize(2355, "Focus problems filter")),
|
|
410
407
|
keybinding: {
|
|
411
408
|
when: ( (FocusedViewContext.isEqualTo(Markers.MARKERS_VIEW_ID))),
|
|
412
|
-
weight:
|
|
413
|
-
primary:
|
|
409
|
+
weight: 200 ,
|
|
410
|
+
primary: 2048 | 36
|
|
414
411
|
},
|
|
415
412
|
viewId: Markers.MARKERS_VIEW_ID
|
|
416
413
|
});
|
|
@@ -423,8 +420,8 @@ registerAction2(class extends ViewAction {
|
|
|
423
420
|
constructor() {
|
|
424
421
|
super({
|
|
425
422
|
id: Markers.MARKERS_VIEW_SHOW_MULTILINE_MESSAGE,
|
|
426
|
-
title: ( localize2(
|
|
427
|
-
category: ( localize(
|
|
423
|
+
title: ( localize2(2356, "Show message in multiple lines")),
|
|
424
|
+
category: ( localize(2347, "Problems")),
|
|
428
425
|
menu: {
|
|
429
426
|
id: MenuId.CommandPalette,
|
|
430
427
|
when: ( (ContextKeyExpr.has(getVisbileViewContextKey(Markers.MARKERS_VIEW_ID))))
|
|
@@ -440,8 +437,8 @@ registerAction2(class extends ViewAction {
|
|
|
440
437
|
constructor() {
|
|
441
438
|
super({
|
|
442
439
|
id: Markers.MARKERS_VIEW_SHOW_SINGLELINE_MESSAGE,
|
|
443
|
-
title: ( localize2(
|
|
444
|
-
category: ( localize(
|
|
440
|
+
title: ( localize2(2357, "Show message in single line")),
|
|
441
|
+
category: ( localize(2347, "Problems")),
|
|
445
442
|
menu: {
|
|
446
443
|
id: MenuId.CommandPalette,
|
|
447
444
|
when: ( (ContextKeyExpr.has(getVisbileViewContextKey(Markers.MARKERS_VIEW_ID))))
|
|
@@ -457,12 +454,12 @@ registerAction2(class extends ViewAction {
|
|
|
457
454
|
constructor() {
|
|
458
455
|
super({
|
|
459
456
|
id: Markers.MARKERS_VIEW_CLEAR_FILTER_TEXT,
|
|
460
|
-
title: ( localize(
|
|
461
|
-
category: ( localize(
|
|
457
|
+
title: ( localize(2358, "Clear filters text")),
|
|
458
|
+
category: ( localize(2347, "Problems")),
|
|
462
459
|
keybinding: {
|
|
463
460
|
when: MarkersContextKeys.MarkerViewFilterFocusContextKey,
|
|
464
|
-
weight:
|
|
465
|
-
primary:
|
|
461
|
+
weight: 200 ,
|
|
462
|
+
primary: 9
|
|
466
463
|
},
|
|
467
464
|
viewId: Markers.MARKERS_VIEW_ID
|
|
468
465
|
});
|
|
@@ -475,12 +472,12 @@ registerAction2(class extends ViewAction {
|
|
|
475
472
|
constructor() {
|
|
476
473
|
super({
|
|
477
474
|
id: `workbench.actions.treeView.${Markers.MARKERS_VIEW_ID}.collapseAll`,
|
|
478
|
-
title: ( localize(
|
|
475
|
+
title: ( localize(2359, "Collapse All")),
|
|
479
476
|
menu: {
|
|
480
477
|
id: MenuId.ViewTitle,
|
|
481
478
|
when: ( (ContextKeyExpr.and(
|
|
482
479
|
(ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID)),
|
|
483
|
-
(MarkersContextKeys.MarkersViewModeContextKey.isEqualTo(
|
|
480
|
+
(MarkersContextKeys.MarkersViewModeContextKey.isEqualTo("tree" ))
|
|
484
481
|
))),
|
|
485
482
|
group: 'navigation',
|
|
486
483
|
order: 2,
|
|
@@ -516,9 +513,9 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
|
|
|
516
513
|
this.markerService = markerService;
|
|
517
514
|
this.statusbarService = statusbarService;
|
|
518
515
|
this.configurationService = configurationService;
|
|
519
|
-
this.markersStatusItem = this._register(this.statusbarService.addEntry(this.getMarkersItem(), 'status.problems',
|
|
516
|
+
this.markersStatusItem = this._register(this.statusbarService.addEntry(this.getMarkersItem(), 'status.problems', 0 , 50 ));
|
|
520
517
|
const addStatusBarEntry = () => {
|
|
521
|
-
this.markersStatusItemOff = this.statusbarService.addEntry(this.getMarkersItemTurnedOff(), 'status.problemsVisibility',
|
|
518
|
+
this.markersStatusItemOff = this.statusbarService.addEntry(this.getMarkersItemTurnedOff(), 'status.problemsVisibility', 0 , 49);
|
|
522
519
|
};
|
|
523
520
|
let config = this.configurationService.getValue('problems.visibility');
|
|
524
521
|
if (!config) {
|
|
@@ -545,7 +542,7 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
|
|
|
545
542
|
const markersStatistics = this.markerService.getStatistics();
|
|
546
543
|
const tooltip = this.getMarkersTooltip(markersStatistics);
|
|
547
544
|
return {
|
|
548
|
-
name: ( localize(
|
|
545
|
+
name: ( localize(2360, "Problems")),
|
|
549
546
|
text: this.getMarkersText(markersStatistics),
|
|
550
547
|
ariaLabel: tooltip,
|
|
551
548
|
tooltip,
|
|
@@ -556,9 +553,9 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
|
|
|
556
553
|
this.statusbarService.updateEntryVisibility('status.problemsVisibility', true);
|
|
557
554
|
const openSettingsCommand = 'workbench.action.openSettings';
|
|
558
555
|
const configureSettingsLabel = '@id:problems.visibility';
|
|
559
|
-
const tooltip = ( localize(
|
|
556
|
+
const tooltip = ( localize(2361, "Problems are turned off. Click to open settings."));
|
|
560
557
|
return {
|
|
561
|
-
name: ( localize(
|
|
558
|
+
name: ( localize(2362, "Problems Visibility")),
|
|
562
559
|
text: '$(whole-word)',
|
|
563
560
|
ariaLabel: tooltip,
|
|
564
561
|
tooltip,
|
|
@@ -567,9 +564,9 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
|
|
|
567
564
|
};
|
|
568
565
|
}
|
|
569
566
|
getMarkersTooltip(stats) {
|
|
570
|
-
const errorTitle = (n) => ( localize(
|
|
571
|
-
const warningTitle = (n) => ( localize(
|
|
572
|
-
const infoTitle = (n) => ( localize(
|
|
567
|
+
const errorTitle = (n) => ( localize(2363, "Errors: {0}", n));
|
|
568
|
+
const warningTitle = (n) => ( localize(2364, "Warnings: {0}", n));
|
|
569
|
+
const infoTitle = (n) => ( localize(2365, "Infos: {0}", n));
|
|
573
570
|
const titles = [];
|
|
574
571
|
if (stats.errors > 0) {
|
|
575
572
|
titles.push(errorTitle(stats.errors));
|
|
@@ -581,7 +578,7 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
|
|
|
581
578
|
titles.push(infoTitle(stats.infos));
|
|
582
579
|
}
|
|
583
580
|
if (titles.length === 0) {
|
|
584
|
-
return ( localize(
|
|
581
|
+
return ( localize(2366, "No Problems"));
|
|
585
582
|
}
|
|
586
583
|
return titles.join(', ');
|
|
587
584
|
}
|
|
@@ -595,7 +592,7 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
|
|
|
595
592
|
return problemsText.join(' ');
|
|
596
593
|
}
|
|
597
594
|
packNumber(n) {
|
|
598
|
-
const manyProblems = ( localize(
|
|
595
|
+
const manyProblems = ( localize(2367, "10K+"));
|
|
599
596
|
return n > 9999 ? manyProblems : n > 999 ? ( (n.toString())).charAt(0) + 'K' : ( (n.toString()));
|
|
600
597
|
}
|
|
601
598
|
};
|
|
@@ -604,7 +601,7 @@ MarkersStatusBarContributions = ( (__decorate([
|
|
|
604
601
|
( (__param(1, IStatusbarService))),
|
|
605
602
|
( (__param(2, IConfigurationService)))
|
|
606
603
|
], MarkersStatusBarContributions)));
|
|
607
|
-
workbenchRegistry.registerWorkbenchContribution(MarkersStatusBarContributions,
|
|
604
|
+
workbenchRegistry.registerWorkbenchContribution(MarkersStatusBarContributions, 3 );
|
|
608
605
|
let ActivityUpdater = class ActivityUpdater extends Disposable {
|
|
609
606
|
constructor(activityService, markerService) {
|
|
610
607
|
super();
|
|
@@ -618,7 +615,7 @@ let ActivityUpdater = class ActivityUpdater extends Disposable {
|
|
|
618
615
|
const { errors, warnings, infos } = this.markerService.getStatistics();
|
|
619
616
|
const total = errors + warnings + infos;
|
|
620
617
|
if (total > 0) {
|
|
621
|
-
const message = ( localize(
|
|
618
|
+
const message = ( localize(2368, 'Total {0} Problems', total));
|
|
622
619
|
this.activity.value = this.activityService.showViewActivity(Markers.MARKERS_VIEW_ID, { badge: ( (new NumberBadge(total, () => message))) });
|
|
623
620
|
}
|
|
624
621
|
else {
|
|
@@ -630,4 +627,4 @@ ActivityUpdater = ( (__decorate([
|
|
|
630
627
|
( (__param(0, IActivityService))),
|
|
631
628
|
( (__param(1, IMarkerService)))
|
|
632
629
|
], ActivityUpdater)));
|
|
633
|
-
workbenchRegistry.registerWorkbenchContribution(ActivityUpdater,
|
|
630
|
+
workbenchRegistry.registerWorkbenchContribution(ActivityUpdater, 3 );
|
|
@@ -19,12 +19,11 @@ import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
|
|
|
19
19
|
import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
|
|
20
20
|
import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
|
|
21
21
|
import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
|
|
22
|
-
import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
|
|
23
22
|
|
|
24
23
|
class MarkersDecorationsProvider {
|
|
25
24
|
constructor(_markerService) {
|
|
26
25
|
this._markerService = _markerService;
|
|
27
|
-
this.label = ( localize(
|
|
26
|
+
this.label = ( localize(5595, "Problems"));
|
|
28
27
|
this.onDidChange = _markerService.onMarkerChanged;
|
|
29
28
|
}
|
|
30
29
|
provideDecorations(resource) {
|
|
@@ -44,7 +43,7 @@ class MarkersDecorationsProvider {
|
|
|
44
43
|
return {
|
|
45
44
|
weight: 100 * first.severity,
|
|
46
45
|
bubble: true,
|
|
47
|
-
tooltip: markers.length === 1 ? ( localize(
|
|
46
|
+
tooltip: markers.length === 1 ? ( localize(5596, "1 problem in this file")) : ( localize(5597, "{0} problems in this file", markers.length)),
|
|
48
47
|
letter: markers.length < 10 ? ( (markers.length.toString())) : '9+',
|
|
49
48
|
color: first.severity === MarkerSeverity.Error ? listErrorForeground : listWarningForeground,
|
|
50
49
|
};
|
|
@@ -104,7 +103,7 @@ MarkersFileDecorations = ( (__decorate([
|
|
|
104
103
|
'properties': {
|
|
105
104
|
'problems.decorations.enabled': {
|
|
106
105
|
'markdownDescription': ( localize(
|
|
107
|
-
|
|
106
|
+
5598,
|
|
108
107
|
"Show Errors & Warnings on files and folder. Overwritten by {0} when it is off.",
|
|
109
108
|
'`#problems.visibility#`'
|
|
110
109
|
)),
|
|
@@ -114,4 +113,4 @@ MarkersFileDecorations = ( (__decorate([
|
|
|
114
113
|
}
|
|
115
114
|
});
|
|
116
115
|
( (Registry.as(Extensions$1.Workbench)))
|
|
117
|
-
.registerWorkbenchContribution(MarkersFileDecorations,
|
|
116
|
+
.registerWorkbenchContribution(MarkersFileDecorations, 3 );
|
|
@@ -112,8 +112,8 @@ let MarkerCodeColumnRenderer = class MarkerCodeColumnRenderer {
|
|
|
112
112
|
const codeLinkLabel = templateData.templateDisposable.add(( (new HighlightedLabel($('.code-link-label')))));
|
|
113
113
|
codeLinkLabel.set(element.marker.code.value, element.codeMatches);
|
|
114
114
|
templateData.codeLink.link = {
|
|
115
|
-
href: ( (element.marker.code.target.toString())),
|
|
116
|
-
title: ( (element.marker.code.target.toString())),
|
|
115
|
+
href: ( (element.marker.code.target.toString(true))),
|
|
116
|
+
title: ( (element.marker.code.target.toString(true))),
|
|
117
117
|
label: codeLinkLabel.element,
|
|
118
118
|
};
|
|
119
119
|
}
|
|
@@ -227,7 +227,7 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
227
227
|
project(row) { return row; }
|
|
228
228
|
},
|
|
229
229
|
{
|
|
230
|
-
label: ( localize(
|
|
230
|
+
label: ( localize(10230, "Code")),
|
|
231
231
|
tooltip: '',
|
|
232
232
|
weight: 1,
|
|
233
233
|
minimumWidth: 100,
|
|
@@ -236,21 +236,21 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
236
236
|
project(row) { return row; }
|
|
237
237
|
},
|
|
238
238
|
{
|
|
239
|
-
label: ( localize(
|
|
239
|
+
label: ( localize(10231, "Message")),
|
|
240
240
|
tooltip: '',
|
|
241
241
|
weight: 4,
|
|
242
242
|
templateId: MarkerMessageColumnRenderer.TEMPLATE_ID,
|
|
243
243
|
project(row) { return row; }
|
|
244
244
|
},
|
|
245
245
|
{
|
|
246
|
-
label: ( localize(
|
|
246
|
+
label: ( localize(10232, "File")),
|
|
247
247
|
tooltip: '',
|
|
248
248
|
weight: 2,
|
|
249
249
|
templateId: MarkerFileColumnRenderer.TEMPLATE_ID,
|
|
250
250
|
project(row) { return row; }
|
|
251
251
|
},
|
|
252
252
|
{
|
|
253
|
-
label: ( localize(
|
|
253
|
+
label: ( localize(10233, "Source")),
|
|
254
254
|
tooltip: '',
|
|
255
255
|
weight: 1,
|
|
256
256
|
minimumWidth: 100,
|
|
@@ -13,7 +13,6 @@ import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar'
|
|
|
13
13
|
import { QuickFixAction, QuickFixActionViewItem } from './markersViewActions.js';
|
|
14
14
|
import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
|
|
15
15
|
import { basename, isEqual } from 'vscode/vscode/vs/base/common/resources';
|
|
16
|
-
import { TreeVisibility } from 'vscode/vscode/vs/base/browser/ui/tree/tree';
|
|
17
16
|
import { FilterOptions } from './markersFilterOptions.js';
|
|
18
17
|
import { Emitter } from 'vscode/vscode/vs/base/common/event';
|
|
19
18
|
import { isUndefinedOrNull } from 'vscode/vscode/vs/base/common/types';
|
|
@@ -27,7 +26,6 @@ import { CodeActionTriggerSource, CodeActionKind } from 'vscode/vscode/vs/editor
|
|
|
27
26
|
import { ACTIVE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
|
|
28
27
|
import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
|
|
29
28
|
import { SeverityIcon } from 'vscode/vscode/vs/platform/severityIcon/browser/severityIcon';
|
|
30
|
-
import { CodeActionTriggerType } from 'vscode/vscode/vs/editor/common/languages';
|
|
31
29
|
import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
|
|
32
30
|
import { Progress } from 'vscode/vscode/vs/platform/progress/common/progress';
|
|
33
31
|
import { ActionViewItem } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionViewItems';
|
|
@@ -36,7 +34,7 @@ import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistr
|
|
|
36
34
|
import { Link } from 'vscode/vscode/vs/platform/opener/browser/link';
|
|
37
35
|
import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
|
|
38
36
|
import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
|
|
39
|
-
import {
|
|
37
|
+
import { MarkersContextKeys } from 'vscode/vscode/vs/workbench/contrib/markers/common/markers';
|
|
40
38
|
import { unsupportedSchemas } from 'vscode/vscode/vs/platform/markers/common/markerService';
|
|
41
39
|
import { defaultCountBadgeStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
|
|
42
40
|
import Severity$1 from 'vscode/vscode/vs/base/common/severity';
|
|
@@ -48,7 +46,7 @@ let MarkersWidgetAccessibilityProvider = class MarkersWidgetAccessibilityProvide
|
|
|
48
46
|
this.labelService = labelService;
|
|
49
47
|
}
|
|
50
48
|
getWidgetAriaLabel() {
|
|
51
|
-
return ( localize(
|
|
49
|
+
return ( localize(10225, "Problems View"));
|
|
52
50
|
}
|
|
53
51
|
getAriaLabel(element) {
|
|
54
52
|
if (element instanceof ResourceMarkers) {
|
|
@@ -67,12 +65,6 @@ let MarkersWidgetAccessibilityProvider = class MarkersWidgetAccessibilityProvide
|
|
|
67
65
|
MarkersWidgetAccessibilityProvider = ( (__decorate([
|
|
68
66
|
( (__param(0, ILabelService)))
|
|
69
67
|
], MarkersWidgetAccessibilityProvider)));
|
|
70
|
-
var TemplateId;
|
|
71
|
-
( ((function(TemplateId) {
|
|
72
|
-
TemplateId["ResourceMarkers"] = "rm";
|
|
73
|
-
TemplateId["Marker"] = "m";
|
|
74
|
-
TemplateId["RelatedInformation"] = "ri";
|
|
75
|
-
})(TemplateId || (TemplateId = {}))));
|
|
76
68
|
class VirtualDelegate {
|
|
77
69
|
static { this.LINE_HEIGHT = 22; }
|
|
78
70
|
constructor(markersViewState) {
|
|
@@ -88,28 +80,22 @@ class VirtualDelegate {
|
|
|
88
80
|
}
|
|
89
81
|
getTemplateId(element) {
|
|
90
82
|
if (element instanceof ResourceMarkers) {
|
|
91
|
-
return
|
|
83
|
+
return "rm" ;
|
|
92
84
|
}
|
|
93
85
|
else if (element instanceof Marker) {
|
|
94
|
-
return
|
|
86
|
+
return "m" ;
|
|
95
87
|
}
|
|
96
88
|
else {
|
|
97
|
-
return
|
|
89
|
+
return "ri" ;
|
|
98
90
|
}
|
|
99
91
|
}
|
|
100
92
|
}
|
|
101
|
-
var FilterDataType;
|
|
102
|
-
( ((function(FilterDataType) {
|
|
103
|
-
FilterDataType[FilterDataType["ResourceMarkers"] = 0] = "ResourceMarkers";
|
|
104
|
-
FilterDataType[FilterDataType["Marker"] = 1] = "Marker";
|
|
105
|
-
FilterDataType[FilterDataType["RelatedInformation"] = 2] = "RelatedInformation";
|
|
106
|
-
})(FilterDataType || (FilterDataType = {}))));
|
|
107
93
|
class ResourceMarkersRenderer {
|
|
108
94
|
constructor(labels, onDidChangeRenderNodeCount) {
|
|
109
95
|
this.labels = labels;
|
|
110
96
|
this.renderedNodes = ( (new Map()));
|
|
111
97
|
this.disposables = ( (new DisposableStore()));
|
|
112
|
-
this.templateId =
|
|
98
|
+
this.templateId = "rm" ;
|
|
113
99
|
onDidChangeRenderNodeCount(this.onDidChangeRenderNodeCount, this, this.disposables);
|
|
114
100
|
}
|
|
115
101
|
renderTemplate(container) {
|
|
@@ -163,7 +149,7 @@ let MarkerRenderer = class MarkerRenderer {
|
|
|
163
149
|
this.hoverService = hoverService;
|
|
164
150
|
this.instantiationService = instantiationService;
|
|
165
151
|
this.openerService = openerService;
|
|
166
|
-
this.templateId =
|
|
152
|
+
this.templateId = "m" ;
|
|
167
153
|
}
|
|
168
154
|
renderTemplate(container) {
|
|
169
155
|
const data = Object.create(null);
|
|
@@ -189,11 +175,11 @@ MarkerRenderer = ( (__decorate([
|
|
|
189
175
|
( (__param(3, IOpenerService)))
|
|
190
176
|
], MarkerRenderer)));
|
|
191
177
|
const expandedIcon = registerIcon('markers-view-multi-line-expanded', Codicon.chevronUp, ( localize(
|
|
192
|
-
|
|
178
|
+
10226,
|
|
193
179
|
'Icon indicating that multiple lines are shown in the markers view.'
|
|
194
180
|
)));
|
|
195
181
|
const collapsedIcon = registerIcon('markers-view-multi-line-collapsed', Codicon.chevronDown, ( localize(
|
|
196
|
-
|
|
182
|
+
10227,
|
|
197
183
|
'Icon indicating that multiple lines are collapsed in the markers view.'
|
|
198
184
|
)));
|
|
199
185
|
const toggleMultilineAction = 'problems.action.toggleMultiline';
|
|
@@ -272,7 +258,7 @@ class MarkerWidget extends Disposable {
|
|
|
272
258
|
const multiline = viewModel && viewModel.multiline;
|
|
273
259
|
const action = ( (new Action(toggleMultilineAction)));
|
|
274
260
|
action.enabled = !!viewModel && marker.lines.length > 1;
|
|
275
|
-
action.tooltip = multiline ? ( localize(
|
|
261
|
+
action.tooltip = multiline ? ( localize(10228, "Show message in single line")) : ( localize(10229, "Show message in multiple lines"));
|
|
276
262
|
action.class = ThemeIcon.asClassName(multiline ? expandedIcon : collapsedIcon);
|
|
277
263
|
action.run = () => { if (viewModel) {
|
|
278
264
|
viewModel.multiline = !viewModel.multiline;
|
|
@@ -334,7 +320,7 @@ class MarkerWidget extends Disposable {
|
|
|
334
320
|
let RelatedInformationRenderer = class RelatedInformationRenderer {
|
|
335
321
|
constructor(labelService) {
|
|
336
322
|
this.labelService = labelService;
|
|
337
|
-
this.templateId =
|
|
323
|
+
this.templateId = "ri" ;
|
|
338
324
|
}
|
|
339
325
|
renderTemplate(container) {
|
|
340
326
|
const data = Object.create(null);
|
|
@@ -393,10 +379,10 @@ class Filter {
|
|
|
393
379
|
if (this.options.textFilter.text && !this.options.textFilter.negate) {
|
|
394
380
|
const uriMatches = FilterOptions._filter(this.options.textFilter.text, basename(resourceMarkers.resource));
|
|
395
381
|
if (uriMatches) {
|
|
396
|
-
return { visibility: true, data: { type:
|
|
382
|
+
return { visibility: true, data: { type: 0 , uriMatches: uriMatches || [] } };
|
|
397
383
|
}
|
|
398
384
|
}
|
|
399
|
-
return
|
|
385
|
+
return 2 ;
|
|
400
386
|
}
|
|
401
387
|
filterMarker(marker, parentVisibility) {
|
|
402
388
|
const matchesSeverity = this.options.showErrors && MarkerSeverity.Error === marker.marker.severity ||
|
|
@@ -417,12 +403,12 @@ class Filter {
|
|
|
417
403
|
const codeMatches = marker.marker.code ? FilterOptions._filter(this.options.textFilter.text, typeof marker.marker.code === 'string' ? marker.marker.code : marker.marker.code.value) : undefined;
|
|
418
404
|
const matched = sourceMatches || codeMatches || ( (lineMatches.some(lineMatch => lineMatch.length > 0)));
|
|
419
405
|
if (matched && !this.options.textFilter.negate) {
|
|
420
|
-
return { visibility: true, data: { type:
|
|
406
|
+
return { visibility: true, data: { type: 1 , lineMatches, sourceMatches: sourceMatches || [], codeMatches: codeMatches || [] } };
|
|
421
407
|
}
|
|
422
|
-
if (matched && this.options.textFilter.negate && parentVisibility ===
|
|
408
|
+
if (matched && this.options.textFilter.negate && parentVisibility === 2 ) {
|
|
423
409
|
return false;
|
|
424
410
|
}
|
|
425
|
-
if (!matched && this.options.textFilter.negate && parentVisibility ===
|
|
411
|
+
if (!matched && this.options.textFilter.negate && parentVisibility === 2 ) {
|
|
426
412
|
return true;
|
|
427
413
|
}
|
|
428
414
|
return parentVisibility;
|
|
@@ -435,12 +421,12 @@ class Filter {
|
|
|
435
421
|
const messageMatches = FilterOptions._messageFilter(this.options.textFilter.text, basename$1(relatedInformation.raw.message));
|
|
436
422
|
const matched = uriMatches || messageMatches;
|
|
437
423
|
if (matched && !this.options.textFilter.negate) {
|
|
438
|
-
return { visibility: true, data: { type:
|
|
424
|
+
return { visibility: true, data: { type: 2 , uriMatches: uriMatches || [], messageMatches: messageMatches || [] } };
|
|
439
425
|
}
|
|
440
|
-
if (matched && this.options.textFilter.negate && parentVisibility ===
|
|
426
|
+
if (matched && this.options.textFilter.negate && parentVisibility === 2 ) {
|
|
441
427
|
return false;
|
|
442
428
|
}
|
|
443
|
-
if (!matched && this.options.textFilter.negate && parentVisibility ===
|
|
429
|
+
if (!matched && this.options.textFilter.negate && parentVisibility === 2 ) {
|
|
444
430
|
return true;
|
|
445
431
|
}
|
|
446
432
|
return parentVisibility;
|
|
@@ -507,7 +493,7 @@ let MarkerViewModel = class MarkerViewModel extends Disposable {
|
|
|
507
493
|
this.marker.range.endLineNumber,
|
|
508
494
|
this.marker.range.endColumn
|
|
509
495
|
))), {
|
|
510
|
-
type:
|
|
496
|
+
type: 1 , triggerAction: CodeActionTriggerSource.ProblemsView, filter: { include: CodeActionKind.QuickFix }
|
|
511
497
|
}, Progress.None, cancellationToken).then(actions => {
|
|
512
498
|
return this._register(actions);
|
|
513
499
|
});
|
|
@@ -575,7 +561,7 @@ MarkerViewModel = ( (__decorate([
|
|
|
575
561
|
( (__param(4, ILanguageFeaturesService)))
|
|
576
562
|
], MarkerViewModel)));
|
|
577
563
|
let MarkersViewModel = class MarkersViewModel extends Disposable {
|
|
578
|
-
constructor(multiline = true, viewMode =
|
|
564
|
+
constructor(multiline = true, viewMode = "tree" , contextKeyService, instantiationService) {
|
|
579
565
|
super();
|
|
580
566
|
this.contextKeyService = contextKeyService;
|
|
581
567
|
this.instantiationService = instantiationService;
|
|
@@ -589,7 +575,7 @@ let MarkersViewModel = class MarkersViewModel extends Disposable {
|
|
|
589
575
|
this.hoveredMarker = null;
|
|
590
576
|
this.hoverDelayer = ( (new Delayer(300)));
|
|
591
577
|
this._multiline = true;
|
|
592
|
-
this._viewMode =
|
|
578
|
+
this._viewMode = "tree" ;
|
|
593
579
|
this._multiline = multiline;
|
|
594
580
|
this._viewMode = viewMode;
|
|
595
581
|
this.viewModeContextKey = MarkersContextKeys.MarkersViewModeContextKey.bindTo(this.contextKeyService);
|
|
@@ -12,7 +12,6 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
|
|
|
12
12
|
import Messages from './messages.js';
|
|
13
13
|
import { RangeHighlightDecorations } from 'vscode/vscode/vs/workbench/browser/codeeditor';
|
|
14
14
|
import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
|
|
15
|
-
import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
|
|
16
15
|
import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
|
|
17
16
|
import { localize } from 'vscode/vscode/vs/nls';
|
|
18
17
|
import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
|
|
@@ -32,7 +31,6 @@ import { ResourceLabels } from 'vscode/vscode/vs/workbench/browser/labels';
|
|
|
32
31
|
import { MarkerSeverity } from 'vscode/vscode/vs/platform/markers/common/markers';
|
|
33
32
|
import { IMarkerService } from 'vscode/vscode/vs/platform/markers/common/markers.service';
|
|
34
33
|
import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
|
|
35
|
-
import { KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
|
|
36
34
|
import { FilterViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
|
|
37
35
|
import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
|
|
38
36
|
import { withSelection } from 'vscode/vscode/vs/platform/opener/common/opener';
|
|
@@ -45,10 +43,9 @@ import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
|
|
|
45
43
|
import { EditorResourceAccessor, SideBySideEditor } from 'vscode/vscode/vs/workbench/common/editor';
|
|
46
44
|
import { ResourceListDnDHandler } from 'vscode/vscode/vs/workbench/browser/dnd';
|
|
47
45
|
import { MarkersTable } from './markersTable.js';
|
|
48
|
-
import { Markers, MarkersContextKeys
|
|
46
|
+
import { Markers, MarkersContextKeys } from 'vscode/vscode/vs/workbench/contrib/markers/common/markers';
|
|
49
47
|
import { registerNavigableContainer } from 'vscode/vscode/vs/workbench/browser/actions/widgetNavigationCommands';
|
|
50
48
|
import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
|
|
51
|
-
import { ResultKind } from 'vscode/vscode/vs/platform/keybinding/common/keybindingResolver';
|
|
52
49
|
|
|
53
50
|
function createResourceMarkersIterator(resourceMarkers) {
|
|
54
51
|
return (
|
|
@@ -62,7 +59,7 @@ function createResourceMarkersIterator(resourceMarkers) {
|
|
|
62
59
|
let MarkersView = class MarkersView extends FilterViewPane {
|
|
63
60
|
constructor(options, instantiationService, viewDescriptorService, editorService, configurationService, telemetryService, markerService, contextKeyService, workspaceContextService, contextMenuService, uriIdentityService, keybindingService, storageService, openerService, themeService, hoverService) {
|
|
64
61
|
const memento = ( (new Memento(Markers.MARKERS_VIEW_STORAGE_ID, storageService)));
|
|
65
|
-
const panelState = memento.getMemento(
|
|
62
|
+
const panelState = memento.getMemento(1 , 1 );
|
|
66
63
|
super({
|
|
67
64
|
...options,
|
|
68
65
|
filterOptions: {
|
|
@@ -137,7 +134,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
|
|
|
137
134
|
return;
|
|
138
135
|
}
|
|
139
136
|
const result = this.keybindingService.softDispatch(event, event.target);
|
|
140
|
-
if (result.kind ===
|
|
137
|
+
if (result.kind === 1 || result.kind === 2 ) {
|
|
141
138
|
return;
|
|
142
139
|
}
|
|
143
140
|
this.focusFilter();
|
|
@@ -178,7 +175,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
|
|
|
178
175
|
this.filterWidget.focus();
|
|
179
176
|
}
|
|
180
177
|
updateBadge(total, filtered) {
|
|
181
|
-
this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : ( localize(
|
|
178
|
+
this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : ( localize(5599, "Showing {0} of {1}", filtered, total)));
|
|
182
179
|
}
|
|
183
180
|
checkMoreFilters() {
|
|
184
181
|
this.filterWidget.checkMoreFilters(!this.filters.showErrors || !this.filters.showWarnings || !this.filters.showInfos || this.filters.excludedFiles || this.filters.activeFile);
|
|
@@ -277,11 +274,11 @@ let MarkersView = class MarkersView extends FilterViewPane {
|
|
|
277
274
|
getDefaultViewMode() {
|
|
278
275
|
switch (this.configurationService.getValue('problems.defaultViewMode')) {
|
|
279
276
|
case 'table':
|
|
280
|
-
return
|
|
277
|
+
return "table" ;
|
|
281
278
|
case 'tree':
|
|
282
|
-
return
|
|
279
|
+
return "tree" ;
|
|
283
280
|
default:
|
|
284
|
-
return
|
|
281
|
+
return "tree" ;
|
|
285
282
|
}
|
|
286
283
|
}
|
|
287
284
|
getFilesExcludeExpressions() {
|
|
@@ -320,7 +317,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
|
|
|
320
317
|
this.ariaLabelElement.setAttribute('id', 'markers-panel-arialabel');
|
|
321
318
|
}
|
|
322
319
|
createWidget(parent) {
|
|
323
|
-
this.widget = this.markersViewModel.viewMode ===
|
|
320
|
+
this.widget = this.markersViewModel.viewMode === "table" ? this.createTable(parent) : this.createTree(parent);
|
|
324
321
|
this.widgetDisposables.add(this.widget);
|
|
325
322
|
const markerFocusContextKey = MarkersContextKeys.MarkerFocusContextKey.bindTo(this.widget.contextKeyService);
|
|
326
323
|
const relatedInformationFocusContextKey = MarkersContextKeys.RelatedInformationFocusContextKey.bindTo(this.widget.contextKeyService);
|
|
@@ -560,10 +557,10 @@ let MarkersView = class MarkersView extends FilterViewPane {
|
|
|
560
557
|
else {
|
|
561
558
|
this.messageBoxContainer.style.display = 'none';
|
|
562
559
|
if (filtered === total) {
|
|
563
|
-
this.setAriaLabel(( localize(
|
|
560
|
+
this.setAriaLabel(( localize(5600, "Showing {0} problems", total)));
|
|
564
561
|
}
|
|
565
562
|
else {
|
|
566
|
-
this.setAriaLabel(( localize(
|
|
563
|
+
this.setAriaLabel(( localize(5601, "Showing {0} of {1} problems", filtered, total)));
|
|
567
564
|
}
|
|
568
565
|
this.messageBoxContainer.removeAttribute('tabIndex');
|
|
569
566
|
}
|
|
@@ -580,13 +577,13 @@ let MarkersView = class MarkersView extends FilterViewPane {
|
|
|
580
577
|
const span1 = append(container, $('span'));
|
|
581
578
|
span1.textContent = Messages.MARKERS_PANEL_NO_PROBLEMS_FILTERS;
|
|
582
579
|
const link = append(container, $('a.messageAction'));
|
|
583
|
-
link.textContent = ( localize(
|
|
580
|
+
link.textContent = ( localize(5602, "Clear Filters"));
|
|
584
581
|
link.setAttribute('tabIndex', '0');
|
|
585
582
|
const span2 = append(container, $('span'));
|
|
586
583
|
span2.textContent = '.';
|
|
587
584
|
addStandardDisposableListener(link, EventType.CLICK, () => this.clearFilters());
|
|
588
585
|
addStandardDisposableListener(link, EventType.KEY_DOWN, (e) => {
|
|
589
|
-
if (e.equals(
|
|
586
|
+
if (e.equals(3 ) || e.equals(10 )) {
|
|
590
587
|
this.clearFilters();
|
|
591
588
|
e.stopPropagation();
|
|
592
589
|
}
|
|
@@ -3,46 +3,46 @@ import { basename } from 'vscode/vscode/vs/base/common/resources';
|
|
|
3
3
|
import { MarkerSeverity } from 'vscode/vscode/vs/platform/markers/common/markers';
|
|
4
4
|
|
|
5
5
|
class Messages {
|
|
6
|
-
static { this.MARKERS_PANEL_TOGGLE_LABEL = ( localize(
|
|
7
|
-
static { this.MARKERS_PANEL_SHOW_LABEL = ( localize2(
|
|
8
|
-
static { this.PROBLEMS_PANEL_CONFIGURATION_TITLE = ( localize(
|
|
6
|
+
static { this.MARKERS_PANEL_TOGGLE_LABEL = ( localize(5603, "Toggle Problems (Errors, Warnings, Infos)")); }
|
|
7
|
+
static { this.MARKERS_PANEL_SHOW_LABEL = ( localize2(5604, "Focus Problems (Errors, Warnings, Infos)")); }
|
|
8
|
+
static { this.PROBLEMS_PANEL_CONFIGURATION_TITLE = ( localize(5605, "Problems View")); }
|
|
9
9
|
static { this.PROBLEMS_PANEL_CONFIGURATION_AUTO_REVEAL = ( localize(
|
|
10
|
-
|
|
10
|
+
5606,
|
|
11
11
|
"Controls whether Problems view should automatically reveal files when opening them."
|
|
12
12
|
)); }
|
|
13
|
-
static { this.PROBLEMS_PANEL_CONFIGURATION_VIEW_MODE = ( localize(
|
|
14
|
-
static { this.PROBLEMS_PANEL_CONFIGURATION_SHOW_CURRENT_STATUS = ( localize(
|
|
15
|
-
static { this.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER = ( localize(
|
|
16
|
-
static { this.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER_SEVERITY = ( localize(
|
|
17
|
-
static { this.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER_POSITION = ( localize(
|
|
18
|
-
static { this.MARKERS_PANEL_TITLE_PROBLEMS = ( localize2(
|
|
19
|
-
static { this.MARKERS_PANEL_NO_PROBLEMS_BUILT = ( localize(
|
|
20
|
-
static { this.MARKERS_PANEL_NO_PROBLEMS_ACTIVE_FILE_BUILT = ( localize(
|
|
21
|
-
static { this.MARKERS_PANEL_NO_PROBLEMS_FILTERS = ( localize(
|
|
22
|
-
static { this.MARKERS_PANEL_ACTION_TOOLTIP_MORE_FILTERS = ( localize(
|
|
23
|
-
static { this.MARKERS_PANEL_FILTER_LABEL_SHOW_ERRORS = ( localize(
|
|
24
|
-
static { this.MARKERS_PANEL_FILTER_LABEL_SHOW_WARNINGS = ( localize(
|
|
25
|
-
static { this.MARKERS_PANEL_FILTER_LABEL_SHOW_INFOS = ( localize(
|
|
26
|
-
static { this.MARKERS_PANEL_FILTER_LABEL_EXCLUDED_FILES = ( localize(
|
|
27
|
-
static { this.MARKERS_PANEL_FILTER_LABEL_ACTIVE_FILE = ( localize(
|
|
28
|
-
static { this.MARKERS_PANEL_ACTION_TOOLTIP_FILTER = ( localize(
|
|
29
|
-
static { this.MARKERS_PANEL_ACTION_TOOLTIP_QUICKFIX = ( localize(
|
|
30
|
-
static { this.MARKERS_PANEL_FILTER_ARIA_LABEL = ( localize(
|
|
31
|
-
static { this.MARKERS_PANEL_FILTER_PLACEHOLDER = ( localize(
|
|
32
|
-
static { this.MARKERS_PANEL_FILTER_ERRORS = ( localize(
|
|
33
|
-
static { this.MARKERS_PANEL_FILTER_WARNINGS = ( localize(
|
|
34
|
-
static { this.MARKERS_PANEL_FILTER_INFOS = ( localize(
|
|
35
|
-
static { this.MARKERS_PANEL_SINGLE_ERROR_LABEL = ( localize(
|
|
36
|
-
static { this.MARKERS_PANEL_MULTIPLE_ERRORS_LABEL = (noOfErrors) => { return ( localize(
|
|
37
|
-
static { this.MARKERS_PANEL_SINGLE_WARNING_LABEL = ( localize(
|
|
38
|
-
static { this.MARKERS_PANEL_MULTIPLE_WARNINGS_LABEL = (noOfWarnings) => { return ( localize(
|
|
39
|
-
static { this.MARKERS_PANEL_SINGLE_INFO_LABEL = ( localize(
|
|
40
|
-
static { this.MARKERS_PANEL_MULTIPLE_INFOS_LABEL = (noOfInfos) => { return ( localize(
|
|
41
|
-
static { this.MARKERS_PANEL_SINGLE_UNKNOWN_LABEL = ( localize(
|
|
42
|
-
static { this.MARKERS_PANEL_MULTIPLE_UNKNOWNS_LABEL = (noOfUnknowns) => { return ( localize(
|
|
43
|
-
static { this.MARKERS_PANEL_AT_LINE_COL_NUMBER = (ln, col) => { return ( localize(
|
|
13
|
+
static { this.PROBLEMS_PANEL_CONFIGURATION_VIEW_MODE = ( localize(5607, "Controls the default view mode of the Problems view.")); }
|
|
14
|
+
static { this.PROBLEMS_PANEL_CONFIGURATION_SHOW_CURRENT_STATUS = ( localize(5608, "When enabled shows the current problem in the status bar.")); }
|
|
15
|
+
static { this.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER = ( localize(5609, "Controls the order in which problems are navigated.")); }
|
|
16
|
+
static { this.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER_SEVERITY = ( localize(5610, "Navigate problems ordered by severity")); }
|
|
17
|
+
static { this.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER_POSITION = ( localize(5611, "Navigate problems ordered by position")); }
|
|
18
|
+
static { this.MARKERS_PANEL_TITLE_PROBLEMS = ( localize2(5612, "Problems")); }
|
|
19
|
+
static { this.MARKERS_PANEL_NO_PROBLEMS_BUILT = ( localize(5613, "No problems have been detected in the workspace.")); }
|
|
20
|
+
static { this.MARKERS_PANEL_NO_PROBLEMS_ACTIVE_FILE_BUILT = ( localize(5614, "No problems have been detected in the current file.")); }
|
|
21
|
+
static { this.MARKERS_PANEL_NO_PROBLEMS_FILTERS = ( localize(5615, "No results found with provided filter criteria.")); }
|
|
22
|
+
static { this.MARKERS_PANEL_ACTION_TOOLTIP_MORE_FILTERS = ( localize(5616, "More Filters...")); }
|
|
23
|
+
static { this.MARKERS_PANEL_FILTER_LABEL_SHOW_ERRORS = ( localize(5617, "Show Errors")); }
|
|
24
|
+
static { this.MARKERS_PANEL_FILTER_LABEL_SHOW_WARNINGS = ( localize(5618, "Show Warnings")); }
|
|
25
|
+
static { this.MARKERS_PANEL_FILTER_LABEL_SHOW_INFOS = ( localize(5619, "Show Infos")); }
|
|
26
|
+
static { this.MARKERS_PANEL_FILTER_LABEL_EXCLUDED_FILES = ( localize(5620, "Hide Excluded Files")); }
|
|
27
|
+
static { this.MARKERS_PANEL_FILTER_LABEL_ACTIVE_FILE = ( localize(5621, "Show Active File Only")); }
|
|
28
|
+
static { this.MARKERS_PANEL_ACTION_TOOLTIP_FILTER = ( localize(5622, "Filter Problems")); }
|
|
29
|
+
static { this.MARKERS_PANEL_ACTION_TOOLTIP_QUICKFIX = ( localize(5623, "Show fixes")); }
|
|
30
|
+
static { this.MARKERS_PANEL_FILTER_ARIA_LABEL = ( localize(5624, "Filter Problems")); }
|
|
31
|
+
static { this.MARKERS_PANEL_FILTER_PLACEHOLDER = ( localize(5625, "Filter (e.g. text, **/*.ts, !**/node_modules/**)")); }
|
|
32
|
+
static { this.MARKERS_PANEL_FILTER_ERRORS = ( localize(5626, "errors")); }
|
|
33
|
+
static { this.MARKERS_PANEL_FILTER_WARNINGS = ( localize(5627, "warnings")); }
|
|
34
|
+
static { this.MARKERS_PANEL_FILTER_INFOS = ( localize(5628, "infos")); }
|
|
35
|
+
static { this.MARKERS_PANEL_SINGLE_ERROR_LABEL = ( localize(5629, "1 Error")); }
|
|
36
|
+
static { this.MARKERS_PANEL_MULTIPLE_ERRORS_LABEL = (noOfErrors) => { return ( localize(5630, "{0} Errors", '' + noOfErrors)); }; }
|
|
37
|
+
static { this.MARKERS_PANEL_SINGLE_WARNING_LABEL = ( localize(5631, "1 Warning")); }
|
|
38
|
+
static { this.MARKERS_PANEL_MULTIPLE_WARNINGS_LABEL = (noOfWarnings) => { return ( localize(5632, "{0} Warnings", '' + noOfWarnings)); }; }
|
|
39
|
+
static { this.MARKERS_PANEL_SINGLE_INFO_LABEL = ( localize(5633, "1 Info")); }
|
|
40
|
+
static { this.MARKERS_PANEL_MULTIPLE_INFOS_LABEL = (noOfInfos) => { return ( localize(5634, "{0} Infos", '' + noOfInfos)); }; }
|
|
41
|
+
static { this.MARKERS_PANEL_SINGLE_UNKNOWN_LABEL = ( localize(5635, "1 Unknown")); }
|
|
42
|
+
static { this.MARKERS_PANEL_MULTIPLE_UNKNOWNS_LABEL = (noOfUnknowns) => { return ( localize(5636, "{0} Unknowns", '' + noOfUnknowns)); }; }
|
|
43
|
+
static { this.MARKERS_PANEL_AT_LINE_COL_NUMBER = (ln, col) => { return ( localize(5637, "[Ln {0}, Col {1}]", '' + ln, '' + col)); }; }
|
|
44
44
|
static { this.MARKERS_TREE_ARIA_LABEL_RESOURCE = (noOfProblems, fileName, folder) => { return ( localize(
|
|
45
|
-
|
|
45
|
+
5638,
|
|
46
46
|
"{0} problems in file {1} of folder {2}",
|
|
47
47
|
noOfProblems,
|
|
48
48
|
fileName,
|
|
@@ -50,14 +50,14 @@ class Messages {
|
|
|
50
50
|
)); }; }
|
|
51
51
|
static { this.MARKERS_TREE_ARIA_LABEL_MARKER = (marker) => {
|
|
52
52
|
const relatedInformationMessage = marker.relatedInformation.length ? ( localize(
|
|
53
|
-
|
|
53
|
+
5639,
|
|
54
54
|
" This problem has references to {0} locations.",
|
|
55
55
|
marker.relatedInformation.length
|
|
56
56
|
)) : '';
|
|
57
57
|
switch (marker.marker.severity) {
|
|
58
58
|
case MarkerSeverity.Error:
|
|
59
59
|
return marker.marker.source ? ( localize(
|
|
60
|
-
|
|
60
|
+
5640,
|
|
61
61
|
"Error: {0} at line {1} and character {2}.{3} generated by {4}",
|
|
62
62
|
marker.marker.message,
|
|
63
63
|
marker.marker.startLineNumber,
|
|
@@ -66,7 +66,7 @@ class Messages {
|
|
|
66
66
|
marker.marker.source
|
|
67
67
|
))
|
|
68
68
|
: ( localize(
|
|
69
|
-
|
|
69
|
+
5641,
|
|
70
70
|
"Error: {0} at line {1} and character {2}.{3}",
|
|
71
71
|
marker.marker.message,
|
|
72
72
|
marker.marker.startLineNumber,
|
|
@@ -75,7 +75,7 @@ class Messages {
|
|
|
75
75
|
));
|
|
76
76
|
case MarkerSeverity.Warning:
|
|
77
77
|
return marker.marker.source ? ( localize(
|
|
78
|
-
|
|
78
|
+
5642,
|
|
79
79
|
"Warning: {0} at line {1} and character {2}.{3} generated by {4}",
|
|
80
80
|
marker.marker.message,
|
|
81
81
|
marker.marker.startLineNumber,
|
|
@@ -84,7 +84,7 @@ class Messages {
|
|
|
84
84
|
marker.marker.source
|
|
85
85
|
))
|
|
86
86
|
: ( localize(
|
|
87
|
-
|
|
87
|
+
5643,
|
|
88
88
|
"Warning: {0} at line {1} and character {2}.{3}",
|
|
89
89
|
marker.marker.message,
|
|
90
90
|
marker.marker.startLineNumber,
|
|
@@ -94,7 +94,7 @@ class Messages {
|
|
|
94
94
|
));
|
|
95
95
|
case MarkerSeverity.Info:
|
|
96
96
|
return marker.marker.source ? ( localize(
|
|
97
|
-
|
|
97
|
+
5644,
|
|
98
98
|
"Info: {0} at line {1} and character {2}.{3} generated by {4}",
|
|
99
99
|
marker.marker.message,
|
|
100
100
|
marker.marker.startLineNumber,
|
|
@@ -103,7 +103,7 @@ class Messages {
|
|
|
103
103
|
marker.marker.source
|
|
104
104
|
))
|
|
105
105
|
: ( localize(
|
|
106
|
-
|
|
106
|
+
5645,
|
|
107
107
|
"Info: {0} at line {1} and character {2}.{3}",
|
|
108
108
|
marker.marker.message,
|
|
109
109
|
marker.marker.startLineNumber,
|
|
@@ -112,7 +112,7 @@ class Messages {
|
|
|
112
112
|
));
|
|
113
113
|
default:
|
|
114
114
|
return marker.marker.source ? ( localize(
|
|
115
|
-
|
|
115
|
+
5646,
|
|
116
116
|
"Problem: {0} at line {1} and character {2}.{3} generated by {4}",
|
|
117
117
|
marker.marker.source,
|
|
118
118
|
marker.marker.message,
|
|
@@ -122,7 +122,7 @@ class Messages {
|
|
|
122
122
|
marker.marker.source
|
|
123
123
|
))
|
|
124
124
|
: ( localize(
|
|
125
|
-
|
|
125
|
+
5647,
|
|
126
126
|
"Problem: {0} at line {1} and character {2}.{3}",
|
|
127
127
|
marker.marker.message,
|
|
128
128
|
marker.marker.startLineNumber,
|
|
@@ -132,14 +132,14 @@ class Messages {
|
|
|
132
132
|
}
|
|
133
133
|
}; }
|
|
134
134
|
static { this.MARKERS_TREE_ARIA_LABEL_RELATED_INFORMATION = (relatedInformation) => ( localize(
|
|
135
|
-
|
|
135
|
+
5648,
|
|
136
136
|
"{0} at line {1} and character {2} in {3}",
|
|
137
137
|
relatedInformation.message,
|
|
138
138
|
relatedInformation.startLineNumber,
|
|
139
139
|
relatedInformation.startColumn,
|
|
140
140
|
basename(relatedInformation.resource)
|
|
141
141
|
)); }
|
|
142
|
-
static { this.SHOW_ERRORS_WARNINGS_ACTION_LABEL = ( localize(
|
|
142
|
+
static { this.SHOW_ERRORS_WARNINGS_ACTION_LABEL = ( localize(5649, "Show Errors and Warnings")); }
|
|
143
143
|
}
|
|
144
144
|
|
|
145
145
|
export { Messages as default };
|