@codingame/monaco-vscode-markers-service-override 17.2.1 → 18.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 +9 -8
- package/vscode/src/vs/workbench/contrib/markers/browser/markers.contribution.js +75 -67
- package/vscode/src/vs/workbench/contrib/markers/browser/markersChatContext.d.ts +8 -0
- package/vscode/src/vs/workbench/contrib/markers/browser/markersChatContext.js +78 -0
- package/vscode/src/vs/workbench/contrib/markers/browser/markersFileDecorations.js +3 -3
- package/vscode/src/vs/workbench/contrib/markers/browser/markersTable.js +9 -9
- package/vscode/src/vs/workbench/contrib/markers/browser/markersTreeViewer.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/markers/browser/markersTreeViewer.js +4 -4
- package/vscode/src/vs/workbench/contrib/markers/browser/markersView.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/markers/browser/markersView.js +9 -9
- 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": "18.0.1",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "VSCode public API plugged on the monaco editor - markers service-override",
|
|
6
6
|
"keywords": [],
|
|
@@ -15,13 +15,14 @@
|
|
|
15
15
|
},
|
|
16
16
|
"type": "module",
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@codingame/monaco-vscode-
|
|
19
|
-
"@codingame/monaco-vscode-
|
|
20
|
-
"@codingame/monaco-vscode-
|
|
21
|
-
"@codingame/monaco-vscode-
|
|
22
|
-
"@codingame/monaco-vscode-
|
|
23
|
-
"@codingame/monaco-vscode-
|
|
24
|
-
"@codingame/monaco-vscode-
|
|
18
|
+
"@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common": "18.0.1",
|
|
19
|
+
"@codingame/monaco-vscode-8d39d04c-3201-5bd6-be79-eed8d17a5ad0-common": "18.0.1",
|
|
20
|
+
"@codingame/monaco-vscode-924e8f00-6faf-5059-b518-e43427d29ab3-common": "18.0.1",
|
|
21
|
+
"@codingame/monaco-vscode-937ecbdf-94c7-5b16-aefa-ad78ae557a93-common": "18.0.1",
|
|
22
|
+
"@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "18.0.1",
|
|
23
|
+
"@codingame/monaco-vscode-ab07af84-42e8-5a0f-8aef-b83fb90ede21-common": "18.0.1",
|
|
24
|
+
"@codingame/monaco-vscode-api": "18.0.1",
|
|
25
|
+
"@codingame/monaco-vscode-f24b7f0a-ceeb-5877-9148-81eb98a4f5d7-common": "18.0.1"
|
|
25
26
|
},
|
|
26
27
|
"main": "index.js",
|
|
27
28
|
"module": "index.js",
|
|
@@ -13,7 +13,7 @@ import { registerAction2, MenuId, Action2 } from '@codingame/monaco-vscode-api/v
|
|
|
13
13
|
import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
|
|
14
14
|
import { Markers, MarkersContextKeys, MarkersViewMode } from '@codingame/monaco-vscode-ab07af84-42e8-5a0f-8aef-b83fb90ede21-common/vscode/vs/workbench/contrib/markers/common/markers';
|
|
15
15
|
import Messages from './messages.js';
|
|
16
|
-
import { Extensions as Extensions$2 } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
|
|
16
|
+
import { Extensions as Extensions$2, registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
|
|
17
17
|
import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
|
|
18
18
|
import { IClipboardService } from '@codingame/monaco-vscode-api/vscode/vs/platform/clipboard/common/clipboardService.service';
|
|
19
19
|
import { Disposable, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
|
|
@@ -23,16 +23,17 @@ import { IMarkerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/
|
|
|
23
23
|
import { Extensions as Extensions$1, ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
|
|
24
24
|
import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
|
|
25
25
|
import { FocusedViewContext, getVisbileViewContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
|
|
26
|
-
import { ViewPaneContainer } from '@codingame/monaco-vscode-
|
|
26
|
+
import { ViewPaneContainer } from '@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
|
|
27
27
|
import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
|
|
28
28
|
import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
|
|
29
29
|
import { registerIcon } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/iconRegistry';
|
|
30
|
-
import { ViewAction } from '@codingame/monaco-vscode-
|
|
31
|
-
import { NumberBadge } from '@codingame/monaco-vscode-
|
|
30
|
+
import { ViewAction } from '@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common/vscode/vs/workbench/browser/parts/views/viewPane';
|
|
31
|
+
import { NumberBadge } from '@codingame/monaco-vscode-937ecbdf-94c7-5b16-aefa-ad78ae557a93-common/vscode/vs/workbench/services/activity/common/activity';
|
|
32
32
|
import { IActivityService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/activity/common/activity.service';
|
|
33
|
-
import { viewFilterSubmenu } from '@codingame/monaco-vscode-
|
|
33
|
+
import { viewFilterSubmenu } from '@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common/vscode/vs/workbench/browser/parts/views/viewFilter';
|
|
34
34
|
import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
|
|
35
35
|
import { problemsConfigurationNodeBase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/configuration';
|
|
36
|
+
import { MarkerChatContextContribution } from './markersChatContext.js';
|
|
36
37
|
|
|
37
38
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
38
39
|
id: Markers.MARKER_OPEN_ACTION_ID,
|
|
@@ -114,7 +115,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
114
115
|
},
|
|
115
116
|
}
|
|
116
117
|
});
|
|
117
|
-
const markersViewIcon = registerIcon('markers-view-icon', Codicon.warning, ( localize(
|
|
118
|
+
const markersViewIcon = registerIcon('markers-view-icon', Codicon.warning, ( localize(7665, 'View icon of the markers view.')));
|
|
118
119
|
const VIEW_CONTAINER = ( Registry.as(Extensions$1.ViewContainersRegistry)).registerViewContainer({
|
|
119
120
|
id: Markers.MARKERS_CONTAINER_ID,
|
|
120
121
|
title: Messages.MARKERS_PANEL_TITLE_PROBLEMS,
|
|
@@ -136,7 +137,7 @@ const VIEW_CONTAINER = ( Registry.as(Extensions$1.ViewContainersRegistry)).regis
|
|
|
136
137
|
ctorDescriptor: ( new SyncDescriptor(MarkersView)),
|
|
137
138
|
openCommandActionDescriptor: {
|
|
138
139
|
id: 'workbench.actions.view.problems',
|
|
139
|
-
mnemonicTitle: ( localize(
|
|
140
|
+
mnemonicTitle: ( localize(7666, "&&Problems")),
|
|
140
141
|
keybindings: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyM },
|
|
141
142
|
order: 0,
|
|
142
143
|
}
|
|
@@ -146,9 +147,9 @@ registerAction2(class extends ViewAction {
|
|
|
146
147
|
constructor() {
|
|
147
148
|
super({
|
|
148
149
|
id: `workbench.actions.table.${Markers.MARKERS_VIEW_ID}.viewAsTree`,
|
|
149
|
-
title: ( localize(
|
|
150
|
+
title: ( localize(7667, "View as Tree")),
|
|
150
151
|
metadata: {
|
|
151
|
-
description: ( localize2(
|
|
152
|
+
description: ( localize2(7668, "Show the problems view as a tree."))
|
|
152
153
|
},
|
|
153
154
|
menu: {
|
|
154
155
|
id: MenuId.ViewTitle,
|
|
@@ -168,9 +169,9 @@ registerAction2(class extends ViewAction {
|
|
|
168
169
|
constructor() {
|
|
169
170
|
super({
|
|
170
171
|
id: `workbench.actions.table.${Markers.MARKERS_VIEW_ID}.viewAsTable`,
|
|
171
|
-
title: ( localize(
|
|
172
|
+
title: ( localize(7669, "View as Table")),
|
|
172
173
|
metadata: {
|
|
173
|
-
description: ( localize2(
|
|
174
|
+
description: ( localize2(7670, "Show the problems view as a table."))
|
|
174
175
|
},
|
|
175
176
|
menu: {
|
|
176
177
|
id: MenuId.ViewTitle,
|
|
@@ -190,11 +191,11 @@ registerAction2(class extends ViewAction {
|
|
|
190
191
|
constructor() {
|
|
191
192
|
super({
|
|
192
193
|
id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleErrors`,
|
|
193
|
-
title: ( localize(
|
|
194
|
+
title: ( localize(7671, "Show Errors")),
|
|
194
195
|
metadata: {
|
|
195
|
-
description: ( localize2(
|
|
196
|
+
description: ( localize2(7672, "Show or hide errors in the problems view."))
|
|
196
197
|
},
|
|
197
|
-
category: ( localize(
|
|
198
|
+
category: ( localize(7673, "Problems")),
|
|
198
199
|
toggled: MarkersContextKeys.ShowErrorsFilterContextKey,
|
|
199
200
|
menu: {
|
|
200
201
|
id: viewFilterSubmenu,
|
|
@@ -213,11 +214,11 @@ registerAction2(class extends ViewAction {
|
|
|
213
214
|
constructor() {
|
|
214
215
|
super({
|
|
215
216
|
id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleWarnings`,
|
|
216
|
-
title: ( localize(
|
|
217
|
+
title: ( localize(7674, "Show Warnings")),
|
|
217
218
|
metadata: {
|
|
218
|
-
description: ( localize2(
|
|
219
|
+
description: ( localize2(7675, "Show or hide warnings in the problems view."))
|
|
219
220
|
},
|
|
220
|
-
category: ( localize(
|
|
221
|
+
category: ( localize(7673, "Problems")),
|
|
221
222
|
toggled: MarkersContextKeys.ShowWarningsFilterContextKey,
|
|
222
223
|
menu: {
|
|
223
224
|
id: viewFilterSubmenu,
|
|
@@ -236,11 +237,11 @@ registerAction2(class extends ViewAction {
|
|
|
236
237
|
constructor() {
|
|
237
238
|
super({
|
|
238
239
|
id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleInfos`,
|
|
239
|
-
title: ( localize(
|
|
240
|
-
category: ( localize(
|
|
240
|
+
title: ( localize(7676, "Show Infos")),
|
|
241
|
+
category: ( localize(7673, "Problems")),
|
|
241
242
|
toggled: MarkersContextKeys.ShowInfoFilterContextKey,
|
|
242
243
|
metadata: {
|
|
243
|
-
description: ( localize2(
|
|
244
|
+
description: ( localize2(7677, "Show or hide infos in the problems view."))
|
|
244
245
|
},
|
|
245
246
|
menu: {
|
|
246
247
|
id: viewFilterSubmenu,
|
|
@@ -259,14 +260,14 @@ registerAction2(class extends ViewAction {
|
|
|
259
260
|
constructor() {
|
|
260
261
|
super({
|
|
261
262
|
id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleActiveFile`,
|
|
262
|
-
title: ( localize(
|
|
263
|
+
title: ( localize(7678, "Show Active File Only")),
|
|
263
264
|
metadata: {
|
|
264
265
|
description: ( localize2(
|
|
265
|
-
|
|
266
|
+
7679,
|
|
266
267
|
"Show or hide problems (errors, warnings, info) only from the active file in the problems view."
|
|
267
268
|
))
|
|
268
269
|
},
|
|
269
|
-
category: ( localize(
|
|
270
|
+
category: ( localize(7673, "Problems")),
|
|
270
271
|
toggled: MarkersContextKeys.ShowActiveFileFilterContextKey,
|
|
271
272
|
menu: {
|
|
272
273
|
id: viewFilterSubmenu,
|
|
@@ -285,11 +286,11 @@ registerAction2(class extends ViewAction {
|
|
|
285
286
|
constructor() {
|
|
286
287
|
super({
|
|
287
288
|
id: `workbench.actions.${Markers.MARKERS_VIEW_ID}.toggleExcludedFiles`,
|
|
288
|
-
title: ( localize(
|
|
289
|
+
title: ( localize(7680, "Show Excluded Files")),
|
|
289
290
|
metadata: {
|
|
290
|
-
description: ( localize2(
|
|
291
|
+
description: ( localize2(7681, "Show or hide excluded files in the problems view."))
|
|
291
292
|
},
|
|
292
|
-
category: ( localize(
|
|
293
|
+
category: ( localize(7673, "Problems")),
|
|
293
294
|
toggled: ( MarkersContextKeys.ShowExcludedFilesFilterContextKey.negate()),
|
|
294
295
|
menu: {
|
|
295
296
|
id: viewFilterSubmenu,
|
|
@@ -317,12 +318,32 @@ registerAction2(class extends Action2 {
|
|
|
317
318
|
accessor.get(IViewsService).openView(Markers.MARKERS_VIEW_ID, true);
|
|
318
319
|
}
|
|
319
320
|
});
|
|
320
|
-
|
|
321
|
+
class MarkersViewAction extends ViewAction {
|
|
322
|
+
getSelectedMarkers(markersView) {
|
|
323
|
+
const selection = markersView.getFocusedSelectedElements() || markersView.getAllResourceMarkers();
|
|
324
|
+
const markers = [];
|
|
325
|
+
const addMarker = (marker) => {
|
|
326
|
+
if (!markers.includes(marker)) {
|
|
327
|
+
markers.push(marker);
|
|
328
|
+
}
|
|
329
|
+
};
|
|
330
|
+
for (const selected of selection) {
|
|
331
|
+
if (selected instanceof ResourceMarkers) {
|
|
332
|
+
selected.markers.forEach(addMarker);
|
|
333
|
+
}
|
|
334
|
+
else if (selected instanceof Marker) {
|
|
335
|
+
addMarker(selected);
|
|
336
|
+
}
|
|
337
|
+
}
|
|
338
|
+
return markers;
|
|
339
|
+
}
|
|
340
|
+
}
|
|
341
|
+
registerAction2(class extends MarkersViewAction {
|
|
321
342
|
constructor() {
|
|
322
343
|
const when = ( ContextKeyExpr.and(( FocusedViewContext.isEqualTo(Markers.MARKERS_VIEW_ID)), MarkersContextKeys.MarkersTreeVisibilityContextKey, ( MarkersContextKeys.RelatedInformationFocusContextKey.toNegated())));
|
|
323
344
|
super({
|
|
324
345
|
id: Markers.MARKER_COPY_ACTION_ID,
|
|
325
|
-
title: ( localize2(
|
|
346
|
+
title: ( localize2(7682, 'Copy')),
|
|
326
347
|
menu: {
|
|
327
348
|
id: MenuId.ProblemsPanelContext,
|
|
328
349
|
when,
|
|
@@ -338,31 +359,17 @@ registerAction2(class extends ViewAction {
|
|
|
338
359
|
}
|
|
339
360
|
async runInView(serviceAccessor, markersView) {
|
|
340
361
|
const clipboardService = serviceAccessor.get(IClipboardService);
|
|
341
|
-
const
|
|
342
|
-
const markers = [];
|
|
343
|
-
const addMarker = (marker) => {
|
|
344
|
-
if (!markers.includes(marker)) {
|
|
345
|
-
markers.push(marker);
|
|
346
|
-
}
|
|
347
|
-
};
|
|
348
|
-
for (const selected of selection) {
|
|
349
|
-
if (selected instanceof ResourceMarkers) {
|
|
350
|
-
selected.markers.forEach(addMarker);
|
|
351
|
-
}
|
|
352
|
-
else if (selected instanceof Marker) {
|
|
353
|
-
addMarker(selected);
|
|
354
|
-
}
|
|
355
|
-
}
|
|
362
|
+
const markers = this.getSelectedMarkers(markersView);
|
|
356
363
|
if (markers.length) {
|
|
357
364
|
await clipboardService.writeText(`[${markers}]`);
|
|
358
365
|
}
|
|
359
366
|
}
|
|
360
367
|
});
|
|
361
|
-
registerAction2(class extends
|
|
368
|
+
registerAction2(class extends MarkersViewAction {
|
|
362
369
|
constructor() {
|
|
363
370
|
super({
|
|
364
371
|
id: Markers.MARKER_COPY_MESSAGE_ACTION_ID,
|
|
365
|
-
title: ( localize2(
|
|
372
|
+
title: ( localize2(7683, 'Copy Message')),
|
|
366
373
|
menu: {
|
|
367
374
|
id: MenuId.ProblemsPanelContext,
|
|
368
375
|
when: MarkersContextKeys.MarkerFocusContextKey,
|
|
@@ -373,9 +380,9 @@ registerAction2(class extends ViewAction {
|
|
|
373
380
|
}
|
|
374
381
|
async runInView(serviceAccessor, markersView) {
|
|
375
382
|
const clipboardService = serviceAccessor.get(IClipboardService);
|
|
376
|
-
const
|
|
377
|
-
if (
|
|
378
|
-
await clipboardService.writeText(
|
|
383
|
+
const markers = this.getSelectedMarkers(markersView);
|
|
384
|
+
if (markers.length) {
|
|
385
|
+
await clipboardService.writeText(( markers.map(m => m.marker.message)).join('\n'));
|
|
379
386
|
}
|
|
380
387
|
}
|
|
381
388
|
});
|
|
@@ -383,7 +390,7 @@ registerAction2(class extends ViewAction {
|
|
|
383
390
|
constructor() {
|
|
384
391
|
super({
|
|
385
392
|
id: Markers.RELATED_INFORMATION_COPY_MESSAGE_ACTION_ID,
|
|
386
|
-
title: ( localize2(
|
|
393
|
+
title: ( localize2(7683, 'Copy Message')),
|
|
387
394
|
menu: {
|
|
388
395
|
id: MenuId.ProblemsPanelContext,
|
|
389
396
|
when: MarkersContextKeys.RelatedInformationFocusContextKey,
|
|
@@ -404,7 +411,7 @@ registerAction2(class extends ViewAction {
|
|
|
404
411
|
constructor() {
|
|
405
412
|
super({
|
|
406
413
|
id: Markers.FOCUS_PROBLEMS_FROM_FILTER,
|
|
407
|
-
title: ( localize(
|
|
414
|
+
title: ( localize(7684, "Focus problems view")),
|
|
408
415
|
keybinding: {
|
|
409
416
|
when: MarkersContextKeys.MarkerViewFilterFocusContextKey,
|
|
410
417
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
@@ -421,7 +428,7 @@ registerAction2(class extends ViewAction {
|
|
|
421
428
|
constructor() {
|
|
422
429
|
super({
|
|
423
430
|
id: Markers.MARKERS_VIEW_FOCUS_FILTER,
|
|
424
|
-
title: ( localize(
|
|
431
|
+
title: ( localize(7685, "Focus problems filter")),
|
|
425
432
|
keybinding: {
|
|
426
433
|
when: ( FocusedViewContext.isEqualTo(Markers.MARKERS_VIEW_ID)),
|
|
427
434
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
@@ -438,8 +445,8 @@ registerAction2(class extends ViewAction {
|
|
|
438
445
|
constructor() {
|
|
439
446
|
super({
|
|
440
447
|
id: Markers.MARKERS_VIEW_SHOW_MULTILINE_MESSAGE,
|
|
441
|
-
title: ( localize2(
|
|
442
|
-
category: ( localize(
|
|
448
|
+
title: ( localize2(7686, "Show message in multiple lines")),
|
|
449
|
+
category: ( localize(7673, "Problems")),
|
|
443
450
|
menu: {
|
|
444
451
|
id: MenuId.CommandPalette,
|
|
445
452
|
when: ( ContextKeyExpr.has(getVisbileViewContextKey(Markers.MARKERS_VIEW_ID)))
|
|
@@ -455,8 +462,8 @@ registerAction2(class extends ViewAction {
|
|
|
455
462
|
constructor() {
|
|
456
463
|
super({
|
|
457
464
|
id: Markers.MARKERS_VIEW_SHOW_SINGLELINE_MESSAGE,
|
|
458
|
-
title: ( localize2(
|
|
459
|
-
category: ( localize(
|
|
465
|
+
title: ( localize2(7687, "Show message in single line")),
|
|
466
|
+
category: ( localize(7673, "Problems")),
|
|
460
467
|
menu: {
|
|
461
468
|
id: MenuId.CommandPalette,
|
|
462
469
|
when: ( ContextKeyExpr.has(getVisbileViewContextKey(Markers.MARKERS_VIEW_ID)))
|
|
@@ -472,8 +479,8 @@ registerAction2(class extends ViewAction {
|
|
|
472
479
|
constructor() {
|
|
473
480
|
super({
|
|
474
481
|
id: Markers.MARKERS_VIEW_CLEAR_FILTER_TEXT,
|
|
475
|
-
title: ( localize(
|
|
476
|
-
category: ( localize(
|
|
482
|
+
title: ( localize(7688, "Clear filters text")),
|
|
483
|
+
category: ( localize(7673, "Problems")),
|
|
477
484
|
keybinding: {
|
|
478
485
|
when: MarkersContextKeys.MarkerViewFilterFocusContextKey,
|
|
479
486
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
@@ -490,7 +497,7 @@ registerAction2(class extends ViewAction {
|
|
|
490
497
|
constructor() {
|
|
491
498
|
super({
|
|
492
499
|
id: `workbench.actions.treeView.${Markers.MARKERS_VIEW_ID}.collapseAll`,
|
|
493
|
-
title: ( localize(
|
|
500
|
+
title: ( localize(7689, "Collapse All")),
|
|
494
501
|
menu: {
|
|
495
502
|
id: MenuId.ViewTitle,
|
|
496
503
|
when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', Markers.MARKERS_VIEW_ID)), ( MarkersContextKeys.MarkersViewModeContextKey.isEqualTo(MarkersViewMode.Tree)))),
|
|
@@ -557,7 +564,7 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
|
|
|
557
564
|
const markersStatistics = this.markerService.getStatistics();
|
|
558
565
|
const tooltip = this.getMarkersTooltip(markersStatistics);
|
|
559
566
|
return {
|
|
560
|
-
name: ( localize(
|
|
567
|
+
name: ( localize(7690, "Problems")),
|
|
561
568
|
text: this.getMarkersText(markersStatistics),
|
|
562
569
|
ariaLabel: tooltip,
|
|
563
570
|
tooltip,
|
|
@@ -568,9 +575,9 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
|
|
|
568
575
|
this.statusbarService.updateEntryVisibility('status.problemsVisibility', true);
|
|
569
576
|
const openSettingsCommand = 'workbench.action.openSettings';
|
|
570
577
|
const configureSettingsLabel = '@id:problems.visibility';
|
|
571
|
-
const tooltip = ( localize(
|
|
578
|
+
const tooltip = ( localize(7691, "Problems are turned off. Click to open settings."));
|
|
572
579
|
return {
|
|
573
|
-
name: ( localize(
|
|
580
|
+
name: ( localize(7692, "Problems Visibility")),
|
|
574
581
|
text: '$(whole-word)',
|
|
575
582
|
ariaLabel: tooltip,
|
|
576
583
|
tooltip,
|
|
@@ -579,9 +586,9 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
|
|
|
579
586
|
};
|
|
580
587
|
}
|
|
581
588
|
getMarkersTooltip(stats) {
|
|
582
|
-
const errorTitle = (n) => ( localize(
|
|
583
|
-
const warningTitle = (n) => ( localize(
|
|
584
|
-
const infoTitle = (n) => ( localize(
|
|
589
|
+
const errorTitle = (n) => ( localize(7693, "Errors: {0}", n));
|
|
590
|
+
const warningTitle = (n) => ( localize(7694, "Warnings: {0}", n));
|
|
591
|
+
const infoTitle = (n) => ( localize(7695, "Infos: {0}", n));
|
|
585
592
|
const titles = [];
|
|
586
593
|
if (stats.errors > 0) {
|
|
587
594
|
titles.push(errorTitle(stats.errors));
|
|
@@ -593,7 +600,7 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
|
|
|
593
600
|
titles.push(infoTitle(stats.infos));
|
|
594
601
|
}
|
|
595
602
|
if (titles.length === 0) {
|
|
596
|
-
return localize(
|
|
603
|
+
return localize(7696, "No Problems");
|
|
597
604
|
}
|
|
598
605
|
return titles.join(', ');
|
|
599
606
|
}
|
|
@@ -607,7 +614,7 @@ let MarkersStatusBarContributions = class MarkersStatusBarContributions extends
|
|
|
607
614
|
return problemsText.join(' ');
|
|
608
615
|
}
|
|
609
616
|
packNumber(n) {
|
|
610
|
-
const manyProblems = ( localize(
|
|
617
|
+
const manyProblems = ( localize(7697, "10K+"));
|
|
611
618
|
return n > 9999 ? manyProblems : n > 999 ? ( n.toString()).charAt(0) + 'K' : ( n.toString());
|
|
612
619
|
}
|
|
613
620
|
};
|
|
@@ -617,6 +624,7 @@ MarkersStatusBarContributions = ( __decorate([
|
|
|
617
624
|
( __param(2, IConfigurationService))
|
|
618
625
|
], MarkersStatusBarContributions));
|
|
619
626
|
workbenchRegistry.registerWorkbenchContribution(MarkersStatusBarContributions, LifecyclePhase.Restored);
|
|
627
|
+
registerWorkbenchContribution2(MarkerChatContextContribution.ID, MarkerChatContextContribution, WorkbenchPhase.AfterRestored);
|
|
620
628
|
let ActivityUpdater = class ActivityUpdater extends Disposable {
|
|
621
629
|
constructor(activityService, markerService) {
|
|
622
630
|
super();
|
|
@@ -630,7 +638,7 @@ let ActivityUpdater = class ActivityUpdater extends Disposable {
|
|
|
630
638
|
const { errors, warnings, infos } = this.markerService.getStatistics();
|
|
631
639
|
const total = errors + warnings + infos;
|
|
632
640
|
if (total > 0) {
|
|
633
|
-
const message = ( localize(
|
|
641
|
+
const message = ( localize(7698, 'Total {0} Problems', total));
|
|
634
642
|
this.activity.value = this.activityService.showViewActivity(Markers.MARKERS_VIEW_ID, { badge: ( new NumberBadge(total, () => message)) });
|
|
635
643
|
}
|
|
636
644
|
else {
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
|
|
2
|
+
import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
|
|
3
|
+
import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
|
|
4
|
+
import { IChatContextPickService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextPickService.service";
|
|
5
|
+
export declare class MarkerChatContextContribution extends Disposable implements IWorkbenchContribution {
|
|
6
|
+
static readonly ID = "workbench.contrib.chat.markerChatContextContribution";
|
|
7
|
+
constructor(contextPickService: IChatContextPickService, instantiationService: IInstantiationService);
|
|
8
|
+
}
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
|
|
2
|
+
import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
|
|
3
|
+
import { groupBy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
|
|
4
|
+
import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
|
|
5
|
+
import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
|
|
6
|
+
import { extUri } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
|
|
7
|
+
import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
|
|
8
|
+
import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
|
|
9
|
+
import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
|
|
10
|
+
import { MarkerSeverity } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers';
|
|
11
|
+
import { IMarkerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service';
|
|
12
|
+
import { IChatContextPickService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextPickService.service';
|
|
13
|
+
import { IDiagnosticVariableEntryFilterData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
|
|
14
|
+
|
|
15
|
+
let MarkerChatContextPick = class MarkerChatContextPick {
|
|
16
|
+
constructor(_markerService, _labelService) {
|
|
17
|
+
this._markerService = _markerService;
|
|
18
|
+
this._labelService = _labelService;
|
|
19
|
+
this.type = 'pickerPick';
|
|
20
|
+
this.label = ( localize(7699, 'Problems...'));
|
|
21
|
+
this.icon = Codicon.error;
|
|
22
|
+
this.ordinal = -100;
|
|
23
|
+
}
|
|
24
|
+
asPicker() {
|
|
25
|
+
const markers = this._markerService.read({ severities: MarkerSeverity.Error | MarkerSeverity.Warning | MarkerSeverity.Info });
|
|
26
|
+
const grouped = groupBy(markers, (a, b) => extUri.compare(a.resource, b.resource));
|
|
27
|
+
const severities = ( new Set());
|
|
28
|
+
const items = [];
|
|
29
|
+
for (const group of grouped) {
|
|
30
|
+
const resource = group[0].resource;
|
|
31
|
+
items.push({ type: 'separator', label: this._labelService.getUriLabel(resource, { relative: true }) });
|
|
32
|
+
for (const marker of group) {
|
|
33
|
+
severities.add(marker.severity);
|
|
34
|
+
items.push({
|
|
35
|
+
label: marker.message,
|
|
36
|
+
description: ( localize(
|
|
37
|
+
7700,
|
|
38
|
+
"[Ln {0}, Col {1}]",
|
|
39
|
+
'' + marker.startLineNumber,
|
|
40
|
+
'' + marker.startColumn
|
|
41
|
+
)),
|
|
42
|
+
asAttachment() {
|
|
43
|
+
return IDiagnosticVariableEntryFilterData.toEntry(IDiagnosticVariableEntryFilterData.fromMarker(marker));
|
|
44
|
+
}
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
items.unshift({
|
|
49
|
+
label: ( localize(7701, 'All Problems')),
|
|
50
|
+
asAttachment() {
|
|
51
|
+
return IDiagnosticVariableEntryFilterData.toEntry({
|
|
52
|
+
filterSeverity: MarkerSeverity.Info
|
|
53
|
+
});
|
|
54
|
+
},
|
|
55
|
+
});
|
|
56
|
+
return {
|
|
57
|
+
placeholder: ( localize(7702, 'Select a problem to attach')),
|
|
58
|
+
picks: Promise.resolve(items)
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
};
|
|
62
|
+
MarkerChatContextPick = ( __decorate([
|
|
63
|
+
( __param(0, IMarkerService)),
|
|
64
|
+
( __param(1, ILabelService))
|
|
65
|
+
], MarkerChatContextPick));
|
|
66
|
+
let MarkerChatContextContribution = class MarkerChatContextContribution extends Disposable {
|
|
67
|
+
static { this.ID = 'workbench.contrib.chat.markerChatContextContribution'; }
|
|
68
|
+
constructor(contextPickService, instantiationService) {
|
|
69
|
+
super();
|
|
70
|
+
this._store.add(contextPickService.registerChatContextItem(instantiationService.createInstance(MarkerChatContextPick)));
|
|
71
|
+
}
|
|
72
|
+
};
|
|
73
|
+
MarkerChatContextContribution = ( __decorate([
|
|
74
|
+
( __param(0, IChatContextPickService)),
|
|
75
|
+
( __param(1, IInstantiationService))
|
|
76
|
+
], MarkerChatContextContribution));
|
|
77
|
+
|
|
78
|
+
export { MarkerChatContextContribution };
|
|
@@ -25,7 +25,7 @@ import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench
|
|
|
25
25
|
class MarkersDecorationsProvider {
|
|
26
26
|
constructor(_markerService) {
|
|
27
27
|
this._markerService = _markerService;
|
|
28
|
-
this.label = ( localize(
|
|
28
|
+
this.label = ( localize(7703, "Problems"));
|
|
29
29
|
this.onDidChange = _markerService.onMarkerChanged;
|
|
30
30
|
}
|
|
31
31
|
provideDecorations(resource) {
|
|
@@ -45,7 +45,7 @@ class MarkersDecorationsProvider {
|
|
|
45
45
|
return {
|
|
46
46
|
weight: 100 * first.severity,
|
|
47
47
|
bubble: true,
|
|
48
|
-
tooltip: markers.length === 1 ? ( localize(
|
|
48
|
+
tooltip: markers.length === 1 ? ( localize(7704, "1 problem in this file")) : ( localize(7705, "{0} problems in this file", markers.length)),
|
|
49
49
|
letter: markers.length < 10 ? ( markers.length.toString()) : '9+',
|
|
50
50
|
color: first.severity === MarkerSeverity.Error ? listErrorForeground : listWarningForeground,
|
|
51
51
|
};
|
|
@@ -105,7 +105,7 @@ MarkersFileDecorations = ( __decorate([
|
|
|
105
105
|
'properties': {
|
|
106
106
|
'problems.decorations.enabled': {
|
|
107
107
|
'markdownDescription': ( localize(
|
|
108
|
-
|
|
108
|
+
7706,
|
|
109
109
|
"Show Errors & Warnings on files and folder. Overwritten by {0} when it is off.",
|
|
110
110
|
'`#problems.visibility#`'
|
|
111
111
|
)),
|
|
@@ -43,7 +43,7 @@ let MarkerSeverityColumnRenderer = class MarkerSeverityColumnRenderer {
|
|
|
43
43
|
}));
|
|
44
44
|
return { actionBar, icon };
|
|
45
45
|
}
|
|
46
|
-
renderElement(element, index, templateData
|
|
46
|
+
renderElement(element, index, templateData) {
|
|
47
47
|
const toggleQuickFix = (enabled) => {
|
|
48
48
|
if (!isUndefinedOrNull(enabled)) {
|
|
49
49
|
const container = findParentWithClass(templateData.icon, 'monaco-table-td');
|
|
@@ -96,7 +96,7 @@ let MarkerCodeColumnRenderer = class MarkerCodeColumnRenderer {
|
|
|
96
96
|
)));
|
|
97
97
|
return { codeColumn, sourceLabel, codeLabel, codeLink, templateDisposable };
|
|
98
98
|
}
|
|
99
|
-
renderElement(element, index, templateData
|
|
99
|
+
renderElement(element, index, templateData) {
|
|
100
100
|
templateData.codeColumn.classList.remove('code-label');
|
|
101
101
|
templateData.codeColumn.classList.remove('code-link');
|
|
102
102
|
if (element.marker.source && element.marker.code) {
|
|
@@ -142,7 +142,7 @@ class MarkerMessageColumnRenderer {
|
|
|
142
142
|
const highlightedLabel = ( new HighlightedLabel(columnElement));
|
|
143
143
|
return { columnElement, highlightedLabel };
|
|
144
144
|
}
|
|
145
|
-
renderElement(element, index, templateData
|
|
145
|
+
renderElement(element, index, templateData) {
|
|
146
146
|
templateData.columnElement.title = element.marker.message;
|
|
147
147
|
templateData.highlightedLabel.set(element.marker.message, element.messageMatches);
|
|
148
148
|
}
|
|
@@ -165,7 +165,7 @@ let MarkerFileColumnRenderer = class MarkerFileColumnRenderer {
|
|
|
165
165
|
positionLabel.element.classList.add('file-position');
|
|
166
166
|
return { columnElement, fileLabel, positionLabel };
|
|
167
167
|
}
|
|
168
|
-
renderElement(element, index, templateData
|
|
168
|
+
renderElement(element, index, templateData) {
|
|
169
169
|
const positionLabel = Messages.MARKERS_PANEL_AT_LINE_COL_NUMBER(element.marker.startLineNumber, element.marker.startColumn);
|
|
170
170
|
templateData.columnElement.title = `${this.labelService.getUriLabel(element.marker.resource, { relative: false })} ${positionLabel}`;
|
|
171
171
|
templateData.fileLabel.set(this.labelService.getUriLabel(element.marker.resource, { relative: true }), element.fileMatches);
|
|
@@ -189,7 +189,7 @@ class MarkerSourceColumnRenderer {
|
|
|
189
189
|
const highlightedLabel = ( new HighlightedLabel(columnElement));
|
|
190
190
|
return { columnElement, highlightedLabel };
|
|
191
191
|
}
|
|
192
|
-
renderElement(element, index, templateData
|
|
192
|
+
renderElement(element, index, templateData) {
|
|
193
193
|
templateData.columnElement.title = element.marker.source ?? '';
|
|
194
194
|
templateData.highlightedLabel.set(element.marker.source ?? '', element.sourceMatches);
|
|
195
195
|
}
|
|
@@ -228,7 +228,7 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
228
228
|
project(row) { return row; }
|
|
229
229
|
},
|
|
230
230
|
{
|
|
231
|
-
label: ( localize(
|
|
231
|
+
label: ( localize(7707, "Code")),
|
|
232
232
|
tooltip: '',
|
|
233
233
|
weight: 1,
|
|
234
234
|
minimumWidth: 100,
|
|
@@ -237,21 +237,21 @@ let MarkersTable = class MarkersTable extends Disposable {
|
|
|
237
237
|
project(row) { return row; }
|
|
238
238
|
},
|
|
239
239
|
{
|
|
240
|
-
label: ( localize(
|
|
240
|
+
label: ( localize(7708, "Message")),
|
|
241
241
|
tooltip: '',
|
|
242
242
|
weight: 4,
|
|
243
243
|
templateId: MarkerMessageColumnRenderer.TEMPLATE_ID,
|
|
244
244
|
project(row) { return row; }
|
|
245
245
|
},
|
|
246
246
|
{
|
|
247
|
-
label: ( localize(
|
|
247
|
+
label: ( localize(7709, "File")),
|
|
248
248
|
tooltip: '',
|
|
249
249
|
weight: 2,
|
|
250
250
|
templateId: MarkerFileColumnRenderer.TEMPLATE_ID,
|
|
251
251
|
project(row) { return row; }
|
|
252
252
|
},
|
|
253
253
|
{
|
|
254
|
-
label: ( localize(
|
|
254
|
+
label: ( localize(7710, "Source")),
|
|
255
255
|
tooltip: '',
|
|
256
256
|
weight: 1,
|
|
257
257
|
minimumWidth: 100,
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { CountBadge } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/countBadge/countBadge";
|
|
2
|
-
import { ResourceLabels, IResourceLabel } from "@codingame/monaco-vscode-
|
|
2
|
+
import { ResourceLabels, IResourceLabel } from "@codingame/monaco-vscode-f24b7f0a-ceeb-5877-9148-81eb98a4f5d7-common/vscode/vs/workbench/browser/labels";
|
|
3
3
|
import { HighlightedLabel } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/highlightedlabel/highlightedLabel";
|
|
4
4
|
import { ResourceMarkers, Marker, RelatedInformation, MarkerElement, MarkerTableItem } from "./markersModel.js";
|
|
5
5
|
import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
|
|
@@ -49,7 +49,7 @@ let MarkersWidgetAccessibilityProvider = class MarkersWidgetAccessibilityProvide
|
|
|
49
49
|
this.labelService = labelService;
|
|
50
50
|
}
|
|
51
51
|
getWidgetAriaLabel() {
|
|
52
|
-
return localize(
|
|
52
|
+
return localize(7711, "Problems View");
|
|
53
53
|
}
|
|
54
54
|
getAriaLabel(element) {
|
|
55
55
|
if (element instanceof ResourceMarkers) {
|
|
@@ -190,9 +190,9 @@ MarkerRenderer = ( __decorate([
|
|
|
190
190
|
( __param(2, IInstantiationService)),
|
|
191
191
|
( __param(3, IOpenerService))
|
|
192
192
|
], MarkerRenderer));
|
|
193
|
-
const expandedIcon = registerIcon('markers-view-multi-line-expanded', Codicon.chevronUp, ( localize(
|
|
193
|
+
const expandedIcon = registerIcon('markers-view-multi-line-expanded', Codicon.chevronUp, ( localize(7712, 'Icon indicating that multiple lines are shown in the markers view.')));
|
|
194
194
|
const collapsedIcon = registerIcon('markers-view-multi-line-collapsed', Codicon.chevronDown, ( localize(
|
|
195
|
-
|
|
195
|
+
7713,
|
|
196
196
|
'Icon indicating that multiple lines are collapsed in the markers view.'
|
|
197
197
|
)));
|
|
198
198
|
const toggleMultilineAction = 'problems.action.toggleMultiline';
|
|
@@ -269,7 +269,7 @@ class MarkerWidget extends Disposable {
|
|
|
269
269
|
const multiline = viewModel && viewModel.multiline;
|
|
270
270
|
const action = this.disposables.add(( new Action(toggleMultilineAction)));
|
|
271
271
|
action.enabled = !!viewModel && marker.lines.length > 1;
|
|
272
|
-
action.tooltip = multiline ? ( localize(
|
|
272
|
+
action.tooltip = multiline ? ( localize(7714, "Show message in single line")) : ( localize(7715, "Show message in multiple lines"));
|
|
273
273
|
action.class = ThemeIcon.asClassName(multiline ? expandedIcon : collapsedIcon);
|
|
274
274
|
action.run = () => { if (viewModel) {
|
|
275
275
|
viewModel.multiline = !viewModel.multiline;
|
|
@@ -14,7 +14,7 @@ import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform
|
|
|
14
14
|
import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
|
|
15
15
|
import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
|
|
16
16
|
import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
|
|
17
|
-
import { FilterViewPane, IViewPaneOptions } from "@codingame/monaco-vscode-
|
|
17
|
+
import { FilterViewPane, IViewPaneOptions } from "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common/vscode/vs/workbench/browser/parts/views/viewPane";
|
|
18
18
|
import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service";
|
|
19
19
|
import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
|
|
20
20
|
import { MarkersViewMode } from "@codingame/monaco-vscode-ab07af84-42e8-5a0f-8aef-b83fb90ede21-common/vscode/vs/workbench/contrib/markers/common/markers";
|
|
@@ -35,13 +35,13 @@ import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform
|
|
|
35
35
|
import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
|
|
36
36
|
import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
|
|
37
37
|
import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
|
|
38
|
-
import { registerNavigableContainer } from '@codingame/monaco-vscode-
|
|
38
|
+
import { registerNavigableContainer } from '@codingame/monaco-vscode-8d39d04c-3201-5bd6-be79-eed8d17a5ad0-common/vscode/vs/workbench/browser/actions/widgetNavigationCommands';
|
|
39
39
|
import { RangeHighlightDecorations } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/codeeditor';
|
|
40
|
-
import { ResourceListDnDHandler } from '@codingame/monaco-vscode-
|
|
41
|
-
import { ResourceLabels } from '@codingame/monaco-vscode-
|
|
42
|
-
import { FilterViewPane } from '@codingame/monaco-vscode-
|
|
40
|
+
import { ResourceListDnDHandler } from '@codingame/monaco-vscode-924e8f00-6faf-5059-b518-e43427d29ab3-common/vscode/vs/workbench/browser/dnd';
|
|
41
|
+
import { ResourceLabels } from '@codingame/monaco-vscode-f24b7f0a-ceeb-5877-9148-81eb98a4f5d7-common/vscode/vs/workbench/browser/labels';
|
|
42
|
+
import { FilterViewPane } from '@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common/vscode/vs/workbench/browser/parts/views/viewPane';
|
|
43
43
|
import { EditorResourceAccessor, SideBySideEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
|
|
44
|
-
import { Memento } from '@codingame/monaco-vscode-
|
|
44
|
+
import { Memento } from '@codingame/monaco-vscode-924e8f00-6faf-5059-b518-e43427d29ab3-common/vscode/vs/workbench/common/memento';
|
|
45
45
|
import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
|
|
46
46
|
import { SIDE_GROUP, ACTIVE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
|
|
47
47
|
import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
|
|
@@ -180,7 +180,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
|
|
|
180
180
|
this.filterWidget.focus();
|
|
181
181
|
}
|
|
182
182
|
updateBadge(total, filtered) {
|
|
183
|
-
this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : ( localize(
|
|
183
|
+
this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : ( localize(7716, "Showing {0} of {1}", filtered, total)));
|
|
184
184
|
}
|
|
185
185
|
checkMoreFilters() {
|
|
186
186
|
this.filterWidget.checkMoreFilters(!this.filters.showErrors || !this.filters.showWarnings || !this.filters.showInfos || this.filters.excludedFiles || this.filters.activeFile);
|
|
@@ -547,10 +547,10 @@ let MarkersView = class MarkersView extends FilterViewPane {
|
|
|
547
547
|
else {
|
|
548
548
|
this.messageBoxContainer.style.display = 'none';
|
|
549
549
|
if (filtered === total) {
|
|
550
|
-
this.setAriaLabel(( localize(
|
|
550
|
+
this.setAriaLabel(( localize(7717, "Showing {0} problems", total)));
|
|
551
551
|
}
|
|
552
552
|
else {
|
|
553
|
-
this.setAriaLabel(( localize(
|
|
553
|
+
this.setAriaLabel(( localize(7718, "Showing {0} of {1} problems", filtered, total)));
|
|
554
554
|
}
|
|
555
555
|
this.messageBoxContainer.removeAttribute('tabIndex');
|
|
556
556
|
}
|
|
@@ -567,7 +567,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
|
|
|
567
567
|
const span1 = append(container, $('span'));
|
|
568
568
|
span1.textContent = Messages.MARKERS_PANEL_NO_PROBLEMS_FILTERS;
|
|
569
569
|
const link = append(container, $('a.messageAction'));
|
|
570
|
-
link.textContent = ( localize(
|
|
570
|
+
link.textContent = ( localize(7719, "Clear Filters"));
|
|
571
571
|
link.setAttribute('tabIndex', '0');
|
|
572
572
|
const span2 = append(container, $('span'));
|
|
573
573
|
span2.textContent = '.';
|
|
@@ -4,46 +4,46 @@ import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/res
|
|
|
4
4
|
import { MarkerSeverity } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers';
|
|
5
5
|
|
|
6
6
|
class Messages {
|
|
7
|
-
static { this.MARKERS_PANEL_TOGGLE_LABEL = ( localize(
|
|
8
|
-
static { this.MARKERS_PANEL_SHOW_LABEL = ( localize2(
|
|
9
|
-
static { this.PROBLEMS_PANEL_CONFIGURATION_TITLE = ( localize(
|
|
7
|
+
static { this.MARKERS_PANEL_TOGGLE_LABEL = ( localize(7720, "Toggle Problems (Errors, Warnings, Infos)")); }
|
|
8
|
+
static { this.MARKERS_PANEL_SHOW_LABEL = ( localize2(7721, "Focus Problems (Errors, Warnings, Infos)")); }
|
|
9
|
+
static { this.PROBLEMS_PANEL_CONFIGURATION_TITLE = ( localize(7722, "Problems View")); }
|
|
10
10
|
static { this.PROBLEMS_PANEL_CONFIGURATION_AUTO_REVEAL = ( localize(
|
|
11
|
-
|
|
11
|
+
7723,
|
|
12
12
|
"Controls whether Problems view should automatically reveal files when opening them."
|
|
13
13
|
)); }
|
|
14
|
-
static { this.PROBLEMS_PANEL_CONFIGURATION_VIEW_MODE = ( localize(
|
|
15
|
-
static { this.PROBLEMS_PANEL_CONFIGURATION_SHOW_CURRENT_STATUS = ( localize(
|
|
16
|
-
static { this.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER = ( localize(
|
|
17
|
-
static { this.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER_SEVERITY = ( localize(
|
|
18
|
-
static { this.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER_POSITION = ( localize(
|
|
19
|
-
static { this.MARKERS_PANEL_TITLE_PROBLEMS = ( localize2(
|
|
20
|
-
static { this.MARKERS_PANEL_NO_PROBLEMS_BUILT = ( localize(
|
|
21
|
-
static { this.MARKERS_PANEL_NO_PROBLEMS_ACTIVE_FILE_BUILT = ( localize(
|
|
22
|
-
static { this.MARKERS_PANEL_NO_PROBLEMS_FILTERS = ( localize(
|
|
23
|
-
static { this.MARKERS_PANEL_ACTION_TOOLTIP_MORE_FILTERS = ( localize(
|
|
24
|
-
static { this.MARKERS_PANEL_FILTER_LABEL_SHOW_ERRORS = ( localize(
|
|
25
|
-
static { this.MARKERS_PANEL_FILTER_LABEL_SHOW_WARNINGS = ( localize(
|
|
26
|
-
static { this.MARKERS_PANEL_FILTER_LABEL_SHOW_INFOS = ( localize(
|
|
27
|
-
static { this.MARKERS_PANEL_FILTER_LABEL_EXCLUDED_FILES = ( localize(
|
|
28
|
-
static { this.MARKERS_PANEL_FILTER_LABEL_ACTIVE_FILE = ( localize(
|
|
29
|
-
static { this.MARKERS_PANEL_ACTION_TOOLTIP_FILTER = ( localize(
|
|
30
|
-
static { this.MARKERS_PANEL_ACTION_TOOLTIP_QUICKFIX = ( localize(
|
|
31
|
-
static { this.MARKERS_PANEL_FILTER_ARIA_LABEL = ( localize(
|
|
32
|
-
static { this.MARKERS_PANEL_FILTER_PLACEHOLDER = ( localize(
|
|
33
|
-
static { this.MARKERS_PANEL_FILTER_ERRORS = ( localize(
|
|
34
|
-
static { this.MARKERS_PANEL_FILTER_WARNINGS = ( localize(
|
|
35
|
-
static { this.MARKERS_PANEL_FILTER_INFOS = ( localize(
|
|
36
|
-
static { this.MARKERS_PANEL_SINGLE_ERROR_LABEL = ( localize(
|
|
37
|
-
static { this.MARKERS_PANEL_MULTIPLE_ERRORS_LABEL = (noOfErrors) => { return localize(
|
|
38
|
-
static { this.MARKERS_PANEL_SINGLE_WARNING_LABEL = ( localize(
|
|
39
|
-
static { this.MARKERS_PANEL_MULTIPLE_WARNINGS_LABEL = (noOfWarnings) => { return localize(
|
|
40
|
-
static { this.MARKERS_PANEL_SINGLE_INFO_LABEL = ( localize(
|
|
41
|
-
static { this.MARKERS_PANEL_MULTIPLE_INFOS_LABEL = (noOfInfos) => { return localize(
|
|
42
|
-
static { this.MARKERS_PANEL_SINGLE_UNKNOWN_LABEL = ( localize(
|
|
43
|
-
static { this.MARKERS_PANEL_MULTIPLE_UNKNOWNS_LABEL = (noOfUnknowns) => { return localize(
|
|
44
|
-
static { this.MARKERS_PANEL_AT_LINE_COL_NUMBER = (ln, col) => { return localize(
|
|
14
|
+
static { this.PROBLEMS_PANEL_CONFIGURATION_VIEW_MODE = ( localize(7724, "Controls the default view mode of the Problems view.")); }
|
|
15
|
+
static { this.PROBLEMS_PANEL_CONFIGURATION_SHOW_CURRENT_STATUS = ( localize(7725, "When enabled shows the current problem in the status bar.")); }
|
|
16
|
+
static { this.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER = ( localize(7726, "Controls the order in which problems are navigated.")); }
|
|
17
|
+
static { this.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER_SEVERITY = ( localize(7727, "Navigate problems ordered by severity")); }
|
|
18
|
+
static { this.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER_POSITION = ( localize(7728, "Navigate problems ordered by position")); }
|
|
19
|
+
static { this.MARKERS_PANEL_TITLE_PROBLEMS = ( localize2(7729, "Problems")); }
|
|
20
|
+
static { this.MARKERS_PANEL_NO_PROBLEMS_BUILT = ( localize(7730, "No problems have been detected in the workspace.")); }
|
|
21
|
+
static { this.MARKERS_PANEL_NO_PROBLEMS_ACTIVE_FILE_BUILT = ( localize(7731, "No problems have been detected in the current file.")); }
|
|
22
|
+
static { this.MARKERS_PANEL_NO_PROBLEMS_FILTERS = ( localize(7732, "No results found with provided filter criteria.")); }
|
|
23
|
+
static { this.MARKERS_PANEL_ACTION_TOOLTIP_MORE_FILTERS = ( localize(7733, "More Filters...")); }
|
|
24
|
+
static { this.MARKERS_PANEL_FILTER_LABEL_SHOW_ERRORS = ( localize(7734, "Show Errors")); }
|
|
25
|
+
static { this.MARKERS_PANEL_FILTER_LABEL_SHOW_WARNINGS = ( localize(7735, "Show Warnings")); }
|
|
26
|
+
static { this.MARKERS_PANEL_FILTER_LABEL_SHOW_INFOS = ( localize(7736, "Show Infos")); }
|
|
27
|
+
static { this.MARKERS_PANEL_FILTER_LABEL_EXCLUDED_FILES = ( localize(7737, "Hide Excluded Files")); }
|
|
28
|
+
static { this.MARKERS_PANEL_FILTER_LABEL_ACTIVE_FILE = ( localize(7738, "Show Active File Only")); }
|
|
29
|
+
static { this.MARKERS_PANEL_ACTION_TOOLTIP_FILTER = ( localize(7739, "Filter Problems")); }
|
|
30
|
+
static { this.MARKERS_PANEL_ACTION_TOOLTIP_QUICKFIX = ( localize(7740, "Show fixes")); }
|
|
31
|
+
static { this.MARKERS_PANEL_FILTER_ARIA_LABEL = ( localize(7741, "Filter Problems")); }
|
|
32
|
+
static { this.MARKERS_PANEL_FILTER_PLACEHOLDER = ( localize(7742, "Filter (e.g. text, **/*.ts, !**/node_modules/**)")); }
|
|
33
|
+
static { this.MARKERS_PANEL_FILTER_ERRORS = ( localize(7743, "errors")); }
|
|
34
|
+
static { this.MARKERS_PANEL_FILTER_WARNINGS = ( localize(7744, "warnings")); }
|
|
35
|
+
static { this.MARKERS_PANEL_FILTER_INFOS = ( localize(7745, "infos")); }
|
|
36
|
+
static { this.MARKERS_PANEL_SINGLE_ERROR_LABEL = ( localize(7746, "1 Error")); }
|
|
37
|
+
static { this.MARKERS_PANEL_MULTIPLE_ERRORS_LABEL = (noOfErrors) => { return localize(7747, "{0} Errors", '' + noOfErrors); }; }
|
|
38
|
+
static { this.MARKERS_PANEL_SINGLE_WARNING_LABEL = ( localize(7748, "1 Warning")); }
|
|
39
|
+
static { this.MARKERS_PANEL_MULTIPLE_WARNINGS_LABEL = (noOfWarnings) => { return localize(7749, "{0} Warnings", '' + noOfWarnings); }; }
|
|
40
|
+
static { this.MARKERS_PANEL_SINGLE_INFO_LABEL = ( localize(7750, "1 Info")); }
|
|
41
|
+
static { this.MARKERS_PANEL_MULTIPLE_INFOS_LABEL = (noOfInfos) => { return localize(7751, "{0} Infos", '' + noOfInfos); }; }
|
|
42
|
+
static { this.MARKERS_PANEL_SINGLE_UNKNOWN_LABEL = ( localize(7752, "1 Unknown")); }
|
|
43
|
+
static { this.MARKERS_PANEL_MULTIPLE_UNKNOWNS_LABEL = (noOfUnknowns) => { return localize(7753, "{0} Unknowns", '' + noOfUnknowns); }; }
|
|
44
|
+
static { this.MARKERS_PANEL_AT_LINE_COL_NUMBER = (ln, col) => { return localize(7754, "[Ln {0}, Col {1}]", '' + ln, '' + col); }; }
|
|
45
45
|
static { this.MARKERS_TREE_ARIA_LABEL_RESOURCE = (noOfProblems, fileName, folder) => { return localize(
|
|
46
|
-
|
|
46
|
+
7755,
|
|
47
47
|
"{0} problems in file {1} of folder {2}",
|
|
48
48
|
noOfProblems,
|
|
49
49
|
fileName,
|
|
@@ -51,14 +51,14 @@ class Messages {
|
|
|
51
51
|
); }; }
|
|
52
52
|
static { this.MARKERS_TREE_ARIA_LABEL_MARKER = (marker) => {
|
|
53
53
|
const relatedInformationMessage = marker.relatedInformation.length ? ( localize(
|
|
54
|
-
|
|
54
|
+
7756,
|
|
55
55
|
" This problem has references to {0} locations.",
|
|
56
56
|
marker.relatedInformation.length
|
|
57
57
|
)) : '';
|
|
58
58
|
switch (marker.marker.severity) {
|
|
59
59
|
case MarkerSeverity.Error:
|
|
60
60
|
return marker.marker.source ? ( localize(
|
|
61
|
-
|
|
61
|
+
7757,
|
|
62
62
|
"Error: {0} at line {1} and character {2}.{3} generated by {4}",
|
|
63
63
|
marker.marker.message,
|
|
64
64
|
marker.marker.startLineNumber,
|
|
@@ -67,7 +67,7 @@ class Messages {
|
|
|
67
67
|
marker.marker.source
|
|
68
68
|
))
|
|
69
69
|
: ( localize(
|
|
70
|
-
|
|
70
|
+
7758,
|
|
71
71
|
"Error: {0} at line {1} and character {2}.{3}",
|
|
72
72
|
marker.marker.message,
|
|
73
73
|
marker.marker.startLineNumber,
|
|
@@ -76,7 +76,7 @@ class Messages {
|
|
|
76
76
|
));
|
|
77
77
|
case MarkerSeverity.Warning:
|
|
78
78
|
return marker.marker.source ? ( localize(
|
|
79
|
-
|
|
79
|
+
7759,
|
|
80
80
|
"Warning: {0} at line {1} and character {2}.{3} generated by {4}",
|
|
81
81
|
marker.marker.message,
|
|
82
82
|
marker.marker.startLineNumber,
|
|
@@ -85,7 +85,7 @@ class Messages {
|
|
|
85
85
|
marker.marker.source
|
|
86
86
|
))
|
|
87
87
|
: ( localize(
|
|
88
|
-
|
|
88
|
+
7760,
|
|
89
89
|
"Warning: {0} at line {1} and character {2}.{3}",
|
|
90
90
|
marker.marker.message,
|
|
91
91
|
marker.marker.startLineNumber,
|
|
@@ -95,7 +95,7 @@ class Messages {
|
|
|
95
95
|
));
|
|
96
96
|
case MarkerSeverity.Info:
|
|
97
97
|
return marker.marker.source ? ( localize(
|
|
98
|
-
|
|
98
|
+
7761,
|
|
99
99
|
"Info: {0} at line {1} and character {2}.{3} generated by {4}",
|
|
100
100
|
marker.marker.message,
|
|
101
101
|
marker.marker.startLineNumber,
|
|
@@ -104,7 +104,7 @@ class Messages {
|
|
|
104
104
|
marker.marker.source
|
|
105
105
|
))
|
|
106
106
|
: ( localize(
|
|
107
|
-
|
|
107
|
+
7762,
|
|
108
108
|
"Info: {0} at line {1} and character {2}.{3}",
|
|
109
109
|
marker.marker.message,
|
|
110
110
|
marker.marker.startLineNumber,
|
|
@@ -113,7 +113,7 @@ class Messages {
|
|
|
113
113
|
));
|
|
114
114
|
default:
|
|
115
115
|
return marker.marker.source ? ( localize(
|
|
116
|
-
|
|
116
|
+
7763,
|
|
117
117
|
"Problem: {0} at line {1} and character {2}.{3} generated by {4}",
|
|
118
118
|
marker.marker.source,
|
|
119
119
|
marker.marker.message,
|
|
@@ -123,7 +123,7 @@ class Messages {
|
|
|
123
123
|
marker.marker.source
|
|
124
124
|
))
|
|
125
125
|
: ( localize(
|
|
126
|
-
|
|
126
|
+
7764,
|
|
127
127
|
"Problem: {0} at line {1} and character {2}.{3}",
|
|
128
128
|
marker.marker.message,
|
|
129
129
|
marker.marker.startLineNumber,
|
|
@@ -133,14 +133,14 @@ class Messages {
|
|
|
133
133
|
}
|
|
134
134
|
}; }
|
|
135
135
|
static { this.MARKERS_TREE_ARIA_LABEL_RELATED_INFORMATION = (relatedInformation) => ( localize(
|
|
136
|
-
|
|
136
|
+
7765,
|
|
137
137
|
"{0} at line {1} and character {2} in {3}",
|
|
138
138
|
relatedInformation.message,
|
|
139
139
|
relatedInformation.startLineNumber,
|
|
140
140
|
relatedInformation.startColumn,
|
|
141
141
|
basename(relatedInformation.resource)
|
|
142
142
|
)); }
|
|
143
|
-
static { this.SHOW_ERRORS_WARNINGS_ACTION_LABEL = ( localize(
|
|
143
|
+
static { this.SHOW_ERRORS_WARNINGS_ACTION_LABEL = ( localize(7766, "Show Errors and Warnings")); }
|
|
144
144
|
}
|
|
145
145
|
|
|
146
146
|
export { Messages as default };
|