@codingame/monaco-vscode-markers-service-override 4.5.0 → 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.
@@ -43,16 +43,13 @@ import Severity$1 from 'vscode/vscode/vs/base/common/severity';
43
43
  import { setupCustomHover } from 'vscode/vscode/vs/base/browser/ui/hover/updatableHoverWidget';
44
44
  import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
45
45
 
46
+ const _moduleId = "vs/workbench/contrib/markers/browser/markersTreeViewer";
46
47
  let MarkersWidgetAccessibilityProvider = class MarkersWidgetAccessibilityProvider {
47
48
  constructor(labelService) {
48
49
  this.labelService = labelService;
49
50
  }
50
51
  getWidgetAriaLabel() {
51
- return ( localizeWithPath(
52
- 'vs/workbench/contrib/markers/browser/markersTreeViewer',
53
- 'problemsView',
54
- "Problems View"
55
- ));
52
+ return ( localizeWithPath(_moduleId, 0, "Problems View"));
56
53
  }
57
54
  getAriaLabel(element) {
58
55
  if (element instanceof ResourceMarkers) {
@@ -68,9 +65,9 @@ let MarkersWidgetAccessibilityProvider = class MarkersWidgetAccessibilityProvide
68
65
  return null;
69
66
  }
70
67
  };
71
- MarkersWidgetAccessibilityProvider = ( __decorate([
72
- ( __param(0, ILabelService))
73
- ], MarkersWidgetAccessibilityProvider));
68
+ MarkersWidgetAccessibilityProvider = ( (__decorate([
69
+ ( (__param(0, ILabelService)))
70
+ ], MarkersWidgetAccessibilityProvider)));
74
71
  class VirtualDelegate {
75
72
  static { this.LINE_HEIGHT = 22; }
76
73
  constructor(markersViewState) {
@@ -101,8 +98,8 @@ let ResourceMarkersRenderer = class ResourceMarkersRenderer {
101
98
  this.labels = labels;
102
99
  this.labelService = labelService;
103
100
  this.fileService = fileService;
104
- this.renderedNodes = ( new Map());
105
- this.disposables = ( new DisposableStore());
101
+ this.renderedNodes = ( (new Map()));
102
+ this.disposables = ( (new DisposableStore()));
106
103
  this.templateId = "rm" ;
107
104
  onDidChangeRenderNodeCount(this.onDidChangeRenderNodeCount, this, this.disposables);
108
105
  }
@@ -110,7 +107,7 @@ let ResourceMarkersRenderer = class ResourceMarkersRenderer {
110
107
  const resourceLabelContainer = append(container, $('.resource-label-container'));
111
108
  const resourceLabel = this.labels.create(resourceLabelContainer, { supportHighlights: true });
112
109
  const badgeWrapper = append(container, $('.count-badge-wrapper'));
113
- const count = ( new CountBadge(badgeWrapper, {}, defaultCountBadgeStyles));
110
+ const count = ( (new CountBadge(badgeWrapper, {}, defaultCountBadgeStyles)));
114
111
  return { count, resourceLabel };
115
112
  }
116
113
  renderElement(node, _, templateData) {
@@ -130,7 +127,7 @@ let ResourceMarkersRenderer = class ResourceMarkersRenderer {
130
127
  const nodeRenders = this.renderedNodes.get(node.element) ?? [];
131
128
  const nodeRenderIndex = nodeRenders.findIndex(nodeRender => templateData === nodeRender);
132
129
  if (nodeRenderIndex < 0) {
133
- throw new Error('Disposing unknown resource marker');
130
+ throw ( (new Error('Disposing unknown resource marker')));
134
131
  }
135
132
  if (nodeRenders.length === 1) {
136
133
  this.renderedNodes.delete(node.element);
@@ -156,10 +153,10 @@ let ResourceMarkersRenderer = class ResourceMarkersRenderer {
156
153
  this.disposables.dispose();
157
154
  }
158
155
  };
159
- ResourceMarkersRenderer = ( __decorate([
160
- ( __param(2, ILabelService)),
161
- ( __param(3, IFileService))
162
- ], ResourceMarkersRenderer));
156
+ ResourceMarkersRenderer = ( (__decorate([
157
+ ( (__param(2, ILabelService))),
158
+ ( (__param(3, IFileService)))
159
+ ], ResourceMarkersRenderer)));
163
160
  let MarkerRenderer = class MarkerRenderer {
164
161
  constructor(markersViewState, instantiationService, openerService) {
165
162
  this.markersViewState = markersViewState;
@@ -169,12 +166,12 @@ let MarkerRenderer = class MarkerRenderer {
169
166
  }
170
167
  renderTemplate(container) {
171
168
  const data = Object.create(null);
172
- data.markerWidget = ( new MarkerWidget(
169
+ data.markerWidget = ( (new MarkerWidget(
173
170
  container,
174
171
  this.markersViewState,
175
172
  this.openerService,
176
173
  this.instantiationService
177
- ));
174
+ )));
178
175
  return data;
179
176
  }
180
177
  renderElement(node, _, templateData) {
@@ -184,18 +181,18 @@ let MarkerRenderer = class MarkerRenderer {
184
181
  templateData.markerWidget.dispose();
185
182
  }
186
183
  };
187
- MarkerRenderer = ( __decorate([
188
- ( __param(1, IInstantiationService)),
189
- ( __param(2, IOpenerService))
190
- ], MarkerRenderer));
184
+ MarkerRenderer = ( (__decorate([
185
+ ( (__param(1, IInstantiationService))),
186
+ ( (__param(2, IOpenerService)))
187
+ ], MarkerRenderer)));
191
188
  const expandedIcon = registerIcon('markers-view-multi-line-expanded', Codicon.chevronUp, ( localizeWithPath(
192
- 'vs/workbench/contrib/markers/browser/markersTreeViewer',
193
- 'expandedIcon',
189
+ _moduleId,
190
+ 1,
194
191
  'Icon indicating that multiple lines are shown in the markers view.'
195
192
  )));
196
193
  const collapsedIcon = registerIcon('markers-view-multi-line-collapsed', Codicon.chevronDown, ( localizeWithPath(
197
- 'vs/workbench/contrib/markers/browser/markersTreeViewer',
198
- 'collapsedIcon',
194
+ _moduleId,
195
+ 2,
199
196
  'Icon indicating that multiple lines are collapsed in the markers view.'
200
197
  )));
201
198
  const toggleMultilineAction = 'problems.action.toggleMultiline';
@@ -218,10 +215,10 @@ class MarkerWidget extends Disposable {
218
215
  this.parent = parent;
219
216
  this.markersViewModel = markersViewModel;
220
217
  this._openerService = _openerService;
221
- this.disposables = this._register(( new DisposableStore()));
222
- this.actionBar = this._register(( new ActionBar(append(parent, $('.actions')), {
218
+ this.disposables = this._register(( (new DisposableStore())));
219
+ this.actionBar = this._register(( (new ActionBar(append(parent, $('.actions')), {
223
220
  actionViewItemProvider: (action, options) => action.id === QuickFixAction.ID ? _instantiationService.createInstance(QuickFixActionViewItem, action, options) : undefined
224
- })));
221
+ }))));
225
222
  this.iconContainer = append(parent, $(''));
226
223
  this.icon = append(this.iconContainer, $(''));
227
224
  this.messageAndDetailsContainer = append(parent, $('.marker-message-details-container'));
@@ -231,7 +228,7 @@ class MarkerWidget extends Disposable {
231
228
  this.actionBar.clear();
232
229
  this.disposables.clear();
233
230
  clearNode(this.messageAndDetailsContainer);
234
- this.iconContainer.className = `marker-icon ${( Severity$1.toString(MarkerSeverity.toSeverity(element.marker.severity)))}`;
231
+ this.iconContainer.className = `marker-icon ${( (Severity$1.toString(MarkerSeverity.toSeverity(element.marker.severity))))}`;
235
232
  this.icon.className = `codicon ${SeverityIcon.className(MarkerSeverity.toSeverity(element.marker.severity))}`;
236
233
  this.renderQuickfixActionbar(element);
237
234
  this.renderMessageAndDetails(element, filterData);
@@ -258,28 +255,22 @@ class MarkerWidget extends Disposable {
258
255
  }
259
256
  }
260
257
  renderMultilineActionbar(marker, parent) {
261
- const multilineActionbar = this.disposables.add(( new ActionBar(append(parent, $('.multiline-actions')), {
258
+ const multilineActionbar = this.disposables.add(( (new ActionBar(append(parent, $('.multiline-actions')), {
262
259
  actionViewItemProvider: (action, options) => {
263
260
  if (action.id === toggleMultilineAction) {
264
- return ( new ToggleMultilineActionViewItem(undefined, action, { ...options, icon: true }));
261
+ return (
262
+ (new ToggleMultilineActionViewItem(undefined, action, { ...options, icon: true }))
263
+ );
265
264
  }
266
265
  return undefined;
267
266
  }
268
- })));
267
+ }))));
269
268
  this.disposables.add(toDisposable(() => multilineActionbar.dispose()));
270
269
  const viewModel = this.markersViewModel.getViewModel(marker);
271
270
  const multiline = viewModel && viewModel.multiline;
272
- const action = ( new Action(toggleMultilineAction));
271
+ const action = ( (new Action(toggleMultilineAction)));
273
272
  action.enabled = !!viewModel && marker.lines.length > 1;
274
- action.tooltip = multiline ? ( localizeWithPath(
275
- 'vs/workbench/contrib/markers/browser/markersTreeViewer',
276
- 'single line',
277
- "Show message in single line"
278
- )) : ( localizeWithPath(
279
- 'vs/workbench/contrib/markers/browser/markersTreeViewer',
280
- 'multi line',
281
- "Show message in multiple lines"
282
- ));
273
+ action.tooltip = multiline ? ( localizeWithPath(_moduleId, 3, "Show message in single line")) : ( localizeWithPath(_moduleId, 4, "Show message in multiple lines"));
283
274
  action.class = ThemeIcon.asClassName(multiline ? expandedIcon : collapsedIcon);
284
275
  action.run = () => { if (viewModel) {
285
276
  viewModel.multiline = !viewModel.multiline;
@@ -296,7 +287,7 @@ class MarkerWidget extends Disposable {
296
287
  for (let index = 0; index < (multiline ? lines.length : 1); index++) {
297
288
  const lineElement = append(this.messageAndDetailsContainer, $('.marker-message-line'));
298
289
  const messageElement = append(lineElement, $('.marker-message'));
299
- const highlightedLabel = this.disposables.add(( new HighlightedLabel(messageElement)));
290
+ const highlightedLabel = this.disposables.add(( (new HighlightedLabel(messageElement))));
300
291
  highlightedLabel.set(lines[index].length > 1000 ? `${lines[index].substring(0, 1000)}...` : lines[index], lineMatches[index]);
301
292
  if (lines[index] === '') {
302
293
  lineElement.style.height = `${VirtualDelegate.LINE_HEIGHT}px`;
@@ -309,25 +300,25 @@ class MarkerWidget extends Disposable {
309
300
  renderDetails(marker, filterData, parent) {
310
301
  parent.classList.add('details-container');
311
302
  if (marker.source || marker.code) {
312
- const source = this.disposables.add(( new HighlightedLabel(append(parent, $('.marker-source')))));
303
+ const source = this.disposables.add(( (new HighlightedLabel(append(parent, $('.marker-source'))))));
313
304
  const sourceMatches = filterData && filterData.sourceMatches || [];
314
305
  source.set(marker.source, sourceMatches);
315
306
  if (marker.code) {
316
307
  if (typeof marker.code === 'string') {
317
- const code = this.disposables.add(( new HighlightedLabel(append(parent, $('.marker-code')))));
308
+ const code = this.disposables.add(( (new HighlightedLabel(append(parent, $('.marker-code'))))));
318
309
  const codeMatches = filterData && filterData.codeMatches || [];
319
310
  code.set(marker.code, codeMatches);
320
311
  }
321
312
  else {
322
313
  const container = $('.marker-code');
323
- const code = this.disposables.add(( new HighlightedLabel(container)));
324
- const link = ( marker.code.target.toString(true));
325
- this.disposables.add(( new Link(
314
+ const code = this.disposables.add(( (new HighlightedLabel(container))));
315
+ const link = ( (marker.code.target.toString(true)));
316
+ this.disposables.add(( (new Link(
326
317
  parent,
327
318
  { href: link, label: container, title: link },
328
319
  undefined,
329
320
  this._openerService
330
- )));
321
+ ))));
331
322
  const codeMatches = filterData && filterData.codeMatches || [];
332
323
  code.set(marker.code.value, codeMatches);
333
324
  }
@@ -346,12 +337,12 @@ let RelatedInformationRenderer = class RelatedInformationRenderer {
346
337
  const data = Object.create(null);
347
338
  append(container, $('.actions'));
348
339
  append(container, $('.icon'));
349
- data.resourceLabel = ( new HighlightedLabel(append(container, $('.related-info-resource'))));
340
+ data.resourceLabel = ( (new HighlightedLabel(append(container, $('.related-info-resource')))));
350
341
  data.lnCol = append(container, $('span.marker-line'));
351
342
  const separator = append(container, $('span.related-info-resource-separator'));
352
343
  separator.textContent = ':';
353
344
  separator.style.paddingRight = '4px';
354
- data.description = ( new HighlightedLabel(append(container, $('.marker-description'))));
345
+ data.description = ( (new HighlightedLabel(append(container, $('.marker-description')))));
355
346
  return data;
356
347
  }
357
348
  renderElement(node, _, templateData) {
@@ -368,9 +359,9 @@ let RelatedInformationRenderer = class RelatedInformationRenderer {
368
359
  templateData.description.dispose();
369
360
  }
370
361
  };
371
- RelatedInformationRenderer = ( __decorate([
372
- ( __param(0, ILabelService))
373
- ], RelatedInformationRenderer));
362
+ RelatedInformationRenderer = ( (__decorate([
363
+ ( (__param(0, ILabelService)))
364
+ ], RelatedInformationRenderer)));
374
365
  class Filter {
375
366
  constructor(options) {
376
367
  this.options = options;
@@ -387,7 +378,7 @@ class Filter {
387
378
  }
388
379
  }
389
380
  filterResourceMarkers(resourceMarkers) {
390
- if (( unsupportedSchemas.has(resourceMarkers.resource.scheme))) {
381
+ if (( (unsupportedSchemas.has(resourceMarkers.resource.scheme)))) {
391
382
  return false;
392
383
  }
393
384
  if (this.options.excludesMatcher.matches(resourceMarkers.resource)) {
@@ -421,7 +412,7 @@ class Filter {
421
412
  }
422
413
  const sourceMatches = marker.marker.source ? FilterOptions._filter(this.options.textFilter.text, marker.marker.source) : undefined;
423
414
  const codeMatches = marker.marker.code ? FilterOptions._filter(this.options.textFilter.text, typeof marker.marker.code === 'string' ? marker.marker.code : marker.marker.code.value) : undefined;
424
- const matched = sourceMatches || codeMatches || ( lineMatches.some(lineMatch => lineMatch.length > 0));
415
+ const matched = sourceMatches || codeMatches || ( (lineMatches.some(lineMatch => lineMatch.length > 0)));
425
416
  if (matched && !this.options.textFilter.negate) {
426
417
  return { visibility: true, data: { type: 1 , lineMatches, sourceMatches: sourceMatches || [], codeMatches: codeMatches || [] } };
427
418
  }
@@ -460,7 +451,7 @@ let MarkerViewModel = class MarkerViewModel extends Disposable {
460
451
  this.instantiationService = instantiationService;
461
452
  this.editorService = editorService;
462
453
  this.languageFeaturesService = languageFeaturesService;
463
- this._onDidChange = this._register(( new Emitter()));
454
+ this._onDidChange = this._register(( (new Emitter())));
464
455
  this.onDidChange = this._onDidChange.event;
465
456
  this.modelPromise = null;
466
457
  this.codeActionsPromise = null;
@@ -507,12 +498,12 @@ let MarkerViewModel = class MarkerViewModel extends Disposable {
507
498
  if (model) {
508
499
  if (!this.codeActionsPromise) {
509
500
  this.codeActionsPromise = createCancelablePromise(cancellationToken => {
510
- return getCodeActions(this.languageFeaturesService.codeActionProvider, model, ( new Range(
501
+ return getCodeActions(this.languageFeaturesService.codeActionProvider, model, ( (new Range(
511
502
  this.marker.range.startLineNumber,
512
503
  this.marker.range.startColumn,
513
504
  this.marker.range.endLineNumber,
514
505
  this.marker.range.endColumn
515
- )), {
506
+ ))), {
516
507
  type: 1 , triggerAction: CodeActionTriggerSource.ProblemsView, filter: { include: CodeActionKind.QuickFix }
517
508
  }, Progress.None, cancellationToken).then(actions => {
518
509
  return this._register(actions);
@@ -525,16 +516,18 @@ let MarkerViewModel = class MarkerViewModel extends Disposable {
525
516
  });
526
517
  }
527
518
  toActions(codeActions) {
528
- return ( codeActions.validActions.map(item => ( new Action(
529
- item.action.command ? item.action.command.id : item.action.title,
530
- item.action.title,
531
- undefined,
532
- true,
533
- () => {
534
- return this.openFileAtMarker(this.marker)
535
- .then(() => this.instantiationService.invokeFunction(applyCodeAction, item, ApplyCodeActionReason.FromProblemsView));
536
- }
537
- ))));
519
+ return (
520
+ (codeActions.validActions.map(item => ( (new Action(
521
+ item.action.command ? item.action.command.id : item.action.title,
522
+ item.action.title,
523
+ undefined,
524
+ true,
525
+ () => {
526
+ return this.openFileAtMarker(this.marker)
527
+ .then(() => this.instantiationService.invokeFunction(applyCodeAction, item, ApplyCodeActionReason.FromProblemsView));
528
+ }
529
+ )))))
530
+ );
538
531
  }
539
532
  openFileAtMarker(element) {
540
533
  const { resource, selection } = { resource: element.resource, selection: element.range };
@@ -556,13 +549,15 @@ let MarkerViewModel = class MarkerViewModel extends Disposable {
556
549
  if (waitForModel) {
557
550
  if (!this.modelPromise) {
558
551
  this.modelPromise = createCancelablePromise(cancellationToken => {
559
- return ( new Promise((c) => {
560
- this._register(this.modelService.onModelAdded(model => {
561
- if (isEqual(model.uri, this.marker.resource)) {
562
- c(model);
563
- }
564
- }));
565
- }));
552
+ return (
553
+ (new Promise((c) => {
554
+ this._register(this.modelService.onModelAdded(model => {
555
+ if (isEqual(model.uri, this.marker.resource)) {
556
+ c(model);
557
+ }
558
+ }));
559
+ }))
560
+ );
566
561
  });
567
562
  }
568
563
  return this.modelPromise;
@@ -570,26 +565,26 @@ let MarkerViewModel = class MarkerViewModel extends Disposable {
570
565
  return Promise.resolve(null);
571
566
  }
572
567
  };
573
- MarkerViewModel = ( __decorate([
574
- ( __param(1, IModelService)),
575
- ( __param(2, IInstantiationService)),
576
- ( __param(3, IEditorService)),
577
- ( __param(4, ILanguageFeaturesService))
578
- ], MarkerViewModel));
568
+ MarkerViewModel = ( (__decorate([
569
+ ( (__param(1, IModelService))),
570
+ ( (__param(2, IInstantiationService))),
571
+ ( (__param(3, IEditorService))),
572
+ ( (__param(4, ILanguageFeaturesService)))
573
+ ], MarkerViewModel)));
579
574
  let MarkersViewModel = class MarkersViewModel extends Disposable {
580
575
  constructor(multiline = true, viewMode = "tree" , contextKeyService, instantiationService) {
581
576
  super();
582
577
  this.contextKeyService = contextKeyService;
583
578
  this.instantiationService = instantiationService;
584
- this._onDidChange = this._register(( new Emitter()));
579
+ this._onDidChange = this._register(( (new Emitter())));
585
580
  this.onDidChange = this._onDidChange.event;
586
- this._onDidChangeViewMode = this._register(( new Emitter()));
581
+ this._onDidChangeViewMode = this._register(( (new Emitter())));
587
582
  this.onDidChangeViewMode = this._onDidChangeViewMode.event;
588
- this.markersViewStates = ( new Map());
589
- this.markersPerResource = ( new Map());
583
+ this.markersViewStates = ( (new Map()));
584
+ this.markersPerResource = ( (new Map()));
590
585
  this.bulkUpdate = false;
591
586
  this.hoveredMarker = null;
592
- this.hoverDelayer = ( new Delayer(300));
587
+ this.hoverDelayer = ( (new Delayer(300)));
593
588
  this._multiline = true;
594
589
  this._viewMode = "tree" ;
595
590
  this._multiline = multiline;
@@ -598,7 +593,7 @@ let MarkersViewModel = class MarkersViewModel extends Disposable {
598
593
  this.viewModeContextKey.set(viewMode);
599
594
  }
600
595
  add(marker) {
601
- if (!( this.markersViewStates.has(marker.id))) {
596
+ if (!( (this.markersViewStates.has(marker.id)))) {
602
597
  const viewModel = this.instantiationService.createInstance(MarkerViewModel, marker);
603
598
  const disposables = [viewModel];
604
599
  viewModel.multiline = this.multiline;
@@ -608,13 +603,13 @@ let MarkersViewModel = class MarkersViewModel extends Disposable {
608
603
  }
609
604
  }, this, disposables);
610
605
  this.markersViewStates.set(marker.id, { viewModel, disposables });
611
- const markers = this.markersPerResource.get(( marker.resource.toString())) || [];
606
+ const markers = this.markersPerResource.get(( (marker.resource.toString()))) || [];
612
607
  markers.push(marker);
613
- this.markersPerResource.set(( marker.resource.toString()), markers);
608
+ this.markersPerResource.set(( (marker.resource.toString())), markers);
614
609
  }
615
610
  }
616
611
  remove(resource) {
617
- const markers = this.markersPerResource.get(( resource.toString())) || [];
612
+ const markers = this.markersPerResource.get(( (resource.toString()))) || [];
618
613
  for (const marker of markers) {
619
614
  const value = this.markersViewStates.get(marker.id);
620
615
  if (value) {
@@ -625,7 +620,7 @@ let MarkersViewModel = class MarkersViewModel extends Disposable {
625
620
  this.hoveredMarker = null;
626
621
  }
627
622
  }
628
- this.markersPerResource.delete(( resource.toString()));
623
+ this.markersPerResource.delete(( (resource.toString())));
629
624
  }
630
625
  getViewModel(marker) {
631
626
  const value = this.markersViewStates.get(marker.id);
@@ -686,9 +681,9 @@ let MarkersViewModel = class MarkersViewModel extends Disposable {
686
681
  super.dispose();
687
682
  }
688
683
  };
689
- MarkersViewModel = ( __decorate([
690
- ( __param(2, IContextKeyService)),
691
- ( __param(3, IInstantiationService))
692
- ], MarkersViewModel));
684
+ MarkersViewModel = ( (__decorate([
685
+ ( (__param(2, IContextKeyService))),
686
+ ( (__param(3, IInstantiationService)))
687
+ ], MarkersViewModel)));
693
688
 
694
689
  export { Filter, MarkerRenderer, MarkerViewModel, MarkersViewModel, MarkersWidgetAccessibilityProvider, RelatedInformationRenderer, ResourceMarkersRenderer, VirtualDelegate };