@codingame/monaco-vscode-markers-service-override 25.1.2 → 26.0.0

package/vscode/src/vs/workbench/contrib/markers/browser/markersChatContext.js

@@ -20,8 +20,8 @@ let MarkerChatContextPick = class MarkerChatContextPick {
         this._markerService = _markerService;
         this._labelService = _labelService;
         this._editorService = _editorService;
-        this.type = 'pickerPick';
-        this.label = ( localize(8649, 'Problems...'));
+        this.type = "pickerPick";
+        this.label = ( localize(8956, "Problems..."));
         this.icon = Codicon.error;
         this.ordinal = -100;
     }
@@ -30,14 +30,16 @@ let MarkerChatContextPick = class MarkerChatContextPick {
     }
     asPicker() {
         return {
-            placeholder: ( localize(8650, 'Select a problem to attach')),
+            placeholder: ( localize(8957, "Select a problem to attach")),
             picks: picksWithPromiseFn(async (query, token) => {
                 return this.getPicksForQuery(query);
             })
         };
     }
     getPicksForQuery(query) {
-        const markers = this._markerService.read({ severities: MarkerSeverity.Error | MarkerSeverity.Warning | MarkerSeverity.Info });
+        const markers = this._markerService.read({
+            severities: MarkerSeverity.Error | MarkerSeverity.Warning | MarkerSeverity.Info
+        });
         const grouped = groupBy(markers, (a, b) => extUri.compare(a.resource, b.resource));
         const activeEditorUri = EditorResourceAccessor.getCanonicalUri(this._editorService.activeEditor);
         const sortedGroups = grouped.sort((groupA, groupB) => {
@@ -60,18 +62,23 @@ let MarkerChatContextPick = class MarkerChatContextPick {
         for (const group of sortedGroups) {
             const resource = group[0].resource;
             const isActiveFile = activeEditorUri && extUri.isEqual(resource, activeEditorUri);
-            const fileLabel = this._labelService.getUriLabel(resource, { relative: true });
+            const fileLabel = this._labelService.getUriLabel(resource, {
+                relative: true
+            });
             const separatorLabel = isActiveFile ? `${fileLabel} (current file)` : fileLabel;
-            items.push({ type: 'separator', label: separatorLabel });
+            items.push({
+                type: "separator",
+                label: separatorLabel
+            });
             for (const marker of group) {
                 severities.add(marker.severity);
                 items.push({
                     label: marker.message,
                     description: ( localize(
-                        8651,
+                        8958,
                         "[Ln {0}, Col {1}]",
-                        '' + marker.startLineNumber,
-                        '' + marker.startColumn
+                        "" + marker.startLineNumber,
+                        "" + marker.startColumn
                     )),
                     asAttachment() {
                         return IDiagnosticVariableEntryFilterData.toEntry(IDiagnosticVariableEntryFilterData.fromMarker(marker));
@@ -80,31 +87,28 @@ let MarkerChatContextPick = class MarkerChatContextPick {
             }
         }
         items.unshift({
-            label: ( localize(8652, 'All Problems')),
+            label: ( localize(8959, "All Problems")),
             asAttachment() {
                 return IDiagnosticVariableEntryFilterData.toEntry({
                     filterSeverity: MarkerSeverity.Info
                 });
-            },
+            }
         });
         return items;
     }
 };
-MarkerChatContextPick = ( __decorate([
-    ( __param(0, IMarkerService)),
-    ( __param(1, ILabelService)),
-    ( __param(2, IEditorService))
-], MarkerChatContextPick));
+MarkerChatContextPick = ( __decorate([( __param(0, IMarkerService)), ( __param(1, ILabelService)), ( __param(2, IEditorService))], MarkerChatContextPick));
 let MarkerChatContextContribution = class MarkerChatContextContribution extends Disposable {
-    static { this.ID = 'workbench.contrib.chat.markerChatContextContribution'; }
+    static {
+        this.ID = "workbench.contrib.chat.markerChatContextContribution";
+    }
     constructor(contextPickService, instantiationService) {
         super();
-        this._store.add(contextPickService.registerChatContextItem(instantiationService.createInstance(MarkerChatContextPick)));
+        this._store.add(
+            contextPickService.registerChatContextItem(instantiationService.createInstance(MarkerChatContextPick))
+        );
     }
 };
-MarkerChatContextContribution = ( __decorate([
-    ( __param(0, IChatContextPickService)),
-    ( __param(1, IInstantiationService))
-], MarkerChatContextContribution));
+MarkerChatContextContribution = ( __decorate([( __param(0, IChatContextPickService)), ( __param(1, IInstantiationService))], MarkerChatContextContribution));
 
 export { MarkerChatContextContribution };

package/vscode/src/vs/workbench/contrib/markers/browser/markersFileDecorations.js

@@ -25,7 +25,7 @@ import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 class MarkersDecorationsProvider {
     constructor(_markerService) {
         this._markerService = _markerService;
-        this.label = ( localize(8653, "Problems"));
+        this.label = ( localize(8960, "Problems"));
         this.onDidChange = _markerService.onMarkerChanged;
     }
     provideDecorations(resource) {
@@ -45,9 +45,9 @@ class MarkersDecorationsProvider {
         return {
             weight: 100 * first.severity,
             bubble: true,
-            tooltip: markers.length === 1 ? ( localize(8654, "1 problem in this file")) : ( localize(8655, "{0} problems in this file", markers.length)),
-            letter: markers.length < 10 ? ( markers.length.toString()) : '9+',
-            color: first.severity === MarkerSeverity.Error ? listErrorForeground : listWarningForeground,
+            tooltip: markers.length === 1 ? ( localize(8961, "1 problem in this file")) : ( localize(8962, "{0} problems in this file", markers.length)),
+            letter: markers.length < 10 ? ( markers.length.toString()) : "9+",
+            color: first.severity === MarkerSeverity.Error ? listErrorForeground : listWarningForeground
         };
     }
 }
@@ -56,13 +56,11 @@ let MarkersFileDecorations = class MarkersFileDecorations {
         this._markerService = _markerService;
         this._decorationsService = _decorationsService;
         this._configurationService = _configurationService;
-        this._disposables = [
-            this._configurationService.onDidChangeConfiguration(e => {
-                if (e.affectsConfiguration('problems.visibility')) {
-                    this._updateEnablement();
-                }
-            }),
-        ];
+        this._disposables = [this._configurationService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration("problems.visibility")) {
+                this._updateEnablement();
+            }
+        })];
         this._updateEnablement();
     }
     dispose() {
@@ -70,11 +68,11 @@ let MarkersFileDecorations = class MarkersFileDecorations {
         dispose(this._disposables);
     }
     _updateEnablement() {
-        const problem = this._configurationService.getValue('problems.visibility');
+        const problem = this._configurationService.getValue("problems.visibility");
         if (problem === undefined) {
             return;
         }
-        const value = this._configurationService.getValue('problems');
+        const value = this._configurationService.getValue("problems");
         const shouldEnable = (problem && value.decorations.enabled);
         if (shouldEnable === this._enabled) {
             if (!problem || !value.decorations.enabled) {
@@ -87,32 +85,26 @@ let MarkersFileDecorations = class MarkersFileDecorations {
         if (this._enabled) {
             const provider = ( new MarkersDecorationsProvider(this._markerService));
             this._provider = this._decorationsService.registerDecorationsProvider(provider);
-        }
-        else if (this._provider) {
+        } else if (this._provider) {
             this._provider.dispose();
         }
     }
 };
-MarkersFileDecorations = ( __decorate([
-    ( __param(0, IMarkerService)),
-    ( __param(1, IDecorationsService)),
-    ( __param(2, IConfigurationService))
-], MarkersFileDecorations));
+MarkersFileDecorations = ( __decorate([( __param(0, IMarkerService)), ( __param(1, IDecorationsService)), ( __param(2, IConfigurationService))], MarkersFileDecorations));
 ( Registry.as(Extensions.Configuration)).registerConfiguration({
-    'id': 'problems',
-    'order': 101,
-    'type': 'object',
-    'properties': {
-        'problems.decorations.enabled': {
-            'markdownDescription': ( localize(
-                8656,
+    "id": "problems",
+    "order": 101,
+    "type": "object",
+    "properties": {
+        "problems.decorations.enabled": {
+            "markdownDescription": ( localize(
+                8963,
                 "Show Errors & Warnings on files and folder. Overwritten by {0} when it is off.",
-                '`#problems.visibility#`'
+                "`#problems.visibility#`"
             )),
-            'type': 'boolean',
-            'default': true
+            "type": "boolean",
+            "default": true
         }
     }
 });
-( Registry.as(Extensions$1.Workbench))
-    .registerWorkbenchContribution(MarkersFileDecorations, LifecyclePhase.Restored);
+( Registry.as(Extensions$1.Workbench)).registerWorkbenchContribution(MarkersFileDecorations, LifecyclePhase.Restored);

package/vscode/src/vs/workbench/contrib/markers/browser/markersFilterOptions.js

@@ -11,7 +11,10 @@ class ResourceGlobMatcher {
         this.globalExpression = parse(globalExpression);
         this.expressionsByRoot = TernarySearchTree.forUris(uri => uriIdentityService.extUri.ignorePathCasing(uri));
         for (const expression of rootExpressions) {
-            this.expressionsByRoot.set(expression.root, { root: expression.root, expression: parse(expression.expression) });
+            this.expressionsByRoot.set(expression.root, {
+                root: expression.root,
+                expression: parse(expression.expression)
+            });
         }
     }
     matches(resource) {
@@ -26,10 +29,23 @@ class ResourceGlobMatcher {
     }
 }
 class FilterOptions {
-    static { this._filter = matchesFuzzy2; }
-    static { this._messageFilter = matchesFuzzy; }
-    static EMPTY(uriIdentityService) { return ( new FilterOptions('', [], false, false, false, uriIdentityService)); }
-    constructor(filter, filesExclude, showWarnings, showErrors, showInfos, uriIdentityService) {
+    static {
+        this._filter = matchesFuzzy2;
+    }
+    static {
+        this._messageFilter = matchesFuzzy;
+    }
+    static EMPTY(uriIdentityService) {
+        return ( new FilterOptions("", [], false, false, false, uriIdentityService));
+    }
+    constructor(
+        filter,
+        filesExclude,
+        showWarnings,
+        showErrors,
+        showInfos,
+        uriIdentityService
+    ) {
         this.filter = filter;
         this.showWarnings = false;
         this.showErrors = false;
@@ -40,10 +56,12 @@ class FilterOptions {
         this.showInfos = showInfos;
         const filesExcludeByRoot = Array.isArray(filesExclude) ? filesExclude : [];
         const excludesExpression = Array.isArray(filesExclude) ? getEmptyExpression() : filesExclude;
-        for (const { expression } of filesExcludeByRoot) {
+        for (const {
+            expression
+        } of filesExcludeByRoot) {
             for (const pattern of ( Object.keys(expression))) {
-                if (!pattern.endsWith('/**')) {
-                    expression[`${rtrim(pattern, '/')}/**`] = expression[pattern];
+                if (!pattern.endsWith("/**")) {
+                    expression[`${rtrim(pattern, "/")}/**`] = expression[pattern];
                 }
             }
         }
@@ -53,32 +71,33 @@ class FilterOptions {
         while ((sourceMatch = SOURCE_FILTER_REGEX.exec(filter)) !== null) {
             const negate = !!sourceMatch[1];
             let source = sourceMatch[2];
-            if (source.startsWith('"') && source.endsWith('"')) {
+            if (source.startsWith("\"") && source.endsWith("\"")) {
                 source = source.slice(1, -1);
             }
             if (negate) {
                 excludeSourceFilters.push(source.toLowerCase());
-            }
-            else {
+            } else {
                 includeSourceFilters.push(source.toLowerCase());
             }
             filter = (filter.substring(0, sourceMatch.index) + filter.substring(sourceMatch.index + sourceMatch[0].length)).trim();
         }
         this.includeSourceFilters = includeSourceFilters;
         this.excludeSourceFilters = excludeSourceFilters;
-        const negate = filter.startsWith('!');
-        this.textFilter = { text: (negate ? ltrim(filter, '!') : filter).trim(), negate };
+        const negate = filter.startsWith("!");
+        this.textFilter = {
+            text: (negate ? ltrim(filter, "!") : filter).trim(),
+            negate
+        };
         const includeExpression = getEmptyExpression();
         if (filter) {
-            const filters = ( splitGlobAware(filter, ',').map(s => s.trim())).filter(s => !!s.length);
+            const filters = ( splitGlobAware(filter, ",").map(s => s.trim())).filter(s => !!s.length);
             for (const f of filters) {
-                if (f.startsWith('!')) {
-                    const filterText = ltrim(f, '!');
+                if (f.startsWith("!")) {
+                    const filterText = ltrim(f, "!");
                     if (filterText) {
                         this.setPattern(excludesExpression, filterText);
                     }
-                }
-                else {
+                } else {
                     this.setPattern(includeExpression, f);
                 }
             }
@@ -100,8 +119,8 @@ class FilterOptions {
         return true;
     }
     setPattern(expression, pattern) {
-        if (pattern[0] === '.') {
-            pattern = '*' + pattern;
+        if (pattern[0] === ".") {
+            pattern = "*" + pattern;
         }
         expression[`**/${pattern}/**`] = true;
         expression[`**/${pattern}`] = true;

package/vscode/src/vs/workbench/contrib/markers/browser/markersModel.js

@@ -62,14 +62,16 @@ class ResourceMarkers {
         return this._total;
     }
     static _compareMarkers(a, b) {
-        return MarkerSeverity.compare(a.marker.severity, b.marker.severity)
-            || extUri.compare(a.resource, b.resource)
-            || Range.compareRangesUsingStarts(a.marker, b.marker);
+        return MarkerSeverity.compare(a.marker.severity, b.marker.severity) || extUri.compare(a.resource, b.resource) || Range.compareRangesUsingStarts(a.marker, b.marker);
     }
 }
 class Marker {
-    get resource() { return this.marker.resource; }
-    get range() { return this.marker; }
+    get resource() {
+        return this.marker.resource;
+    }
+    get range() {
+        return this.marker;
+    }
     get lines() {
         if (!this._lines) {
             this._lines = splitLines(this.marker.message);
@@ -85,8 +87,11 @@ class Marker {
         return JSON.stringify({
             ...this.marker,
             resource: this.marker.resource.path,
-            relatedInformation: this.relatedInformation.length ? ( this.relatedInformation.map(r => ({ ...r.raw, resource: r.raw.resource.path }))) : undefined
-        }, null, '\t');
+            relatedInformation: this.relatedInformation.length ? ( this.relatedInformation.map(r => ({
+                ...r.raw,
+                resource: r.raw.resource.path
+            }))) : undefined
+        }, null, "\t");
     }
 }
 class MarkerTableItem extends Marker {
@@ -126,7 +131,11 @@ class MarkersModel {
         }
         this.resourcesByUri.clear();
         this._total = 0;
-        this._onDidChange.fire({ removed, added: ( new Set()), updated: ( new Set()) });
+        this._onDidChange.fire({
+            removed,
+            added: ( new Set()),
+            updated: ( new Set())
+        });
     }
     get total() {
         return this._total;
@@ -135,7 +144,11 @@ class MarkersModel {
         return this.resourcesByUri.get(extUri.getComparisonKey(resource, true)) ?? null;
     }
     setResourceMarkers(resourcesMarkers) {
-        const change = { added: ( new Set()), removed: ( new Set()), updated: ( new Set()) };
+        const change = {
+            added: ( new Set()),
+            removed: ( new Set()),
+            updated: ( new Set())
+        };
         for (const [resource, rawMarkers] of resourcesMarkers) {
             if (( unsupportedSchemas.has(resource.scheme))) {
                 continue;
@@ -145,15 +158,16 @@ class MarkersModel {
             if (isNonEmptyArray(rawMarkers)) {
                 if (!resourceMarkers) {
                     const resourceMarkersId = this.id(( resource.toString()));
-                    resourceMarkers = ( new ResourceMarkers(resourceMarkersId, resource.with({ fragment: null })));
+                    resourceMarkers = ( new ResourceMarkers(resourceMarkersId, resource.with({
+                        fragment: null
+                    })));
                     this.resourcesByUri.set(key, resourceMarkers);
                     change.added.add(resourceMarkers);
-                }
-                else {
+                } else {
                     change.updated.add(resourceMarkers);
                 }
                 const markersCountByKey = ( new Map());
-                const markers = ( rawMarkers.map((rawMarker) => {
+                const markers = ( rawMarkers.map(rawMarker => {
                     const key = IMarkerData.makeKey(rawMarker);
                     const index = markersCountByKey.get(key) || 0;
                     markersCountByKey.set(key, index + 1);
@@ -167,16 +181,14 @@ class MarkersModel {
                 this._total -= resourceMarkers.total;
                 resourceMarkers.set(resource, markers);
                 this._total += resourceMarkers.total;
-            }
-            else if (resourceMarkers) {
+            } else if (resourceMarkers) {
                 this._total -= resourceMarkers.total;
                 resourceMarkers.delete(resource);
                 this._total += resourceMarkers.total;
                 if (resourceMarkers.total === 0) {
                     this.resourcesByUri.delete(key);
                     change.removed.add(resourceMarkers);
-                }
-                else {
+                } else {
                     change.updated.add(resourceMarkers);
                 }
             }