@codingame/monaco-vscode-markers-service-override 4.5.1 → 4.5.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +2 -2
- package/vscode/src/vs/workbench/contrib/markers/browser/markers.contribution.js +83 -213
- package/vscode/src/vs/workbench/contrib/markers/browser/markersFileDecorations.js +14 -26
- package/vscode/src/vs/workbench/contrib/markers/browser/markersTable.js +50 -64
- package/vscode/src/vs/workbench/contrib/markers/browser/markersTreeViewer.js +92 -97
- package/vscode/src/vs/workbench/contrib/markers/browser/markersView.js +69 -81
- package/vscode/src/vs/workbench/contrib/markers/browser/messages.js +60 -205
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-markers-service-override",
|
|
3
|
-
"version": "4.5.
|
|
3
|
+
"version": "4.5.2",
|
|
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@4.5.
|
|
29
|
+
"vscode": "npm:@codingame/monaco-vscode-api@4.5.2"
|
|
30
30
|
}
|
|
31
31
|
}
|
|
@@ -30,10 +30,11 @@ import { viewFilterSubmenu } from 'vscode/vscode/vs/workbench/browser/parts/view
|
|
|
30
30
|
import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
|
|
31
31
|
import { problemsConfigurationNodeBase } from 'vscode/vscode/vs/workbench/common/configuration';
|
|
32
32
|
|
|
33
|
+
const _moduleId = "vs/workbench/contrib/markers/browser/markers.contribution";
|
|
33
34
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
34
35
|
id: Markers.MARKER_OPEN_ACTION_ID,
|
|
35
36
|
weight: 200 ,
|
|
36
|
-
when: ( ContextKeyExpr.and(MarkersContextKeys.MarkerFocusContextKey)),
|
|
37
|
+
when: ( (ContextKeyExpr.and(MarkersContextKeys.MarkerFocusContextKey))),
|
|
37
38
|
primary: 3 ,
|
|
38
39
|
mac: {
|
|
39
40
|
primary: 3 ,
|
|
@@ -47,7 +48,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
47
48
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
48
49
|
id: Markers.MARKER_OPEN_SIDE_ACTION_ID,
|
|
49
50
|
weight: 200 ,
|
|
50
|
-
when: ( ContextKeyExpr.and(MarkersContextKeys.MarkerFocusContextKey)),
|
|
51
|
+
when: ( (ContextKeyExpr.and(MarkersContextKeys.MarkerFocusContextKey))),
|
|
51
52
|
primary: 2048 | 3 ,
|
|
52
53
|
mac: {
|
|
53
54
|
primary: 256 | 3
|
|
@@ -79,7 +80,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
79
80
|
}
|
|
80
81
|
}
|
|
81
82
|
});
|
|
82
|
-
( Registry.as(Extensions.Configuration)).registerConfiguration({
|
|
83
|
+
( (Registry.as(Extensions.Configuration))).registerConfiguration({
|
|
83
84
|
...problemsConfigurationNodeBase,
|
|
84
85
|
'properties': {
|
|
85
86
|
'problems.autoReveal': {
|
|
@@ -110,54 +111,45 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
110
111
|
},
|
|
111
112
|
}
|
|
112
113
|
});
|
|
113
|
-
const markersViewIcon = registerIcon('markers-view-icon', Codicon.warning, ( localizeWithPath(
|
|
114
|
-
|
|
115
|
-
'markersViewIcon',
|
|
116
|
-
'View icon of the markers view.'
|
|
117
|
-
)));
|
|
118
|
-
const VIEW_CONTAINER = ( Registry.as(Extensions$1.ViewContainersRegistry)).registerViewContainer({
|
|
114
|
+
const markersViewIcon = registerIcon('markers-view-icon', Codicon.warning, ( localizeWithPath(_moduleId, 0, 'View icon of the markers view.')));
|
|
115
|
+
const VIEW_CONTAINER = ( (Registry.as(Extensions$1.ViewContainersRegistry))).registerViewContainer({
|
|
119
116
|
id: Markers.MARKERS_CONTAINER_ID,
|
|
120
117
|
title: Messages.MARKERS_PANEL_TITLE_PROBLEMS,
|
|
121
118
|
icon: markersViewIcon,
|
|
122
119
|
hideIfEmpty: true,
|
|
123
120
|
order: 0,
|
|
124
|
-
ctorDescriptor: ( new SyncDescriptor(
|
|
121
|
+
ctorDescriptor: ( (new SyncDescriptor(
|
|
125
122
|
ViewPaneContainer,
|
|
126
123
|
[Markers.MARKERS_CONTAINER_ID, { mergeViewWithContainerWhenSingleView: true }]
|
|
127
|
-
)),
|
|
124
|
+
))),
|
|
128
125
|
storageId: Markers.MARKERS_VIEW_STORAGE_ID,
|
|
129
126
|
}, 1 , { doNotRegisterOpenCommand: true });
|
|
130
|
-
( Registry.as(Extensions$1.ViewsRegistry)).registerViews([{
|
|
127
|
+
( (Registry.as(Extensions$1.ViewsRegistry))).registerViews([{
|
|
131
128
|
id: Markers.MARKERS_VIEW_ID,
|
|
132
129
|
containerIcon: markersViewIcon,
|
|
133
130
|
name: Messages.MARKERS_PANEL_TITLE_PROBLEMS,
|
|
134
131
|
canToggleVisibility: false,
|
|
135
132
|
canMoveView: true,
|
|
136
|
-
ctorDescriptor: ( new SyncDescriptor(MarkersView)),
|
|
133
|
+
ctorDescriptor: ( (new SyncDescriptor(MarkersView))),
|
|
137
134
|
openCommandActionDescriptor: {
|
|
138
135
|
id: 'workbench.actions.view.problems',
|
|
139
|
-
mnemonicTitle: ( localizeWithPath(
|
|
140
|
-
'vs/workbench/contrib/markers/browser/markers.contribution',
|
|
141
|
-
{ key: 'miMarker', comment: ['&& denotes a mnemonic'] },
|
|
142
|
-
"&&Problems"
|
|
143
|
-
)),
|
|
136
|
+
mnemonicTitle: ( localizeWithPath(_moduleId, 1, "&&Problems")),
|
|
144
137
|
keybindings: { primary: 2048 | 1024 | 43 },
|
|
145
138
|
order: 0,
|
|
146
139
|
}
|
|
147
140
|
}], VIEW_CONTAINER);
|
|
148
|
-
const workbenchRegistry = ( Registry.as(Extensions$2.Workbench));
|
|
141
|
+
const workbenchRegistry = ( (Registry.as(Extensions$2.Workbench)));
|
|
149
142
|
registerAction2(class extends ViewAction {
|
|
150
143
|
constructor() {
|
|
151
144
|
super({
|
|
152
145
|
id: `workbench.actions.table.${Markers.MARKERS_VIEW_ID}.viewAsTree`,
|
|
153
|
-
title: ( localizeWithPath(
|
|
154
|
-
'vs/workbench/contrib/markers/browser/markers.contribution',
|
|
155
|
-
'viewAsTree',
|
|
156
|
-
"View as Tree"
|
|
157
|
-
)),
|
|
146
|
+
title: ( localizeWithPath(_moduleId, 2, "View as Tree")),
|
|
158
147
|
menu: {
|
|
159
148
|
id: MenuId.ViewTitle,
|
|
160
|
-
when: ( ContextKeyExpr.and(
|
|
149
|
+
when: ( (ContextKeyExpr.and(
|
|
150
|
+
(ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID)),
|
|
151
|
+
(MarkersContextKeys.MarkersViewModeContextKey.isEqualTo("table" ))
|
|
152
|
+
))),
|
|
161
153
|
group: 'navigation',
|
|
162
154
|
order: 3
|
|
163
155
|
},
|
|
@@ -173,14 +165,13 @@ registerAction2(class extends ViewAction {
|
|
|
173
165
|
constructor() {
|
|
174
166
|
super({
|
|
175
167
|
id: `workbench.actions.table.${Markers.MARKERS_VIEW_ID}.viewAsTable`,
|
|
176
|
-
title: ( localizeWithPath(
|
|
177
|
-
'vs/workbench/contrib/markers/browser/markers.contribution',
|
|
178
|
-
'viewAsTable',
|
|
179
|
-
"View as Table"
|
|
180
|
-
)),
|
|
168
|
+
title: ( localizeWithPath(_moduleId, 3, "View as Table")),
|
|
181
169
|
menu: {
|
|
182
170
|
id: MenuId.ViewTitle,
|
|
183
|
-
when: ( ContextKeyExpr.and(
|
|
171
|
+
when: ( (ContextKeyExpr.and(
|
|
172
|
+
(ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID)),
|
|
173
|
+
(MarkersContextKeys.MarkersViewModeContextKey.isEqualTo("tree" ))
|
|
174
|
+
))),
|
|
184
175
|
group: 'navigation',
|
|
185
176
|
order: 3
|
|
186
177
|
},
|
|
@@ -196,21 +187,13 @@ registerAction2(class extends ViewAction {
|
|
|
196
187
|
constructor() {
|
|
197
188
|
super({
|
|
198
189
|
id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleErrors`,
|
|
199
|
-
title: ( localizeWithPath(
|
|
200
|
-
|
|
201
|
-
'show errors',
|
|
202
|
-
"Show Errors"
|
|
203
|
-
)),
|
|
204
|
-
category: ( localizeWithPath(
|
|
205
|
-
'vs/workbench/contrib/markers/browser/markers.contribution',
|
|
206
|
-
'problems',
|
|
207
|
-
"Problems"
|
|
208
|
-
)),
|
|
190
|
+
title: ( localizeWithPath(_moduleId, 4, "Show Errors")),
|
|
191
|
+
category: ( localizeWithPath(_moduleId, 5, "Problems")),
|
|
209
192
|
toggled: MarkersContextKeys.ShowErrorsFilterContextKey,
|
|
210
193
|
menu: {
|
|
211
194
|
id: viewFilterSubmenu,
|
|
212
195
|
group: '1_filter',
|
|
213
|
-
when: ( ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID)),
|
|
196
|
+
when: ( (ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID))),
|
|
214
197
|
order: 1
|
|
215
198
|
},
|
|
216
199
|
viewId: Markers.MARKERS_VIEW_ID
|
|
@@ -224,21 +207,13 @@ registerAction2(class extends ViewAction {
|
|
|
224
207
|
constructor() {
|
|
225
208
|
super({
|
|
226
209
|
id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleWarnings`,
|
|
227
|
-
title: ( localizeWithPath(
|
|
228
|
-
|
|
229
|
-
'show warnings',
|
|
230
|
-
"Show Warnings"
|
|
231
|
-
)),
|
|
232
|
-
category: ( localizeWithPath(
|
|
233
|
-
'vs/workbench/contrib/markers/browser/markers.contribution',
|
|
234
|
-
'problems',
|
|
235
|
-
"Problems"
|
|
236
|
-
)),
|
|
210
|
+
title: ( localizeWithPath(_moduleId, 6, "Show Warnings")),
|
|
211
|
+
category: ( localizeWithPath(_moduleId, 5, "Problems")),
|
|
237
212
|
toggled: MarkersContextKeys.ShowWarningsFilterContextKey,
|
|
238
213
|
menu: {
|
|
239
214
|
id: viewFilterSubmenu,
|
|
240
215
|
group: '1_filter',
|
|
241
|
-
when: ( ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID)),
|
|
216
|
+
when: ( (ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID))),
|
|
242
217
|
order: 2
|
|
243
218
|
},
|
|
244
219
|
viewId: Markers.MARKERS_VIEW_ID
|
|
@@ -252,21 +227,13 @@ registerAction2(class extends ViewAction {
|
|
|
252
227
|
constructor() {
|
|
253
228
|
super({
|
|
254
229
|
id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleInfos`,
|
|
255
|
-
title: ( localizeWithPath(
|
|
256
|
-
|
|
257
|
-
'show infos',
|
|
258
|
-
"Show Infos"
|
|
259
|
-
)),
|
|
260
|
-
category: ( localizeWithPath(
|
|
261
|
-
'vs/workbench/contrib/markers/browser/markers.contribution',
|
|
262
|
-
'problems',
|
|
263
|
-
"Problems"
|
|
264
|
-
)),
|
|
230
|
+
title: ( localizeWithPath(_moduleId, 7, "Show Infos")),
|
|
231
|
+
category: ( localizeWithPath(_moduleId, 5, "Problems")),
|
|
265
232
|
toggled: MarkersContextKeys.ShowInfoFilterContextKey,
|
|
266
233
|
menu: {
|
|
267
234
|
id: viewFilterSubmenu,
|
|
268
235
|
group: '1_filter',
|
|
269
|
-
when: ( ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID)),
|
|
236
|
+
when: ( (ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID))),
|
|
270
237
|
order: 3
|
|
271
238
|
},
|
|
272
239
|
viewId: Markers.MARKERS_VIEW_ID
|
|
@@ -280,21 +247,13 @@ registerAction2(class extends ViewAction {
|
|
|
280
247
|
constructor() {
|
|
281
248
|
super({
|
|
282
249
|
id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleActiveFile`,
|
|
283
|
-
title: ( localizeWithPath(
|
|
284
|
-
|
|
285
|
-
'show active file',
|
|
286
|
-
"Show Active File Only"
|
|
287
|
-
)),
|
|
288
|
-
category: ( localizeWithPath(
|
|
289
|
-
'vs/workbench/contrib/markers/browser/markers.contribution',
|
|
290
|
-
'problems',
|
|
291
|
-
"Problems"
|
|
292
|
-
)),
|
|
250
|
+
title: ( localizeWithPath(_moduleId, 8, "Show Active File Only")),
|
|
251
|
+
category: ( localizeWithPath(_moduleId, 5, "Problems")),
|
|
293
252
|
toggled: MarkersContextKeys.ShowActiveFileFilterContextKey,
|
|
294
253
|
menu: {
|
|
295
254
|
id: viewFilterSubmenu,
|
|
296
255
|
group: '2_filter',
|
|
297
|
-
when: ( ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID)),
|
|
256
|
+
when: ( (ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID))),
|
|
298
257
|
order: 1
|
|
299
258
|
},
|
|
300
259
|
viewId: Markers.MARKERS_VIEW_ID
|
|
@@ -308,21 +267,13 @@ registerAction2(class extends ViewAction {
|
|
|
308
267
|
constructor() {
|
|
309
268
|
super({
|
|
310
269
|
id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleExcludedFiles`,
|
|
311
|
-
title: ( localizeWithPath(
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
"Show Excluded Files"
|
|
315
|
-
)),
|
|
316
|
-
category: ( localizeWithPath(
|
|
317
|
-
'vs/workbench/contrib/markers/browser/markers.contribution',
|
|
318
|
-
'problems',
|
|
319
|
-
"Problems"
|
|
320
|
-
)),
|
|
321
|
-
toggled: ( MarkersContextKeys.ShowExcludedFilesFilterContextKey.negate()),
|
|
270
|
+
title: ( localizeWithPath(_moduleId, 9, "Show Excluded Files")),
|
|
271
|
+
category: ( localizeWithPath(_moduleId, 5, "Problems")),
|
|
272
|
+
toggled: ( (MarkersContextKeys.ShowExcludedFilesFilterContextKey.negate())),
|
|
322
273
|
menu: {
|
|
323
274
|
id: viewFilterSubmenu,
|
|
324
275
|
group: '2_filter',
|
|
325
|
-
when: ( ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID)),
|
|
276
|
+
when: ( (ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID))),
|
|
326
277
|
order: 2
|
|
327
278
|
},
|
|
328
279
|
viewId: Markers.MARKERS_VIEW_ID
|
|
@@ -347,14 +298,14 @@ registerAction2(class extends Action2 {
|
|
|
347
298
|
});
|
|
348
299
|
registerAction2(class extends ViewAction {
|
|
349
300
|
constructor() {
|
|
350
|
-
const when = ( ContextKeyExpr.and(
|
|
301
|
+
const when = ( (ContextKeyExpr.and(
|
|
302
|
+
(FocusedViewContext.isEqualTo(Markers.MARKERS_VIEW_ID)),
|
|
303
|
+
MarkersContextKeys.MarkersTreeVisibilityContextKey,
|
|
304
|
+
(MarkersContextKeys.RelatedInformationFocusContextKey.toNegated())
|
|
305
|
+
)));
|
|
351
306
|
super({
|
|
352
307
|
id: Markers.MARKER_COPY_ACTION_ID,
|
|
353
|
-
title: ( localize2WithPath(
|
|
354
|
-
'vs/workbench/contrib/markers/browser/markers.contribution',
|
|
355
|
-
'copyMarker',
|
|
356
|
-
'Copy'
|
|
357
|
-
)),
|
|
308
|
+
title: ( localize2WithPath(_moduleId, 10, 'Copy')),
|
|
358
309
|
menu: {
|
|
359
310
|
id: MenuId.ProblemsPanelContext,
|
|
360
311
|
when,
|
|
@@ -394,11 +345,7 @@ registerAction2(class extends ViewAction {
|
|
|
394
345
|
constructor() {
|
|
395
346
|
super({
|
|
396
347
|
id: Markers.MARKER_COPY_MESSAGE_ACTION_ID,
|
|
397
|
-
title: ( localize2WithPath(
|
|
398
|
-
'vs/workbench/contrib/markers/browser/markers.contribution',
|
|
399
|
-
'copyMessage',
|
|
400
|
-
'Copy Message'
|
|
401
|
-
)),
|
|
348
|
+
title: ( localize2WithPath(_moduleId, 11, 'Copy Message')),
|
|
402
349
|
menu: {
|
|
403
350
|
id: MenuId.ProblemsPanelContext,
|
|
404
351
|
when: MarkersContextKeys.MarkerFocusContextKey,
|
|
@@ -419,11 +366,7 @@ registerAction2(class extends ViewAction {
|
|
|
419
366
|
constructor() {
|
|
420
367
|
super({
|
|
421
368
|
id: Markers.RELATED_INFORMATION_COPY_MESSAGE_ACTION_ID,
|
|
422
|
-
title: ( localize2WithPath(
|
|
423
|
-
'vs/workbench/contrib/markers/browser/markers.contribution',
|
|
424
|
-
'copyMessage',
|
|
425
|
-
'Copy Message'
|
|
426
|
-
)),
|
|
369
|
+
title: ( localize2WithPath(_moduleId, 11, 'Copy Message')),
|
|
427
370
|
menu: {
|
|
428
371
|
id: MenuId.ProblemsPanelContext,
|
|
429
372
|
when: MarkersContextKeys.RelatedInformationFocusContextKey,
|
|
@@ -444,11 +387,7 @@ registerAction2(class extends ViewAction {
|
|
|
444
387
|
constructor() {
|
|
445
388
|
super({
|
|
446
389
|
id: Markers.FOCUS_PROBLEMS_FROM_FILTER,
|
|
447
|
-
title: ( localizeWithPath(
|
|
448
|
-
'vs/workbench/contrib/markers/browser/markers.contribution',
|
|
449
|
-
'focusProblemsList',
|
|
450
|
-
"Focus problems view"
|
|
451
|
-
)),
|
|
390
|
+
title: ( localizeWithPath(_moduleId, 12, "Focus problems view")),
|
|
452
391
|
keybinding: {
|
|
453
392
|
when: MarkersContextKeys.MarkerViewFilterFocusContextKey,
|
|
454
393
|
weight: 200 ,
|
|
@@ -465,13 +404,9 @@ registerAction2(class extends ViewAction {
|
|
|
465
404
|
constructor() {
|
|
466
405
|
super({
|
|
467
406
|
id: Markers.MARKERS_VIEW_FOCUS_FILTER,
|
|
468
|
-
title: ( localizeWithPath(
|
|
469
|
-
'vs/workbench/contrib/markers/browser/markers.contribution',
|
|
470
|
-
'focusProblemsFilter',
|
|
471
|
-
"Focus problems filter"
|
|
472
|
-
)),
|
|
407
|
+
title: ( localizeWithPath(_moduleId, 13, "Focus problems filter")),
|
|
473
408
|
keybinding: {
|
|
474
|
-
when: ( FocusedViewContext.isEqualTo(Markers.MARKERS_VIEW_ID)),
|
|
409
|
+
when: ( (FocusedViewContext.isEqualTo(Markers.MARKERS_VIEW_ID))),
|
|
475
410
|
weight: 200 ,
|
|
476
411
|
primary: 2048 | 36
|
|
477
412
|
},
|
|
@@ -486,19 +421,11 @@ registerAction2(class extends ViewAction {
|
|
|
486
421
|
constructor() {
|
|
487
422
|
super({
|
|
488
423
|
id: Markers.MARKERS_VIEW_SHOW_MULTILINE_MESSAGE,
|
|
489
|
-
title: ( localize2WithPath(
|
|
490
|
-
|
|
491
|
-
'show multiline',
|
|
492
|
-
"Show message in multiple lines"
|
|
493
|
-
)),
|
|
494
|
-
category: ( localizeWithPath(
|
|
495
|
-
'vs/workbench/contrib/markers/browser/markers.contribution',
|
|
496
|
-
'problems',
|
|
497
|
-
"Problems"
|
|
498
|
-
)),
|
|
424
|
+
title: ( localize2WithPath(_moduleId, 14, "Show message in multiple lines")),
|
|
425
|
+
category: ( localizeWithPath(_moduleId, 5, "Problems")),
|
|
499
426
|
menu: {
|
|
500
427
|
id: MenuId.CommandPalette,
|
|
501
|
-
when: ( ContextKeyExpr.has(getVisbileViewContextKey(Markers.MARKERS_VIEW_ID)))
|
|
428
|
+
when: ( (ContextKeyExpr.has(getVisbileViewContextKey(Markers.MARKERS_VIEW_ID))))
|
|
502
429
|
},
|
|
503
430
|
viewId: Markers.MARKERS_VIEW_ID
|
|
504
431
|
});
|
|
@@ -511,19 +438,11 @@ registerAction2(class extends ViewAction {
|
|
|
511
438
|
constructor() {
|
|
512
439
|
super({
|
|
513
440
|
id: Markers.MARKERS_VIEW_SHOW_SINGLELINE_MESSAGE,
|
|
514
|
-
title: ( localize2WithPath(
|
|
515
|
-
|
|
516
|
-
'show singleline',
|
|
517
|
-
"Show message in single line"
|
|
518
|
-
)),
|
|
519
|
-
category: ( localizeWithPath(
|
|
520
|
-
'vs/workbench/contrib/markers/browser/markers.contribution',
|
|
521
|
-
'problems',
|
|
522
|
-
"Problems"
|
|
523
|
-
)),
|
|
441
|
+
title: ( localize2WithPath(_moduleId, 15, "Show message in single line")),
|
|
442
|
+
category: ( localizeWithPath(_moduleId, 5, "Problems")),
|
|
524
443
|
menu: {
|
|
525
444
|
id: MenuId.CommandPalette,
|
|
526
|
-
when: ( ContextKeyExpr.has(getVisbileViewContextKey(Markers.MARKERS_VIEW_ID)))
|
|
445
|
+
when: ( (ContextKeyExpr.has(getVisbileViewContextKey(Markers.MARKERS_VIEW_ID))))
|
|
527
446
|
},
|
|
528
447
|
viewId: Markers.MARKERS_VIEW_ID
|
|
529
448
|
});
|
|
@@ -536,16 +455,8 @@ registerAction2(class extends ViewAction {
|
|
|
536
455
|
constructor() {
|
|
537
456
|
super({
|
|
538
457
|
id: Markers.MARKERS_VIEW_CLEAR_FILTER_TEXT,
|
|
539
|
-
title: ( localizeWithPath(
|
|
540
|
-
|
|
541
|
-
'clearFiltersText',
|
|
542
|
-
"Clear filters text"
|
|
543
|
-
)),
|
|
544
|
-
category: ( localizeWithPath(
|
|
545
|
-
'vs/workbench/contrib/markers/browser/markers.contribution',
|
|
546
|
-
'problems',
|
|
547
|
-
"Problems"
|
|
548
|
-
)),
|
|
458
|
+
title: ( localizeWithPath(_moduleId, 16, "Clear filters text")),
|
|
459
|
+
category: ( localizeWithPath(_moduleId, 5, "Problems")),
|
|
549
460
|
keybinding: {
|
|
550
461
|
when: MarkersContextKeys.MarkerViewFilterFocusContextKey,
|
|
551
462
|
weight: 200 ,
|
|
@@ -562,14 +473,13 @@ registerAction2(class extends ViewAction {
|
|
|
562
473
|
constructor() {
|
|
563
474
|
super({
|
|
564
475
|
id: `workbench.actions.treeView.${Markers.MARKERS_VIEW_ID}.collapseAll`,
|
|
565
|
-
title: ( localizeWithPath(
|
|
566
|
-
'vs/workbench/contrib/markers/browser/markers.contribution',
|
|
567
|
-
'collapseAll',
|
|
568
|
-
"Collapse All"
|
|
569
|
-
)),
|
|
476
|
+
title: ( localizeWithPath(_moduleId, 17, "Collapse All")),
|
|
570
477
|
menu: {
|
|
571
478
|
id: MenuId.ViewTitle,
|
|
572
|
-
when: ( ContextKeyExpr.and(
|
|
479
|
+
when: ( (ContextKeyExpr.and(
|
|
480
|
+
(ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID)),
|
|
481
|
+
(MarkersContextKeys.MarkersViewModeContextKey.isEqualTo("tree" ))
|
|
482
|
+
))),
|
|
573
483
|
group: 'navigation',
|
|
574
484
|
order: 2,
|
|
575
485
|
},
|
|
@@ -633,11 +543,7 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
|
|
|
633
543
|
const markersStatistics = this.markerService.getStatistics();
|
|
634
544
|
const tooltip = this.getMarkersTooltip(markersStatistics);
|
|
635
545
|
return {
|
|
636
|
-
name: ( localizeWithPath(
|
|
637
|
-
'vs/workbench/contrib/markers/browser/markers.contribution',
|
|
638
|
-
'status.problems',
|
|
639
|
-
"Problems"
|
|
640
|
-
)),
|
|
546
|
+
name: ( localizeWithPath(_moduleId, 18, "Problems")),
|
|
641
547
|
text: this.getMarkersText(markersStatistics),
|
|
642
548
|
ariaLabel: tooltip,
|
|
643
549
|
tooltip,
|
|
@@ -648,17 +554,9 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
|
|
|
648
554
|
this.statusbarService.updateEntryVisibility('status.problemsVisibility', true);
|
|
649
555
|
const openSettingsCommand = 'workbench.action.openSettings';
|
|
650
556
|
const configureSettingsLabel = '@id:problems.visibility';
|
|
651
|
-
const tooltip = ( localizeWithPath(
|
|
652
|
-
'vs/workbench/contrib/markers/browser/markers.contribution',
|
|
653
|
-
'status.problemsVisibilityOff',
|
|
654
|
-
"Problems are turned off. Click to open settings."
|
|
655
|
-
));
|
|
557
|
+
const tooltip = ( localizeWithPath(_moduleId, 19, "Problems are turned off. Click to open settings."));
|
|
656
558
|
return {
|
|
657
|
-
name: ( localizeWithPath(
|
|
658
|
-
'vs/workbench/contrib/markers/browser/markers.contribution',
|
|
659
|
-
'status.problemsVisibility',
|
|
660
|
-
"Problems Visibility"
|
|
661
|
-
)),
|
|
559
|
+
name: ( localizeWithPath(_moduleId, 20, "Problems Visibility")),
|
|
662
560
|
text: '$(whole-word)',
|
|
663
561
|
ariaLabel: tooltip,
|
|
664
562
|
tooltip,
|
|
@@ -667,24 +565,9 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
|
|
|
667
565
|
};
|
|
668
566
|
}
|
|
669
567
|
getMarkersTooltip(stats) {
|
|
670
|
-
const errorTitle = (n) => ( localizeWithPath(
|
|
671
|
-
|
|
672
|
-
|
|
673
|
-
"Errors: {0}",
|
|
674
|
-
n
|
|
675
|
-
));
|
|
676
|
-
const warningTitle = (n) => ( localizeWithPath(
|
|
677
|
-
'vs/workbench/contrib/markers/browser/markers.contribution',
|
|
678
|
-
'totalWarnings',
|
|
679
|
-
"Warnings: {0}",
|
|
680
|
-
n
|
|
681
|
-
));
|
|
682
|
-
const infoTitle = (n) => ( localizeWithPath(
|
|
683
|
-
'vs/workbench/contrib/markers/browser/markers.contribution',
|
|
684
|
-
'totalInfos',
|
|
685
|
-
"Infos: {0}",
|
|
686
|
-
n
|
|
687
|
-
));
|
|
568
|
+
const errorTitle = (n) => ( localizeWithPath(_moduleId, 21, "Errors: {0}", n));
|
|
569
|
+
const warningTitle = (n) => ( localizeWithPath(_moduleId, 22, "Warnings: {0}", n));
|
|
570
|
+
const infoTitle = (n) => ( localizeWithPath(_moduleId, 23, "Infos: {0}", n));
|
|
688
571
|
const titles = [];
|
|
689
572
|
if (stats.errors > 0) {
|
|
690
573
|
titles.push(errorTitle(stats.errors));
|
|
@@ -696,11 +579,7 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
|
|
|
696
579
|
titles.push(infoTitle(stats.infos));
|
|
697
580
|
}
|
|
698
581
|
if (titles.length === 0) {
|
|
699
|
-
return ( localizeWithPath(
|
|
700
|
-
'vs/workbench/contrib/markers/browser/markers.contribution',
|
|
701
|
-
'noProblems',
|
|
702
|
-
"No Problems"
|
|
703
|
-
));
|
|
582
|
+
return ( localizeWithPath(_moduleId, 24, "No Problems"));
|
|
704
583
|
}
|
|
705
584
|
return titles.join(', ');
|
|
706
585
|
}
|
|
@@ -714,26 +593,22 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
|
|
|
714
593
|
return problemsText.join(' ');
|
|
715
594
|
}
|
|
716
595
|
packNumber(n) {
|
|
717
|
-
const manyProblems = ( localizeWithPath(
|
|
718
|
-
|
|
719
|
-
'manyProblems',
|
|
720
|
-
"10K+"
|
|
721
|
-
));
|
|
722
|
-
return n > 9999 ? manyProblems : n > 999 ? ( n.toString()).charAt(0) + 'K' : ( n.toString());
|
|
596
|
+
const manyProblems = ( localizeWithPath(_moduleId, 25, "10K+"));
|
|
597
|
+
return n > 9999 ? manyProblems : n > 999 ? ( (n.toString())).charAt(0) + 'K' : ( (n.toString()));
|
|
723
598
|
}
|
|
724
599
|
};
|
|
725
|
-
MarkersStatusBarContributions = ( __decorate([
|
|
726
|
-
( __param(0, IMarkerService)),
|
|
727
|
-
( __param(1, IStatusbarService)),
|
|
728
|
-
( __param(2, IConfigurationService))
|
|
729
|
-
], MarkersStatusBarContributions));
|
|
600
|
+
MarkersStatusBarContributions = ( (__decorate([
|
|
601
|
+
( (__param(0, IMarkerService))),
|
|
602
|
+
( (__param(1, IStatusbarService))),
|
|
603
|
+
( (__param(2, IConfigurationService)))
|
|
604
|
+
], MarkersStatusBarContributions)));
|
|
730
605
|
workbenchRegistry.registerWorkbenchContribution(MarkersStatusBarContributions, 3 );
|
|
731
606
|
let ActivityUpdater = class ActivityUpdater extends Disposable {
|
|
732
607
|
constructor(activityService, markerService) {
|
|
733
608
|
super();
|
|
734
609
|
this.activityService = activityService;
|
|
735
610
|
this.markerService = markerService;
|
|
736
|
-
this.activity = this._register(( new MutableDisposable()));
|
|
611
|
+
this.activity = this._register(( (new MutableDisposable())));
|
|
737
612
|
this._register(this.markerService.onMarkerChanged(() => this.updateBadge()));
|
|
738
613
|
this.updateBadge();
|
|
739
614
|
}
|
|
@@ -741,21 +616,16 @@ let ActivityUpdater = class ActivityUpdater extends Disposable {
|
|
|
741
616
|
const { errors, warnings, infos } = this.markerService.getStatistics();
|
|
742
617
|
const total = errors + warnings + infos;
|
|
743
618
|
if (total > 0) {
|
|
744
|
-
const message = ( localizeWithPath(
|
|
745
|
-
|
|
746
|
-
'totalProblems',
|
|
747
|
-
'Total {0} Problems',
|
|
748
|
-
total
|
|
749
|
-
));
|
|
750
|
-
this.activity.value = this.activityService.showViewActivity(Markers.MARKERS_VIEW_ID, { badge: ( new NumberBadge(total, () => message)) });
|
|
619
|
+
const message = ( localizeWithPath(_moduleId, 26, 'Total {0} Problems', total));
|
|
620
|
+
this.activity.value = this.activityService.showViewActivity(Markers.MARKERS_VIEW_ID, { badge: ( (new NumberBadge(total, () => message))) });
|
|
751
621
|
}
|
|
752
622
|
else {
|
|
753
623
|
this.activity.value = undefined;
|
|
754
624
|
}
|
|
755
625
|
}
|
|
756
626
|
};
|
|
757
|
-
ActivityUpdater = ( __decorate([
|
|
758
|
-
( __param(0, IActivityService)),
|
|
759
|
-
( __param(1, IMarkerService))
|
|
760
|
-
], ActivityUpdater));
|
|
627
|
+
ActivityUpdater = ( (__decorate([
|
|
628
|
+
( (__param(0, IActivityService))),
|
|
629
|
+
( (__param(1, IMarkerService)))
|
|
630
|
+
], ActivityUpdater)));
|
|
761
631
|
workbenchRegistry.registerWorkbenchContribution(ActivityUpdater, 3 );
|
|
@@ -20,14 +20,11 @@ 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
22
|
|
|
23
|
+
const _moduleId = "vs/workbench/contrib/markers/browser/markersFileDecorations";
|
|
23
24
|
class MarkersDecorationsProvider {
|
|
24
25
|
constructor(_markerService) {
|
|
25
26
|
this._markerService = _markerService;
|
|
26
|
-
this.label = ( localizeWithPath(
|
|
27
|
-
'vs/workbench/contrib/markers/browser/markersFileDecorations',
|
|
28
|
-
'label',
|
|
29
|
-
"Problems"
|
|
30
|
-
));
|
|
27
|
+
this.label = ( localizeWithPath(_moduleId, 0, "Problems"));
|
|
31
28
|
this.onDidChange = _markerService.onMarkerChanged;
|
|
32
29
|
}
|
|
33
30
|
provideDecorations(resource) {
|
|
@@ -47,17 +44,8 @@ class MarkersDecorationsProvider {
|
|
|
47
44
|
return {
|
|
48
45
|
weight: 100 * first.severity,
|
|
49
46
|
bubble: true,
|
|
50
|
-
tooltip: markers.length === 1 ? ( localizeWithPath(
|
|
51
|
-
|
|
52
|
-
'tooltip.1',
|
|
53
|
-
"1 problem in this file"
|
|
54
|
-
)) : ( localizeWithPath(
|
|
55
|
-
'vs/workbench/contrib/markers/browser/markersFileDecorations',
|
|
56
|
-
'tooltip.N',
|
|
57
|
-
"{0} problems in this file",
|
|
58
|
-
markers.length
|
|
59
|
-
)),
|
|
60
|
-
letter: markers.length < 10 ? ( markers.length.toString()) : '9+',
|
|
47
|
+
tooltip: markers.length === 1 ? ( localizeWithPath(_moduleId, 1, "1 problem in this file")) : ( localizeWithPath(_moduleId, 2, "{0} problems in this file", markers.length)),
|
|
48
|
+
letter: markers.length < 10 ? ( (markers.length.toString())) : '9+',
|
|
61
49
|
color: first.severity === MarkerSeverity.Error ? listErrorForeground : listWarningForeground,
|
|
62
50
|
};
|
|
63
51
|
}
|
|
@@ -96,7 +84,7 @@ let MarkersFileDecorations = class MarkersFileDecorations {
|
|
|
96
84
|
}
|
|
97
85
|
this._enabled = shouldEnable;
|
|
98
86
|
if (this._enabled) {
|
|
99
|
-
const provider = ( new MarkersDecorationsProvider(this._markerService));
|
|
87
|
+
const provider = ( (new MarkersDecorationsProvider(this._markerService)));
|
|
100
88
|
this._provider = this._decorationsService.registerDecorationsProvider(provider);
|
|
101
89
|
}
|
|
102
90
|
else if (this._provider) {
|
|
@@ -104,20 +92,20 @@ let MarkersFileDecorations = class MarkersFileDecorations {
|
|
|
104
92
|
}
|
|
105
93
|
}
|
|
106
94
|
};
|
|
107
|
-
MarkersFileDecorations = ( __decorate([
|
|
108
|
-
( __param(0, IMarkerService)),
|
|
109
|
-
( __param(1, IDecorationsService)),
|
|
110
|
-
( __param(2, IConfigurationService))
|
|
111
|
-
], MarkersFileDecorations));
|
|
112
|
-
( Registry.as(Extensions.Configuration)).registerConfiguration({
|
|
95
|
+
MarkersFileDecorations = ( (__decorate([
|
|
96
|
+
( (__param(0, IMarkerService))),
|
|
97
|
+
( (__param(1, IDecorationsService))),
|
|
98
|
+
( (__param(2, IConfigurationService)))
|
|
99
|
+
], MarkersFileDecorations)));
|
|
100
|
+
( (Registry.as(Extensions.Configuration))).registerConfiguration({
|
|
113
101
|
'id': 'problems',
|
|
114
102
|
'order': 101,
|
|
115
103
|
'type': 'object',
|
|
116
104
|
'properties': {
|
|
117
105
|
'problems.decorations.enabled': {
|
|
118
106
|
'markdownDescription': ( localizeWithPath(
|
|
119
|
-
|
|
120
|
-
|
|
107
|
+
_moduleId,
|
|
108
|
+
3,
|
|
121
109
|
"Show Errors & Warnings on files and folder. Overwritten by `#problems.visibility#` when it is off."
|
|
122
110
|
)),
|
|
123
111
|
'type': 'boolean',
|
|
@@ -125,5 +113,5 @@ MarkersFileDecorations = ( __decorate([
|
|
|
125
113
|
}
|
|
126
114
|
}
|
|
127
115
|
});
|
|
128
|
-
( Registry.as(Extensions$1.Workbench))
|
|
116
|
+
( (Registry.as(Extensions$1.Workbench)))
|
|
129
117
|
.registerWorkbenchContribution(MarkersFileDecorations, 3 );
|