@codingame/monaco-vscode-base-service-override 21.6.0 → 22.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-base-service-override",
-  "version": "21.6.0",
+  "version": "22.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - base service-override",
   "keywords": [],
@@ -15,13 +15,13 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common": "21.6.0",
-    "@codingame/monaco-vscode-23aade48-f094-5c08-9555-97fc9cca96c9-common": "21.6.0",
-    "@codingame/monaco-vscode-23b6fb38-5e58-5886-b34b-27abc4f5df02-common": "21.6.0",
-    "@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common": "21.6.0",
-    "@codingame/monaco-vscode-9a1a5840-af83-5d07-a156-ba32a36c5c4b-common": "21.6.0",
-    "@codingame/monaco-vscode-api": "21.6.0",
-    "@codingame/monaco-vscode-d987325e-3e05-53aa-b9ff-6f97476f64db-common": "21.6.0"
+    "@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common": "22.0.0",
+    "@codingame/monaco-vscode-23aade48-f094-5c08-9555-97fc9cca96c9-common": "22.0.0",
+    "@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common": "22.0.0",
+    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "22.0.0",
+    "@codingame/monaco-vscode-9a1a5840-af83-5d07-a156-ba32a36c5c4b-common": "22.0.0",
+    "@codingame/monaco-vscode-api": "22.0.0",
+    "@codingame/monaco-vscode-d987325e-3e05-53aa-b9ff-6f97476f64db-common": "22.0.0"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -117,7 +117,7 @@ let JSONEditingService = class JSONEditingService {
         switch (error) {
             case JSONEditingErrorCode.ERROR_INVALID_FILE: {
                 return localize(
-                    13134,
+                    13265,
                     "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

@@ -161,7 +161,7 @@ class DecorationStyles {
         const strikethrough = ( data.some(d => d.strikethrough));
         if (onlyChildren) {
             badgeClassName = rule.bubbleBadgeClassName;
-            tooltip = ( localize(13173, "Contains emphasized items"));
+            tooltip = ( localize(13304, "Contains emphasized items"));
         }
         return {
             labelClassName,

package/vscode/src/vs/workbench/services/inlineCompletions/common/inlineCompletionsUnification.d.ts

@@ -1,4 +1,6 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { RawContextKey } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey";
+import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IWorkbenchAssignmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/assignment/common/assignmentService.service";
 import { IInlineCompletionsUnificationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/inlineCompletions/common/inlineCompletionsUnification.service";
 export interface IInlineCompletionsUnificationState {
@@ -6,13 +8,16 @@ export interface IInlineCompletionsUnificationState {
     modelUnification: boolean;
     expAssignments: string[];
 }
+export declare const isRunningUnificationExperiment: RawContextKey<boolean>;
 export declare class InlineCompletionsUnificationImpl extends Disposable implements IInlineCompletionsUnificationService {
     private readonly _assignmentService;
+    private readonly _contextKeyService;
     readonly _serviceBrand: undefined;
     private _state;
     get state(): IInlineCompletionsUnificationState;
+    private isRunningUnificationExperiment;
     private readonly _onDidStateChange;
     readonly onDidStateChange: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
-    constructor(_assignmentService: IWorkbenchAssignmentService);
+    constructor(_assignmentService: IWorkbenchAssignmentService, _contextKeyService: IContextKeyService);
     private _update;
 }

package/vscode/src/vs/workbench/services/inlineCompletions/common/inlineCompletionsUnification.js

@@ -3,6 +3,8 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { RawContextKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
+import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import { IWorkbenchAssignmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/assignment/common/assignmentService.service';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
@@ -10,14 +12,17 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/ins
 const CODE_UNIFICATION_PREFIX = 'cmp-cht-';
 const CODE_UNIFICATION_FF = 'inlineCompletionsUnificationCode';
 const MODEL_UNIFICATION_FF = 'inlineCompletionsUnificationModel';
+const isRunningUnificationExperiment = ( new RawContextKey('isRunningUnificationExperiment', false));
 let InlineCompletionsUnificationImpl = class InlineCompletionsUnificationImpl extends Disposable {
     get state() { return this._state; }
-    constructor(_assignmentService) {
+    constructor(_assignmentService, _contextKeyService) {
         super();
         this._assignmentService = _assignmentService;
+        this._contextKeyService = _contextKeyService;
         this._state = ( new InlineCompletionsUnificationState(false, false, []));
         this._onDidStateChange = this._register(( new Emitter()));
         this.onDidStateChange = this._onDidStateChange.event;
+        this.isRunningUnificationExperiment = isRunningUnificationExperiment.bindTo(this._contextKeyService);
         this._register(this._assignmentService.onDidRefetchAssignments(() => this._update()));
         this._update();
     }
@@ -36,11 +41,13 @@ let InlineCompletionsUnificationImpl = class InlineCompletionsUnificationImpl ex
             return;
         }
         this._state = newState;
+        this.isRunningUnificationExperiment.set(this._state.codeUnification || this._state.modelUnification);
         this._onDidStateChange.fire();
     }
 };
 InlineCompletionsUnificationImpl = ( __decorate([
-    ( __param(0, IWorkbenchAssignmentService))
+    ( __param(0, IWorkbenchAssignmentService)),
+    ( __param(1, IContextKeyService))
 ], InlineCompletionsUnificationImpl));
 class InlineCompletionsUnificationState {
     constructor(codeUnification, modelUnification, expAssignments) {
@@ -55,4 +62,4 @@ class InlineCompletionsUnificationState {
     }
 }
 
-export { InlineCompletionsUnificationImpl };
+export { InlineCompletionsUnificationImpl, isRunningUnificationExperiment };

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

@@ -44,5 +44,6 @@ export declare class LabelService extends Disposable implements ILabelService {
     registerCachedFormatter(formatter: ResourceLabelFormatter): IDisposable;
     registerFormatter(formatter: ResourceLabelFormatter): IDisposable;
     private formatUri;
+    private adjustPathSeparators;
     private appendWorkspaceSuffix;
 }

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

@@ -26,12 +26,12 @@ import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/work
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 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-23b6fb38-5e58-5886-b34b-27abc4f5df02-common/vscode/vs/workbench/common/memento';
+import { Memento } from '@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/common/memento';
 
 const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'resourceLabelFormatters',
     jsonSchema: {
-        description: ( localize(13476, 'Contributes resource label formatting rules.')),
+        description: ( localize(13607, 'Contributes resource label formatting rules.')),
         type: 'array',
         items: {
             type: 'object',
@@ -40,52 +40,52 @@ const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoin
                 scheme: {
                     type: 'string',
                     description: ( localize(
-                        13477,
+                        13608,
                         'URI scheme on which to match the formatter on. For example "file". Simple glob patterns are supported.'
                     )),
                 },
                 authority: {
                     type: 'string',
                     description: ( localize(
-                        13478,
+                        13609,
                         'URI authority on which to match the formatter on. Simple glob patterns are supported.'
                     )),
                 },
                 formatting: {
-                    description: ( localize(13479, "Rules for formatting uri resource labels.")),
+                    description: ( localize(13610, "Rules for formatting uri resource labels.")),
                     type: 'object',
                     properties: {
                         label: {
                             type: 'string',
                             description: ( localize(
-                                13480,
+                                13611,
                                 "Label rules to display. For example: myLabel:/${path}. ${path}, ${scheme}, ${authority} and ${authoritySuffix} are supported as variables."
                             ))
                         },
                         separator: {
                             type: 'string',
                             description: ( localize(
-                                13481,
+                                13612,
                                 "Separator to be used in the uri label display. '/' or '\' as an example."
                             ))
                         },
                         stripPathStartingSeparator: {
                             type: 'boolean',
                             description: ( localize(
-                                13482,
+                                13613,
                                 "Controls whether `${path}` substitutions should have starting separator characters stripped."
                             ))
                         },
                         tildify: {
                             type: 'boolean',
                             description: ( localize(
-                                13483,
+                                13614,
                                 "Controls if the start of the uri label should be tildified when possible."
                             ))
                         },
                         workspaceSuffix: {
                             type: 'string',
-                            description: ( localize(13484, "Suffix appended to the workspace label."))
+                            description: ( localize(13615, "Suffix appended to the workspace label."))
                         }
                     }
                 }
@@ -93,7 +93,8 @@ const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoin
         }
     }
 });
-const sepRegexp = /\//g;
+const posixPathSeparatorRegexp = /\//g;
+const winPathSeparatorRegexp = /[\\\/]/g;
 const labelMatchingRegexp = /\$\{(scheme|authoritySuffix|authority|path|(query)\.(.+?))\}/g;
 function hasDriveLetterIgnorePlatform(path) {
     return !!(path && path[2] === ':');
@@ -180,7 +181,7 @@ let LabelService = class LabelService extends Disposable {
         }
         let label = this.doGetUriLabel(resource, formatting, options);
         if (!formatting && options.separator) {
-            label = label.replace(sepRegexp, options.separator);
+            label = this.adjustPathSeparators(label, options.separator);
         }
         if (options.appendWorkspaceSuffix && formatting?.workspaceSuffix) {
             label = this.appendWorkspaceSuffix(label, resource);
@@ -267,10 +268,10 @@ let LabelService = class LabelService extends Disposable {
     }
     doGetWorkspaceLabel(workspaceUri, options) {
         if (isUntitledWorkspace(workspaceUri, this.environmentService)) {
-            return localize(13485, "Untitled (Workspace)");
+            return localize(13616, "Untitled (Workspace)");
         }
         if (isTemporaryWorkspace(workspaceUri)) {
-            return localize(13486, "Workspace");
+            return localize(13617, "Workspace");
         }
         let filename = basename(workspaceUri);
         if (filename.endsWith(WORKSPACE_EXTENSION)) {
@@ -283,14 +284,14 @@ let LabelService = class LabelService extends Disposable {
                 break;
             case Verbosity.LONG:
                 label = ( localize(
-                    13487,
+                    13618,
                     "{0} (Workspace)",
                     this.getUriLabel(joinPath(dirname(workspaceUri), filename))
                 ));
                 break;
             case Verbosity.MEDIUM:
             default:
-                label = ( localize(13488, "{0} (Workspace)", filename));
+                label = ( localize(13619, "{0} (Workspace)", filename));
                 break;
         }
         if (options?.verbose === Verbosity.SHORT) {
@@ -393,7 +394,10 @@ let LabelService = class LabelService extends Disposable {
         if (formatting.authorityPrefix && resource.authority) {
             label = formatting.authorityPrefix + label;
         }
-        return label.replace(sepRegexp, formatting.separator);
+        return this.adjustPathSeparators(label, formatting.separator);
+    }
+    adjustPathSeparators(label, separator) {
+        return label.replace(this.os === OperatingSystem.Windows ? winPathSeparatorRegexp : posixPathSeparatorRegexp, separator);
     }
     appendWorkspaceSuffix(label, uri) {
         const formatting = this.findFormatting(uri);

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

@@ -13,7 +13,7 @@ import { windowLogGroup } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 
 let BrowserRequestService = class BrowserRequestService extends AbstractRequestService {
     constructor(remoteAgentService, configurationService, loggerService) {
-        const logger = loggerService.createLogger(`network`, { name: ( localize(13594, "Network")), group: windowLogGroup });
+        const logger = loggerService.createLogger(`network`, { name: ( localize(13725, "Network")), group: windowLogGroup });
         const logService = ( new LogService(logger));
         super(logService);
         this.remoteAgentService = remoteAgentService;

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

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