@codingame/monaco-vscode-base-service-override 36.2.7 → 37.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-base-service-override",
-  "version": "36.2.7",
+  "version": "37.1.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - base service-override",
   "keywords": [],
@@ -15,7 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "36.2.7"
+    "@codingame/monaco-vscode-api": "37.1.0"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/base/parts/request/common/requestImpl.js

@@ -20,6 +20,9 @@ async function request(options, token, isOnline) {
         if (options.disableCache) {
             fetchInit.cache = "no-store";
         }
+        if (options.followRedirects === 0) {
+            fetchInit.redirect = "manual";
+        }
         const res = await fetch(options.url || "", fetchInit);
         return {
             res: {

package/vscode/src/vs/workbench/services/configuration/common/jsonEditingService.js

@@ -137,7 +137,7 @@ let JSONEditingService = class JSONEditingService {
         case JSONEditingErrorCode.ERROR_INVALID_FILE:
             {
                 return localize(
-                    17443,
+                    19504,
                     "Unable to write into the file. Please open the file to correct errors/warnings in the file and try again."
                 );
             }

package/vscode/src/vs/workbench/services/decorations/browser/decorationsService.js

@@ -18,7 +18,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/ext
 import { hash } from '@codingame/monaco-vscode-api/vscode/vs/base/common/hash';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { distinct, asArray } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
-import { asCssVariable } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
+import { asCssVariableWithDefault, asCssVariable } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/baseColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/chartsColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/editorColors';
@@ -80,7 +80,7 @@ class DecorationRule {
         } = data;
         createCSSRule(`.${this.itemColorClassName}`, `color: ${getColor(color)};`, element);
         if (ThemeIcon.isThemeIcon(letter)) {
-            this._createIconCSSRule(letter, color, element);
+            this._createIconCSSRule(letter, getColor(color), element);
         } else if (letter) {
             createCSSRule(
                 `.${this.itemBadgeClassName}::after`,
@@ -90,10 +90,11 @@ class DecorationRule {
         }
     }
     _appendForMany(data, element) {
-        const {
-            color
-        } = data.find(d => !!d.color) ?? data[0];
-        createCSSRule(`.${this.itemColorClassName}`, `color: ${getColor(color)};`, element);
+        const color = data.reduceRight(
+            (fallback, decoration) => decoration.color ? asCssVariableWithDefault(decoration.color, fallback) : fallback,
+            "inherit"
+        );
+        createCSSRule(`.${this.itemColorClassName}`, `color: ${color};`, element);
         const letters = [];
         let icon;
         for (const d of data) {
@@ -110,13 +111,13 @@ class DecorationRule {
             if (letters.length) {
                 createCSSRule(
                     `.${this.itemBadgeClassName}::after`,
-                    `content: "${letters.join(", ")}"; color: ${getColor(color)};`,
+                    `content: "${letters.join(", ")}"; color: ${color};`,
                     element
                 );
             }
             createCSSRule(
                 `.${this.bubbleBadgeClassName}::after`,
-                `content: "\uea71"; color: ${getColor(color)}; font-family: codicon; font-size: 14px; margin-right: 14px; opacity: 0.4;`,
+                `content: "\uea71"; color: ${color}; font-family: codicon; font-size: 14px; margin-right: 14px; opacity: 0.4;`,
                 element
             );
         }
@@ -137,7 +138,7 @@ class DecorationRule {
         createCSSRule(
             `.${this.iconBadgeClassName}::after`,
             `content: '${definition.fontCharacter}';
-            color: ${icon.color ? getColor(icon.color.id) : getColor(color)};
+            color: ${icon.color ? getColor(icon.color.id) : color};
             font-family: ${stringValue(definition.font?.id ?? "codicon")};
             font-size: 16px;
             margin-right: 14px;
@@ -181,7 +182,7 @@ class DecorationStyles {
         const strikethrough = ( data.some(d => d.strikethrough));
         if (onlyChildren) {
             badgeClassName = rule.bubbleBadgeClassName;
-            tooltip = ( localize(17482, "Contains emphasized items"));
+            tooltip = ( localize(19554, "Contains emphasized items"));
         }
         return {
             labelClassName,
@@ -226,7 +227,7 @@ let DecorationsService = class DecorationsService {
         this._onDidChangeDecorations = this._store.add(( new Emitter()));
         this.onDidChangeDecorations = this._onDidChangeDecorations.event;
         this._provider = ( new LinkedList());
-        this._decorationStyles = ( new DecorationStyles(themeService));
+        this._decorationStyles = this._store.add(( new DecorationStyles(themeService)));
         this._data = TernarySearchTree.forUris(key => uriIdentityService.extUri.ignorePathCasing(key));
         this._store.add(this._onDidChangeDecorationsDelayed.event(event => {
             this._onDidChangeDecorations.fire(( new FileDecorationChangeEvent(event)));

package/vscode/src/vs/workbench/services/label/common/labelService.d.ts

@@ -3,7 +3,7 @@ import { IDisposable, Disposable } from "@codingame/monaco-vscode-api/vscode/vs/
 import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
 import { IWorkspace, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
-import { ResourceLabelFormatter, ResourceLabelFormatting, IFormatterChangeEvent, Verbosity } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label";
+import { ResourceLabelFormatter, ResourceLabelFormatting, IFormatterChangeEvent, Verbosity, ResourceLabelTemplateFormatter } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label";
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 import { ILifecycleService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service";
 import { IPathService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service";
@@ -16,6 +16,7 @@ export declare class LabelService extends Disposable implements ILabelService {
     private readonly remoteAgentService;
     readonly _serviceBrand: undefined;
     private formatters;
+    private homeFormatters;
     private readonly _onDidChangeFormatters;
     readonly onDidChangeFormatters: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<IFormatterChangeEvent>;
     private readonly storedFormattersMemento;
@@ -24,6 +25,9 @@ export declare class LabelService extends Disposable implements ILabelService {
     private userHome;
     constructor(environmentService: IWorkbenchEnvironmentService, contextService: IWorkspaceContextService, pathService: IPathService, remoteAgentService: IRemoteAgentService, storageService: IStorageService, lifecycleService: ILifecycleService);
     private resolveRemoteEnvironment;
+    getUriHome(resource: URI): URI | undefined;
+    private findHomeFormatter;
+    private findStaticHomeFormatter;
     findFormatting(resource: URI): ResourceLabelFormatting | undefined;
     getUriLabel(resource: URI, options?: {
         relative?: boolean;
@@ -42,7 +46,8 @@ export declare class LabelService extends Disposable implements ILabelService {
     getHostLabel(scheme: string, authority?: string): string;
     getHostTooltip(scheme: string, authority?: string): string | undefined;
     registerCachedFormatter(formatter: ResourceLabelFormatter): IDisposable;
-    registerFormatter(formatter: ResourceLabelFormatter): IDisposable;
+    registerFormatter(formatter: ResourceLabelFormatter | ResourceLabelTemplateFormatter): IDisposable;
+    private createTemplateFormatterRegistration;
     private formatUri;
     private adjustPathSeparators;
     private appendWorkspaceSuffix;

package/vscode/src/vs/workbench/services/label/common/labelService.js

@@ -10,7 +10,7 @@ import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/regist
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { isWorkspace, toWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, isUntitledWorkspace, isTemporaryWorkspace, WORKSPACE_EXTENSION } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
-import { basenameOrAuthority, basename, joinPath, dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { isEqualOrParent, relativePath, basenameOrAuthority, basename, joinPath, dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { getPathLabel, tildify } from '@codingame/monaco-vscode-api/vscode/vs/base/common/labels';
 import { Verbosity } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
@@ -27,11 +27,12 @@ import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/netw
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { Memento } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/memento';
+import { escapeRegExpCharacters } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
 
 const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "resourceLabelFormatters",
     jsonSchema: {
-        description: ( localize(17792, "Contributes resource label formatting rules.")),
+        description: ( localize(19869, "Contributes resource label formatting rules.")),
         type: "array",
         items: {
             type: "object",
@@ -40,52 +41,52 @@ const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoin
                 scheme: {
                     type: "string",
                     description: ( localize(
-                        17793,
+                        19870,
                         "URI scheme on which to match the formatter on. For example \"file\". Simple glob patterns are supported."
                     ))
                 },
                 authority: {
                     type: "string",
                     description: ( localize(
-                        17794,
+                        19871,
                         "URI authority on which to match the formatter on. Simple glob patterns are supported."
                     ))
                 },
                 formatting: {
-                    description: ( localize(17795, "Rules for formatting uri resource labels.")),
+                    description: ( localize(19872, "Rules for formatting uri resource labels.")),
                     type: "object",
                     properties: {
                         label: {
                             type: "string",
                             description: ( localize(
-                                17796,
+                                19873,
                                 "Label rules to display. For example: myLabel:/${path}. ${path}, ${scheme}, ${authority} and ${authoritySuffix} are supported as variables."
                             ))
                         },
                         separator: {
                             type: "string",
                             description: ( localize(
-                                17797,
+                                19874,
                                 "Separator to be used in the uri label display. '/' or '' as an example."
                             ))
                         },
                         stripPathStartingSeparator: {
                             type: "boolean",
                             description: ( localize(
-                                17798,
+                                19875,
                                 "Controls whether `${path}` substitutions should have starting separator characters stripped."
                             ))
                         },
                         tildify: {
                             type: "boolean",
                             description: ( localize(
-                                17799,
+                                19876,
                                 "Controls if the start of the uri label should be tildified when possible."
                             ))
                         },
                         workspaceSuffix: {
                             type: "string",
-                            description: ( localize(17800, "Suffix appended to the workspace label."))
+                            description: ( localize(19877, "Suffix appended to the workspace label."))
                         }
                     }
                 }
@@ -114,7 +115,7 @@ let ResourceLabelFormattersHandler = class ResourceLabelFormattersHandler {
                     if (typeof formatter.formatting.separator !== `string`) {
                         formatter.formatting.separator = sep;
                     }
-                    if (!isProposedApiEnabled(added.description) && formatter.formatting.workspaceTooltip) {
+                    if (!isProposedApiEnabled(added.description, "contribLabelFormatterWorkspaceTooltip") && formatter.formatting.workspaceTooltip) {
                         formatter.formatting.workspaceTooltip = undefined;
                     }
                     this.formattersDisposables.set(formatter, labelService.registerFormatter(formatter));
@@ -131,6 +132,10 @@ let ResourceLabelFormattersHandler = class ResourceLabelFormattersHandler {
 ResourceLabelFormattersHandler = ( __decorate([( __param(0, ILabelService))], ResourceLabelFormattersHandler));
 ( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(ResourceLabelFormattersHandler, LifecyclePhase.Restored);
 const FORMATTER_CACHE_SIZE = 50;
+const homeTemplateParameterRegex = /^\$\{(?<name>[a-zA-Z_][\w]*)\}$/;
+function isTemplateFormatter(formatter) {
+    return URI.isUri(formatter.home);
+}
 let LabelService = class LabelService extends Disposable {
     constructor(
         environmentService,
@@ -145,6 +150,7 @@ let LabelService = class LabelService extends Disposable {
         this.contextService = contextService;
         this.pathService = pathService;
         this.remoteAgentService = remoteAgentService;
+        this.homeFormatters = [];
         this._onDidChangeFormatters = this._register(( new Emitter({
             leakWarningThreshold: 400,
             leakWarningName: "LabelService._onDidChangeFormatters"
@@ -164,27 +170,106 @@ let LabelService = class LabelService extends Disposable {
         this.os = env?.os ?? OS;
         this.userHome = await this.pathService.userHome();
     }
+    getUriHome(resource) {
+        const formatter = this.findHomeFormatter(resource);
+        return formatter?.home;
+    }
+    findHomeFormatter(resource) {
+        let bestResult = this.findStaticHomeFormatter(resource);
+        let bestResultIsTemplate = false;
+        for (const registration of this.homeFormatters) {
+            const formatter = registration.formatter;
+            if (formatter.home.scheme !== resource.scheme || (formatter.home.authority && formatter.home.authority.toLowerCase() !== resource.authority.toLowerCase())) {
+                continue;
+            }
+            const templateMatch = registration.templateMatcher.exec(resource.path);
+            if (!templateMatch) {
+                continue;
+            }
+            const parameters = ( new Map(Object.entries(templateMatch.groups ?? {})));
+            const home = resource.with({
+                path: templateMatch[0],
+                query: null,
+                fragment: null
+            });
+            const formatting = formatter.formatting({
+                resource,
+                home,
+                parameters
+            });
+            if (!formatting) {
+                continue;
+            }
+            const result = {
+                home,
+                formatting,
+                literalLabel: true,
+                homeLength: home.path.length,
+                authorityLength: formatter.home.authority.length
+            };
+            if (!bestResult || result.homeLength > bestResult.homeLength || (result.homeLength === bestResult.homeLength && result.authorityLength > bestResult.authorityLength) || (result.homeLength === bestResult.homeLength && result.authorityLength === bestResult.authorityLength && !bestResultIsTemplate)) {
+                bestResult = result;
+                bestResultIsTemplate = true;
+            }
+        }
+        return bestResult;
+    }
+    findStaticHomeFormatter(resource) {
+        let bestResult;
+        for (const formatter of this.formatters) {
+            if (!formatter.home || formatter.scheme !== resource.scheme || (formatter.authority && !match(formatter.authority, resource.authority, {
+                ignoreCase: true
+            })) || !isEqualOrParent(resource, resource.with({
+                path: formatter.home
+            }))) {
+                continue;
+            }
+            const result = {
+                home: resource.with({
+                    path: formatter.home,
+                    query: null,
+                    fragment: null
+                }),
+                formatting: formatter.formatting,
+                literalLabel: false,
+                homeLength: formatter.home.length,
+                authorityLength: formatter.authority?.length ?? 0
+            };
+            if (!bestResult || result.homeLength > bestResult.homeLength || (result.homeLength === bestResult.homeLength && result.authorityLength > bestResult.authorityLength) || (result.homeLength === bestResult.homeLength && result.authorityLength === bestResult.authorityLength && formatter.priority)) {
+                bestResult = result;
+            }
+        }
+        return bestResult;
+    }
     findFormatting(resource) {
         let bestResult;
         for (const formatter of this.formatters) {
-            if (formatter.scheme === resource.scheme) {
-                if (!formatter.authority && (!bestResult || formatter.priority)) {
-                    bestResult = formatter;
-                    continue;
-                }
-                if (!formatter.authority) {
-                    continue;
-                }
-                if (match(formatter.authority, resource.authority, {
-                    ignoreCase: true
-                }) && (!bestResult?.authority || formatter.authority.length > bestResult.authority.length || ((formatter.authority.length === bestResult.authority.length) && formatter.priority))) {
-                    bestResult = formatter;
-                }
+            if (formatter.home || formatter.scheme !== resource.scheme) {
+                continue;
+            }
+            if (!formatter.authority && (!bestResult || formatter.priority)) {
+                bestResult = formatter;
+                continue;
+            }
+            if (!formatter.authority) {
+                continue;
+            }
+            if (match(formatter.authority, resource.authority, {
+                ignoreCase: true
+            }) && (!bestResult?.authority || formatter.authority.length > bestResult.authority.length || ((formatter.authority.length === bestResult.authority.length) && formatter.priority))) {
+                bestResult = formatter;
             }
         }
-        return bestResult ? bestResult.formatting : undefined;
+        return bestResult?.formatting;
     }
     getUriLabel(resource, options = {}) {
+        const homeFormatter = options.noPrefix ? undefined : this.findHomeFormatter(resource);
+        if (homeFormatter) {
+            const separator = options.separator ?? homeFormatter.formatting.separator;
+            const path = relativePath(homeFormatter.home, resource);
+            const label = homeFormatter.literalLabel ? homeFormatter.formatting.label : this.formatUri(homeFormatter.home, homeFormatter.formatting);
+            return path ? `${label}${separator}${this.adjustPathSeparators(path, separator)}` : label;
+        }
         let formatting = this.findFormatting(resource);
         if (formatting && options.separator) {
             formatting = {
@@ -282,10 +367,10 @@ let LabelService = class LabelService extends Disposable {
     }
     doGetWorkspaceLabel(workspaceUri, options) {
         if (isUntitledWorkspace(workspaceUri, this.environmentService)) {
-            return localize(17801, "Untitled (Workspace)");
+            return localize(19878, "Untitled (Workspace)");
         }
         if (isTemporaryWorkspace(workspaceUri)) {
-            return localize(17802, "Workspace");
+            return localize(19879, "Workspace");
         }
         let filename = basename(workspaceUri);
         if (filename.endsWith(WORKSPACE_EXTENSION)) {
@@ -298,14 +383,14 @@ let LabelService = class LabelService extends Disposable {
             break;
         case Verbosity.LONG:
             label = ( localize(
-                17803,
+                19880,
                 "{0} (Workspace)",
                 this.getUriLabel(joinPath(dirname(workspaceUri), filename))
             ));
             break;
         case Verbosity.MEDIUM:
         default:
-            label = ( localize(17804, "{0} (Workspace)", filename));
+            label = ( localize(19881, "{0} (Workspace)", filename));
             break;
         }
         if (options?.verbose === Verbosity.SHORT) {
@@ -369,19 +454,64 @@ let LabelService = class LabelService extends Disposable {
         return this.registerFormatter(formatter);
     }
     registerFormatter(formatter) {
-        this.formatters.push(formatter);
+        let homeRegistration;
+        let scheme;
+        if (isTemplateFormatter(formatter)) {
+            homeRegistration = this.createTemplateFormatterRegistration(formatter);
+            this.homeFormatters.push(homeRegistration);
+            scheme = formatter.home.scheme;
+        } else {
+            this.formatters.push(formatter);
+            scheme = formatter.scheme;
+        }
         this._onDidChangeFormatters.fire({
-            scheme: formatter.scheme
+            scheme
         });
+        const changeListener = homeRegistration?.formatter.onDidChangeFormatting(() => this._onDidChangeFormatters.fire({
+            scheme
+        }));
         return {
             dispose: () => {
+                changeListener?.dispose();
                 this.formatters = this.formatters.filter(f => f !== formatter);
+                if (homeRegistration) {
+                    this.homeFormatters = this.homeFormatters.filter(candidate => candidate !== homeRegistration);
+                }
                 this._onDidChangeFormatters.fire({
-                    scheme: formatter.scheme
+                    scheme
                 });
             }
         };
     }
+    createTemplateFormatterRegistration(formatter) {
+        const {
+            home
+        } = formatter;
+        const homePath = home.path.length > 1 ? home.path.replace(/\/+$/, "") : home.path;
+        const parameterNames = ( new Set());
+        const matcherPattern = ( homePath.split("/").map(segment => {
+            const parameterMatch = homeTemplateParameterRegex.exec(segment);
+            if (parameterMatch?.groups?.name) {
+                const parameterName = parameterMatch.groups.name;
+                if (( parameterNames.has(parameterName))) {
+                    throw ( new Error(`Duplicate resource label home template parameter: ${parameterName}`));
+                }
+                parameterNames.add(parameterName);
+                return `(?<${parameterName}>(?!\\.{1,2}(?:/|$))[^/]+)`;
+            }
+            if (segment.includes("${")) {
+                throw ( new Error(
+                    `Resource label home template parameters must occupy an entire path segment: ${segment}`
+                ));
+            }
+            return escapeRegExpCharacters(segment);
+        })).join("/");
+        const isRootHome = homePath === "" || homePath === "/";
+        return {
+            formatter,
+            templateMatcher: ( new RegExp(`^${matcherPattern}${isRootHome ? "" : "(?=/|$)"}`))
+        };
+    }
     formatUri(resource, formatting, forceNoTildify) {
         let label = formatting.label.replace(labelMatchingRegexp, (match, token, qsToken, qsValue) => {
             switch (token) {

package/vscode/src/vs/workbench/services/request/browser/requestService.js

@@ -15,7 +15,7 @@ import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/
 let BrowserRequestService = class BrowserRequestService extends AbstractRequestService {
     constructor(remoteAgentService, configurationService, loggerService) {
         const logger = loggerService.createLogger(`network`, {
-            name: ( localize(17912, "Network")),
+            name: ( localize(20013, "Network")),
             group: windowLogGroup
         });
         const logService = ( new LogService(logger));

package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopySaveParticipant.js

@@ -29,13 +29,13 @@ let StoredFileWorkingCopySaveParticipant = class StoredFileWorkingCopySavePartic
         const cts = ( new CancellationTokenSource(token));
         workingCopy.model?.pushStackElement();
         progress.report({
-            message: ( localize(18314, "Running Code Actions and Formatters..."))
+            message: ( localize(20416, "Running Code Actions and Formatters..."))
         });
         let bubbleCancel = false;
         await this.progressService.withProgress({
             priority: NotificationPriority.URGENT,
             location: ProgressLocation.Notification,
-            cancellable: ( localize(18315, "Skip")),
+            cancellable: ( localize(20417, "Skip")),
             delay: workingCopy.isDirty() ? 5000 : 3000
         }, async progress => {
             const participants = Array.from(this.saveParticipants).sort((a, b) => {