@codingame/monaco-vscode-markers-service-override 25.1.2 → 26.0.1
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 +162 -146
- package/vscode/src/vs/workbench/contrib/markers/browser/markersChatContext.js +26 -22
- package/vscode/src/vs/workbench/contrib/markers/browser/markersFileDecorations.js +24 -32
- package/vscode/src/vs/workbench/contrib/markers/browser/markersFilterOptions.js +39 -20
- package/vscode/src/vs/workbench/contrib/markers/browser/markersModel.js +29 -17
- package/vscode/src/vs/workbench/contrib/markers/browser/markersTable.js +183 -136
- package/vscode/src/vs/workbench/contrib/markers/browser/markersTreeViewer.js +201 -115
- package/vscode/src/vs/workbench/contrib/markers/browser/markersView.js +287 -206
- package/vscode/src/vs/workbench/contrib/markers/browser/markersViewActions.js +40 -14
- package/vscode/src/vs/workbench/contrib/markers/browser/messages.js +165 -79
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-markers-service-override",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "26.0.1",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "VSCode public API plugged on the monaco editor - markers service-override",
|
|
6
6
|
"keywords": [],
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
},
|
|
16
16
|
"type": "module",
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@codingame/monaco-vscode-api": "
|
|
18
|
+
"@codingame/monaco-vscode-api": "26.0.1"
|
|
19
19
|
},
|
|
20
20
|
"main": "index.js",
|
|
21
21
|
"module": "index.js",
|
|
@@ -86,75 +86,78 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
86
86
|
});
|
|
87
87
|
( Registry.as(Extensions.Configuration)).registerConfiguration({
|
|
88
88
|
...problemsConfigurationNodeBase,
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
89
|
+
"properties": {
|
|
90
|
+
"problems.autoReveal": {
|
|
91
|
+
"description": Messages.PROBLEMS_PANEL_CONFIGURATION_AUTO_REVEAL,
|
|
92
|
+
"type": "boolean",
|
|
93
|
+
"default": true
|
|
94
94
|
},
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
95
|
+
"problems.defaultViewMode": {
|
|
96
|
+
"description": Messages.PROBLEMS_PANEL_CONFIGURATION_VIEW_MODE,
|
|
97
|
+
"type": "string",
|
|
98
|
+
"default": "tree",
|
|
99
|
+
"enum": ["table", "tree"]
|
|
100
100
|
},
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
101
|
+
"problems.showCurrentInStatus": {
|
|
102
|
+
"description": Messages.PROBLEMS_PANEL_CONFIGURATION_SHOW_CURRENT_STATUS,
|
|
103
|
+
"type": "boolean",
|
|
104
|
+
"default": false
|
|
105
105
|
},
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
106
|
+
"problems.sortOrder": {
|
|
107
|
+
"description": Messages.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER,
|
|
108
|
+
"type": "string",
|
|
109
|
+
"default": "severity",
|
|
110
|
+
"enum": ["severity", "position"],
|
|
111
|
+
"enumDescriptions": [
|
|
112
112
|
Messages.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER_SEVERITY,
|
|
113
|
-
Messages.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER_POSITION
|
|
114
|
-
]
|
|
115
|
-
}
|
|
113
|
+
Messages.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER_POSITION
|
|
114
|
+
]
|
|
115
|
+
}
|
|
116
116
|
}
|
|
117
117
|
});
|
|
118
|
-
const markersViewIcon = registerIcon(
|
|
118
|
+
const markersViewIcon = registerIcon("markers-view-icon", Codicon.warning, ( localize(8922, "View icon of the markers view.")));
|
|
119
119
|
const VIEW_CONTAINER = ( Registry.as(Extensions$1.ViewContainersRegistry)).registerViewContainer({
|
|
120
120
|
id: Markers.MARKERS_CONTAINER_ID,
|
|
121
121
|
title: Messages.MARKERS_PANEL_TITLE_PROBLEMS,
|
|
122
122
|
icon: markersViewIcon,
|
|
123
123
|
hideIfEmpty: true,
|
|
124
124
|
order: 0,
|
|
125
|
-
ctorDescriptor: ( new SyncDescriptor(
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
125
|
+
ctorDescriptor: ( new SyncDescriptor(ViewPaneContainer, [Markers.MARKERS_CONTAINER_ID, {
|
|
126
|
+
mergeViewWithContainerWhenSingleView: true
|
|
127
|
+
}])),
|
|
128
|
+
storageId: Markers.MARKERS_VIEW_STORAGE_ID
|
|
129
|
+
}, ViewContainerLocation.Panel, {
|
|
130
|
+
doNotRegisterOpenCommand: true
|
|
131
|
+
});
|
|
131
132
|
( Registry.as(Extensions$1.ViewsRegistry)).registerViews([{
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
}
|
|
144
|
-
|
|
133
|
+
id: Markers.MARKERS_VIEW_ID,
|
|
134
|
+
containerIcon: markersViewIcon,
|
|
135
|
+
name: Messages.MARKERS_PANEL_TITLE_PROBLEMS,
|
|
136
|
+
canToggleVisibility: true,
|
|
137
|
+
canMoveView: true,
|
|
138
|
+
ctorDescriptor: ( new SyncDescriptor(MarkersView)),
|
|
139
|
+
openCommandActionDescriptor: {
|
|
140
|
+
id: "workbench.actions.view.problems",
|
|
141
|
+
mnemonicTitle: ( localize(8923, "&&Problems")),
|
|
142
|
+
keybindings: {
|
|
143
|
+
primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyM
|
|
144
|
+
},
|
|
145
|
+
order: 0
|
|
146
|
+
}
|
|
147
|
+
}], VIEW_CONTAINER);
|
|
145
148
|
const workbenchRegistry = ( Registry.as(Extensions$2.Workbench));
|
|
146
149
|
registerAction2(class extends ViewAction {
|
|
147
150
|
constructor() {
|
|
148
151
|
super({
|
|
149
152
|
id: `workbench.actions.table.${Markers.MARKERS_VIEW_ID}.viewAsTree`,
|
|
150
|
-
title: ( localize(
|
|
153
|
+
title: ( localize(8924, "View as Tree")),
|
|
151
154
|
metadata: {
|
|
152
|
-
description: ( localize2(
|
|
155
|
+
description: ( localize2(8925, "Show the problems view as a tree."))
|
|
153
156
|
},
|
|
154
157
|
menu: {
|
|
155
158
|
id: MenuId.ViewTitle,
|
|
156
|
-
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals(
|
|
157
|
-
group:
|
|
159
|
+
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("view", Markers.MARKERS_VIEW_ID)), ( MarkersContextKeys.MarkersViewModeContextKey.isEqualTo(MarkersViewMode.Table)))),
|
|
160
|
+
group: "navigation",
|
|
158
161
|
order: 3
|
|
159
162
|
},
|
|
160
163
|
icon: Codicon.listTree,
|
|
@@ -169,14 +172,14 @@ registerAction2(class extends ViewAction {
|
|
|
169
172
|
constructor() {
|
|
170
173
|
super({
|
|
171
174
|
id: `workbench.actions.table.${Markers.MARKERS_VIEW_ID}.viewAsTable`,
|
|
172
|
-
title: ( localize(
|
|
175
|
+
title: ( localize(8926, "View as Table")),
|
|
173
176
|
metadata: {
|
|
174
|
-
description: ( localize2(
|
|
177
|
+
description: ( localize2(8927, "Show the problems view as a table."))
|
|
175
178
|
},
|
|
176
179
|
menu: {
|
|
177
180
|
id: MenuId.ViewTitle,
|
|
178
|
-
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals(
|
|
179
|
-
group:
|
|
181
|
+
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("view", Markers.MARKERS_VIEW_ID)), ( MarkersContextKeys.MarkersViewModeContextKey.isEqualTo(MarkersViewMode.Tree)))),
|
|
182
|
+
group: "navigation",
|
|
180
183
|
order: 3
|
|
181
184
|
},
|
|
182
185
|
icon: Codicon.listFlat,
|
|
@@ -191,16 +194,16 @@ registerAction2(class extends ViewAction {
|
|
|
191
194
|
constructor() {
|
|
192
195
|
super({
|
|
193
196
|
id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleErrors`,
|
|
194
|
-
title: ( localize(
|
|
197
|
+
title: ( localize(8928, "Show Errors")),
|
|
195
198
|
metadata: {
|
|
196
|
-
description: ( localize2(
|
|
199
|
+
description: ( localize2(8929, "Show or hide errors in the problems view."))
|
|
197
200
|
},
|
|
198
|
-
category: ( localize(
|
|
201
|
+
category: ( localize(8930, "Problems")),
|
|
199
202
|
toggled: MarkersContextKeys.ShowErrorsFilterContextKey,
|
|
200
203
|
menu: {
|
|
201
204
|
id: viewFilterSubmenu,
|
|
202
|
-
group:
|
|
203
|
-
when: ( ContextKeyExpr.equals(
|
|
205
|
+
group: "1_filter",
|
|
206
|
+
when: ( ContextKeyExpr.equals("view", Markers.MARKERS_VIEW_ID)),
|
|
204
207
|
order: 1
|
|
205
208
|
},
|
|
206
209
|
viewId: Markers.MARKERS_VIEW_ID
|
|
@@ -214,16 +217,16 @@ registerAction2(class extends ViewAction {
|
|
|
214
217
|
constructor() {
|
|
215
218
|
super({
|
|
216
219
|
id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleWarnings`,
|
|
217
|
-
title: ( localize(
|
|
220
|
+
title: ( localize(8931, "Show Warnings")),
|
|
218
221
|
metadata: {
|
|
219
|
-
description: ( localize2(
|
|
222
|
+
description: ( localize2(8932, "Show or hide warnings in the problems view."))
|
|
220
223
|
},
|
|
221
|
-
category: ( localize(
|
|
224
|
+
category: ( localize(8930, "Problems")),
|
|
222
225
|
toggled: MarkersContextKeys.ShowWarningsFilterContextKey,
|
|
223
226
|
menu: {
|
|
224
227
|
id: viewFilterSubmenu,
|
|
225
|
-
group:
|
|
226
|
-
when: ( ContextKeyExpr.equals(
|
|
228
|
+
group: "1_filter",
|
|
229
|
+
when: ( ContextKeyExpr.equals("view", Markers.MARKERS_VIEW_ID)),
|
|
227
230
|
order: 2
|
|
228
231
|
},
|
|
229
232
|
viewId: Markers.MARKERS_VIEW_ID
|
|
@@ -237,16 +240,16 @@ registerAction2(class extends ViewAction {
|
|
|
237
240
|
constructor() {
|
|
238
241
|
super({
|
|
239
242
|
id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleInfos`,
|
|
240
|
-
title: ( localize(
|
|
241
|
-
category: ( localize(
|
|
243
|
+
title: ( localize(8933, "Show Infos")),
|
|
244
|
+
category: ( localize(8930, "Problems")),
|
|
242
245
|
toggled: MarkersContextKeys.ShowInfoFilterContextKey,
|
|
243
246
|
metadata: {
|
|
244
|
-
description: ( localize2(
|
|
247
|
+
description: ( localize2(8934, "Show or hide infos in the problems view."))
|
|
245
248
|
},
|
|
246
249
|
menu: {
|
|
247
250
|
id: viewFilterSubmenu,
|
|
248
|
-
group:
|
|
249
|
-
when: ( ContextKeyExpr.equals(
|
|
251
|
+
group: "1_filter",
|
|
252
|
+
when: ( ContextKeyExpr.equals("view", Markers.MARKERS_VIEW_ID)),
|
|
250
253
|
order: 3
|
|
251
254
|
},
|
|
252
255
|
viewId: Markers.MARKERS_VIEW_ID
|
|
@@ -260,19 +263,19 @@ registerAction2(class extends ViewAction {
|
|
|
260
263
|
constructor() {
|
|
261
264
|
super({
|
|
262
265
|
id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleActiveFile`,
|
|
263
|
-
title: ( localize(
|
|
266
|
+
title: ( localize(8935, "Show Active File Only")),
|
|
264
267
|
metadata: {
|
|
265
268
|
description: ( localize2(
|
|
266
|
-
|
|
269
|
+
8936,
|
|
267
270
|
"Show or hide problems (errors, warnings, info) only from the active file in the problems view."
|
|
268
271
|
))
|
|
269
272
|
},
|
|
270
|
-
category: ( localize(
|
|
273
|
+
category: ( localize(8930, "Problems")),
|
|
271
274
|
toggled: MarkersContextKeys.ShowActiveFileFilterContextKey,
|
|
272
275
|
menu: {
|
|
273
276
|
id: viewFilterSubmenu,
|
|
274
|
-
group:
|
|
275
|
-
when: ( ContextKeyExpr.equals(
|
|
277
|
+
group: "2_filter",
|
|
278
|
+
when: ( ContextKeyExpr.equals("view", Markers.MARKERS_VIEW_ID)),
|
|
276
279
|
order: 1
|
|
277
280
|
},
|
|
278
281
|
viewId: Markers.MARKERS_VIEW_ID
|
|
@@ -286,16 +289,16 @@ registerAction2(class extends ViewAction {
|
|
|
286
289
|
constructor() {
|
|
287
290
|
super({
|
|
288
291
|
id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleExcludedFiles`,
|
|
289
|
-
title: ( localize(
|
|
292
|
+
title: ( localize(8937, "Show Excluded Files")),
|
|
290
293
|
metadata: {
|
|
291
|
-
description: ( localize2(
|
|
294
|
+
description: ( localize2(8938, "Show or hide excluded files in the problems view."))
|
|
292
295
|
},
|
|
293
|
-
category: ( localize(
|
|
296
|
+
category: ( localize(8930, "Problems")),
|
|
294
297
|
toggled: ( MarkersContextKeys.ShowExcludedFilesFilterContextKey.negate()),
|
|
295
298
|
menu: {
|
|
296
299
|
id: viewFilterSubmenu,
|
|
297
|
-
group:
|
|
298
|
-
when: ( ContextKeyExpr.equals(
|
|
300
|
+
group: "2_filter",
|
|
301
|
+
when: ( ContextKeyExpr.equals("view", Markers.MARKERS_VIEW_ID)),
|
|
299
302
|
order: 2
|
|
300
303
|
},
|
|
301
304
|
viewId: Markers.MARKERS_VIEW_ID
|
|
@@ -308,10 +311,10 @@ registerAction2(class extends ViewAction {
|
|
|
308
311
|
registerAction2(class extends Action2 {
|
|
309
312
|
constructor() {
|
|
310
313
|
super({
|
|
311
|
-
id:
|
|
314
|
+
id: "workbench.action.problems.focus",
|
|
312
315
|
title: Messages.MARKERS_PANEL_SHOW_LABEL,
|
|
313
316
|
category: Categories.View,
|
|
314
|
-
f1: true
|
|
317
|
+
f1: true
|
|
315
318
|
});
|
|
316
319
|
}
|
|
317
320
|
async run(accessor) {
|
|
@@ -322,7 +325,7 @@ class MarkersViewAction extends ViewAction {
|
|
|
322
325
|
getSelectedMarkers(markersView) {
|
|
323
326
|
const selection = markersView.getFocusedSelectedElements() || markersView.getAllResourceMarkers();
|
|
324
327
|
const markers = [];
|
|
325
|
-
const addMarker =
|
|
328
|
+
const addMarker = marker => {
|
|
326
329
|
if (!markers.includes(marker)) {
|
|
327
330
|
markers.push(marker);
|
|
328
331
|
}
|
|
@@ -330,8 +333,7 @@ class MarkersViewAction extends ViewAction {
|
|
|
330
333
|
for (const selected of selection) {
|
|
331
334
|
if (selected instanceof ResourceMarkers) {
|
|
332
335
|
selected.markers.forEach(addMarker);
|
|
333
|
-
}
|
|
334
|
-
else if (selected instanceof Marker) {
|
|
336
|
+
} else if (selected instanceof Marker) {
|
|
335
337
|
addMarker(selected);
|
|
336
338
|
}
|
|
337
339
|
}
|
|
@@ -343,11 +345,11 @@ registerAction2(class extends MarkersViewAction {
|
|
|
343
345
|
const when = ( ContextKeyExpr.and(( FocusedViewContext.isEqualTo(Markers.MARKERS_VIEW_ID)), MarkersContextKeys.MarkersTreeVisibilityContextKey, ( MarkersContextKeys.RelatedInformationFocusContextKey.toNegated())));
|
|
344
346
|
super({
|
|
345
347
|
id: Markers.MARKER_COPY_ACTION_ID,
|
|
346
|
-
title: ( localize2(
|
|
348
|
+
title: ( localize2(8939, "Copy")),
|
|
347
349
|
menu: {
|
|
348
350
|
id: MenuId.ProblemsPanelContext,
|
|
349
351
|
when,
|
|
350
|
-
group:
|
|
352
|
+
group: "navigation"
|
|
351
353
|
},
|
|
352
354
|
keybinding: {
|
|
353
355
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
@@ -369,11 +371,11 @@ registerAction2(class extends MarkersViewAction {
|
|
|
369
371
|
constructor() {
|
|
370
372
|
super({
|
|
371
373
|
id: Markers.MARKER_COPY_MESSAGE_ACTION_ID,
|
|
372
|
-
title: ( localize2(
|
|
374
|
+
title: ( localize2(8940, "Copy Message")),
|
|
373
375
|
menu: {
|
|
374
376
|
id: MenuId.ProblemsPanelContext,
|
|
375
377
|
when: MarkersContextKeys.MarkerFocusContextKey,
|
|
376
|
-
group:
|
|
378
|
+
group: "navigation"
|
|
377
379
|
},
|
|
378
380
|
viewId: Markers.MARKERS_VIEW_ID
|
|
379
381
|
});
|
|
@@ -382,7 +384,7 @@ registerAction2(class extends MarkersViewAction {
|
|
|
382
384
|
const clipboardService = serviceAccessor.get(IClipboardService);
|
|
383
385
|
const markers = this.getSelectedMarkers(markersView);
|
|
384
386
|
if (markers.length) {
|
|
385
|
-
await clipboardService.writeText(( markers.map(m => m.marker.message)).join(
|
|
387
|
+
await clipboardService.writeText(( markers.map(m => m.marker.message)).join("\n"));
|
|
386
388
|
}
|
|
387
389
|
}
|
|
388
390
|
});
|
|
@@ -390,11 +392,11 @@ registerAction2(class extends ViewAction {
|
|
|
390
392
|
constructor() {
|
|
391
393
|
super({
|
|
392
394
|
id: Markers.RELATED_INFORMATION_COPY_MESSAGE_ACTION_ID,
|
|
393
|
-
title: ( localize2(
|
|
395
|
+
title: ( localize2(8940, "Copy Message")),
|
|
394
396
|
menu: {
|
|
395
397
|
id: MenuId.ProblemsPanelContext,
|
|
396
398
|
when: MarkersContextKeys.RelatedInformationFocusContextKey,
|
|
397
|
-
group:
|
|
399
|
+
group: "navigation"
|
|
398
400
|
},
|
|
399
401
|
viewId: Markers.MARKERS_VIEW_ID
|
|
400
402
|
});
|
|
@@ -411,7 +413,7 @@ registerAction2(class extends ViewAction {
|
|
|
411
413
|
constructor() {
|
|
412
414
|
super({
|
|
413
415
|
id: Markers.FOCUS_PROBLEMS_FROM_FILTER,
|
|
414
|
-
title: ( localize(
|
|
416
|
+
title: ( localize(8941, "Focus problems view")),
|
|
415
417
|
keybinding: {
|
|
416
418
|
when: MarkersContextKeys.MarkerViewFilterFocusContextKey,
|
|
417
419
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
@@ -428,7 +430,7 @@ registerAction2(class extends ViewAction {
|
|
|
428
430
|
constructor() {
|
|
429
431
|
super({
|
|
430
432
|
id: Markers.MARKERS_VIEW_FOCUS_FILTER,
|
|
431
|
-
title: ( localize(
|
|
433
|
+
title: ( localize(8942, "Focus problems filter")),
|
|
432
434
|
keybinding: {
|
|
433
435
|
when: ( FocusedViewContext.isEqualTo(Markers.MARKERS_VIEW_ID)),
|
|
434
436
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
@@ -445,8 +447,8 @@ registerAction2(class extends ViewAction {
|
|
|
445
447
|
constructor() {
|
|
446
448
|
super({
|
|
447
449
|
id: Markers.MARKERS_VIEW_SHOW_MULTILINE_MESSAGE,
|
|
448
|
-
title: ( localize2(
|
|
449
|
-
category: ( localize(
|
|
450
|
+
title: ( localize2(8943, "Show message in multiple lines")),
|
|
451
|
+
category: ( localize(8930, "Problems")),
|
|
450
452
|
menu: {
|
|
451
453
|
id: MenuId.CommandPalette,
|
|
452
454
|
when: ( ContextKeyExpr.has(getVisbileViewContextKey(Markers.MARKERS_VIEW_ID)))
|
|
@@ -462,8 +464,8 @@ registerAction2(class extends ViewAction {
|
|
|
462
464
|
constructor() {
|
|
463
465
|
super({
|
|
464
466
|
id: Markers.MARKERS_VIEW_SHOW_SINGLELINE_MESSAGE,
|
|
465
|
-
title: ( localize2(
|
|
466
|
-
category: ( localize(
|
|
467
|
+
title: ( localize2(8944, "Show message in single line")),
|
|
468
|
+
category: ( localize(8930, "Problems")),
|
|
467
469
|
menu: {
|
|
468
470
|
id: MenuId.CommandPalette,
|
|
469
471
|
when: ( ContextKeyExpr.has(getVisbileViewContextKey(Markers.MARKERS_VIEW_ID)))
|
|
@@ -479,8 +481,8 @@ registerAction2(class extends ViewAction {
|
|
|
479
481
|
constructor() {
|
|
480
482
|
super({
|
|
481
483
|
id: Markers.MARKERS_VIEW_CLEAR_FILTER_TEXT,
|
|
482
|
-
title: ( localize(
|
|
483
|
-
category: ( localize(
|
|
484
|
+
title: ( localize(8945, "Clear filters text")),
|
|
485
|
+
category: ( localize(8930, "Problems")),
|
|
484
486
|
keybinding: {
|
|
485
487
|
when: MarkersContextKeys.MarkerViewFilterFocusContextKey,
|
|
486
488
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
@@ -497,12 +499,12 @@ registerAction2(class extends ViewAction {
|
|
|
497
499
|
constructor() {
|
|
498
500
|
super({
|
|
499
501
|
id: `workbench.actions.treeView.${Markers.MARKERS_VIEW_ID}.collapseAll`,
|
|
500
|
-
title: ( localize(
|
|
502
|
+
title: ( localize(8946, "Collapse All")),
|
|
501
503
|
menu: {
|
|
502
504
|
id: MenuId.ViewTitle,
|
|
503
|
-
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals(
|
|
504
|
-
group:
|
|
505
|
-
order: 2
|
|
505
|
+
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("view", Markers.MARKERS_VIEW_ID)), ( MarkersContextKeys.MarkersViewModeContextKey.isEqualTo(MarkersViewMode.Tree)))),
|
|
506
|
+
group: "navigation",
|
|
507
|
+
order: 2
|
|
506
508
|
},
|
|
507
509
|
icon: Codicon.collapseAll,
|
|
508
510
|
viewId: Markers.MARKERS_VIEW_ID
|
|
@@ -516,15 +518,14 @@ registerAction2(class extends Action2 {
|
|
|
516
518
|
constructor() {
|
|
517
519
|
super({
|
|
518
520
|
id: Markers.TOGGLE_MARKERS_VIEW_ACTION_ID,
|
|
519
|
-
title: Messages.MARKERS_PANEL_TOGGLE_LABEL
|
|
521
|
+
title: Messages.MARKERS_PANEL_TOGGLE_LABEL
|
|
520
522
|
});
|
|
521
523
|
}
|
|
522
524
|
async run(accessor) {
|
|
523
525
|
const viewsService = accessor.get(IViewsService);
|
|
524
526
|
if (viewsService.isViewVisible(Markers.MARKERS_VIEW_ID)) {
|
|
525
527
|
viewsService.closeView(Markers.MARKERS_VIEW_ID);
|
|
526
|
-
}
|
|
527
|
-
else {
|
|
528
|
+
} else {
|
|
528
529
|
viewsService.openView(Markers.MARKERS_VIEW_ID, true);
|
|
529
530
|
}
|
|
530
531
|
}
|
|
@@ -535,11 +536,21 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
|
|
|
535
536
|
this.markerService = markerService;
|
|
536
537
|
this.statusbarService = statusbarService;
|
|
537
538
|
this.configurationService = configurationService;
|
|
538
|
-
this.markersStatusItem = this._register(this.statusbarService.addEntry(
|
|
539
|
+
this.markersStatusItem = this._register(this.statusbarService.addEntry(
|
|
540
|
+
this.getMarkersItem(),
|
|
541
|
+
"status.problems",
|
|
542
|
+
StatusbarAlignment.LEFT,
|
|
543
|
+
50
|
|
544
|
+
));
|
|
539
545
|
const addStatusBarEntry = () => {
|
|
540
|
-
this.markersStatusItemOff = this.statusbarService.addEntry(
|
|
546
|
+
this.markersStatusItemOff = this.statusbarService.addEntry(
|
|
547
|
+
this.getMarkersItemTurnedOff(),
|
|
548
|
+
"status.problemsVisibility",
|
|
549
|
+
StatusbarAlignment.LEFT,
|
|
550
|
+
49
|
|
551
|
+
);
|
|
541
552
|
};
|
|
542
|
-
let config = this.configurationService.getValue(
|
|
553
|
+
let config = this.configurationService.getValue("problems.visibility");
|
|
543
554
|
if (!config) {
|
|
544
555
|
addStatusBarEntry();
|
|
545
556
|
}
|
|
@@ -547,13 +558,12 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
|
|
|
547
558
|
this.markersStatusItem.update(this.getMarkersItem());
|
|
548
559
|
}));
|
|
549
560
|
this._register(this.configurationService.onDidChangeConfiguration(e => {
|
|
550
|
-
if (e.affectsConfiguration(
|
|
561
|
+
if (e.affectsConfiguration("problems.visibility")) {
|
|
551
562
|
this.markersStatusItem.update(this.getMarkersItem());
|
|
552
|
-
config = this.configurationService.getValue(
|
|
563
|
+
config = this.configurationService.getValue("problems.visibility");
|
|
553
564
|
if (!config && !this.markersStatusItemOff) {
|
|
554
565
|
addStatusBarEntry();
|
|
555
|
-
}
|
|
556
|
-
else if (config && this.markersStatusItemOff) {
|
|
566
|
+
} else if (config && this.markersStatusItemOff) {
|
|
557
567
|
this.markersStatusItemOff.dispose();
|
|
558
568
|
this.markersStatusItemOff = undefined;
|
|
559
569
|
}
|
|
@@ -564,31 +574,35 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
|
|
|
564
574
|
const markersStatistics = this.markerService.getStatistics();
|
|
565
575
|
const tooltip = this.getMarkersTooltip(markersStatistics);
|
|
566
576
|
return {
|
|
567
|
-
name: ( localize(
|
|
577
|
+
name: ( localize(8947, "Problems")),
|
|
568
578
|
text: this.getMarkersText(markersStatistics),
|
|
569
579
|
ariaLabel: tooltip,
|
|
570
580
|
tooltip,
|
|
571
|
-
command:
|
|
581
|
+
command: "workbench.actions.view.toggleProblems"
|
|
572
582
|
};
|
|
573
583
|
}
|
|
574
584
|
getMarkersItemTurnedOff() {
|
|
575
|
-
this.statusbarService.updateEntryVisibility(
|
|
576
|
-
const openSettingsCommand =
|
|
577
|
-
const configureSettingsLabel =
|
|
578
|
-
const tooltip = ( localize(
|
|
585
|
+
this.statusbarService.updateEntryVisibility("status.problemsVisibility", true);
|
|
586
|
+
const openSettingsCommand = "workbench.action.openSettings";
|
|
587
|
+
const configureSettingsLabel = "@id:problems.visibility";
|
|
588
|
+
const tooltip = ( localize(8948, "Problems are turned off. Click to open settings."));
|
|
579
589
|
return {
|
|
580
|
-
name: ( localize(
|
|
581
|
-
text:
|
|
590
|
+
name: ( localize(8949, "Problems Visibility")),
|
|
591
|
+
text: "$(whole-word)",
|
|
582
592
|
ariaLabel: tooltip,
|
|
583
593
|
tooltip,
|
|
584
|
-
kind:
|
|
585
|
-
command: {
|
|
594
|
+
kind: "warning",
|
|
595
|
+
command: {
|
|
596
|
+
title: openSettingsCommand,
|
|
597
|
+
arguments: [configureSettingsLabel],
|
|
598
|
+
id: openSettingsCommand
|
|
599
|
+
}
|
|
586
600
|
};
|
|
587
601
|
}
|
|
588
602
|
getMarkersTooltip(stats) {
|
|
589
|
-
const errorTitle =
|
|
590
|
-
const warningTitle =
|
|
591
|
-
const infoTitle =
|
|
603
|
+
const errorTitle = n => ( localize(8950, "Errors: {0}", n));
|
|
604
|
+
const warningTitle = n => ( localize(8951, "Warnings: {0}", n));
|
|
605
|
+
const infoTitle = n => ( localize(8952, "Infos: {0}", n));
|
|
592
606
|
const titles = [];
|
|
593
607
|
if (stats.errors > 0) {
|
|
594
608
|
titles.push(errorTitle(stats.errors));
|
|
@@ -600,31 +614,31 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
|
|
|
600
614
|
titles.push(infoTitle(stats.infos));
|
|
601
615
|
}
|
|
602
616
|
if (titles.length === 0) {
|
|
603
|
-
return localize(
|
|
617
|
+
return localize(8953, "No Problems");
|
|
604
618
|
}
|
|
605
|
-
return titles.join(
|
|
619
|
+
return titles.join(", ");
|
|
606
620
|
}
|
|
607
621
|
getMarkersText(stats) {
|
|
608
622
|
const problemsText = [];
|
|
609
|
-
problemsText.push(
|
|
610
|
-
problemsText.push(
|
|
623
|
+
problemsText.push("$(error) " + this.packNumber(stats.errors));
|
|
624
|
+
problemsText.push("$(warning) " + this.packNumber(stats.warnings));
|
|
611
625
|
if (stats.infos > 0) {
|
|
612
|
-
problemsText.push(
|
|
626
|
+
problemsText.push("$(info) " + this.packNumber(stats.infos));
|
|
613
627
|
}
|
|
614
|
-
return problemsText.join(
|
|
628
|
+
return problemsText.join(" ");
|
|
615
629
|
}
|
|
616
630
|
packNumber(n) {
|
|
617
|
-
const manyProblems = ( localize(
|
|
618
|
-
return n > 9999 ? manyProblems : n > 999 ? ( n.toString()).charAt(0) +
|
|
631
|
+
const manyProblems = ( localize(8954, "10K+"));
|
|
632
|
+
return n > 9999 ? manyProblems : n > 999 ? ( n.toString()).charAt(0) + "K" : ( n.toString());
|
|
619
633
|
}
|
|
620
634
|
};
|
|
621
|
-
MarkersStatusBarContributions = ( __decorate([
|
|
622
|
-
( __param(0, IMarkerService)),
|
|
623
|
-
( __param(1, IStatusbarService)),
|
|
624
|
-
( __param(2, IConfigurationService))
|
|
625
|
-
], MarkersStatusBarContributions));
|
|
635
|
+
MarkersStatusBarContributions = ( __decorate([( __param(0, IMarkerService)), ( __param(1, IStatusbarService)), ( __param(2, IConfigurationService))], MarkersStatusBarContributions));
|
|
626
636
|
workbenchRegistry.registerWorkbenchContribution(MarkersStatusBarContributions, LifecyclePhase.Restored);
|
|
627
|
-
registerWorkbenchContribution2(
|
|
637
|
+
registerWorkbenchContribution2(
|
|
638
|
+
MarkerChatContextContribution.ID,
|
|
639
|
+
MarkerChatContextContribution,
|
|
640
|
+
WorkbenchPhase.AfterRestored
|
|
641
|
+
);
|
|
628
642
|
let ActivityUpdater = class ActivityUpdater extends Disposable {
|
|
629
643
|
constructor(activityService, markerService) {
|
|
630
644
|
super();
|
|
@@ -635,19 +649,21 @@ let ActivityUpdater = class ActivityUpdater extends Disposable {
|
|
|
635
649
|
this.updateBadge();
|
|
636
650
|
}
|
|
637
651
|
updateBadge() {
|
|
638
|
-
const {
|
|
652
|
+
const {
|
|
653
|
+
errors,
|
|
654
|
+
warnings,
|
|
655
|
+
infos
|
|
656
|
+
} = this.markerService.getStatistics();
|
|
639
657
|
const total = errors + warnings + infos;
|
|
640
658
|
if (total > 0) {
|
|
641
|
-
const message = ( localize(
|
|
642
|
-
this.activity.value = this.activityService.showViewActivity(Markers.MARKERS_VIEW_ID, {
|
|
643
|
-
|
|
644
|
-
|
|
659
|
+
const message = ( localize(8955, "Total {0} Problems", total));
|
|
660
|
+
this.activity.value = this.activityService.showViewActivity(Markers.MARKERS_VIEW_ID, {
|
|
661
|
+
badge: ( new NumberBadge(total, () => message))
|
|
662
|
+
});
|
|
663
|
+
} else {
|
|
645
664
|
this.activity.value = undefined;
|
|
646
665
|
}
|
|
647
666
|
}
|
|
648
667
|
};
|
|
649
|
-
ActivityUpdater = ( __decorate([
|
|
650
|
-
( __param(0, IActivityService)),
|
|
651
|
-
( __param(1, IMarkerService))
|
|
652
|
-
], ActivityUpdater));
|
|
668
|
+
ActivityUpdater = ( __decorate([( __param(0, IActivityService)), ( __param(1, IMarkerService))], ActivityUpdater));
|
|
653
669
|
workbenchRegistry.registerWorkbenchContribution(ActivityUpdater, LifecyclePhase.Restored);
|