@codingame/monaco-vscode-base-service-override 22.1.9 → 23.0.1

package/index.js

@@ -35,6 +35,8 @@ import { WorkbenchEditorWorkerService } from './vscode/src/vs/workbench/contrib/
 import { getEnvironmentOverride } from '@codingame/monaco-vscode-api/workbench';
 import { IInlineCompletionsUnificationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/inlineCompletions/common/inlineCompletionsUnification.service';
 import { InlineCompletionsUnificationImpl } from './vscode/src/vs/workbench/services/inlineCompletions/common/inlineCompletionsUnification.js';
+import { IMarkdownRendererService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service';
+import { MarkdownRendererService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer';
 
 let BrowserPathServiceOverride = class BrowserPathServiceOverride extends AbstractPathService {
     constructor(remoteAgentService, environmentService, contextService) {
@@ -61,7 +63,8 @@ function getServiceOverride() {
         [ITrustedDomainService.toString()]: new SyncDescriptor(TrustedDomainService, [], true),
         [ILabelService.toString()]: new SyncDescriptor(LabelService, [], true),
         [IEditorWorkerService.toString()]: new SyncDescriptor(WorkbenchEditorWorkerService, [], true),
-        [IInlineCompletionsUnificationService.toString()]: new SyncDescriptor(InlineCompletionsUnificationImpl, [], true)
+        [IInlineCompletionsUnificationService.toString()]: new SyncDescriptor(InlineCompletionsUnificationImpl, [], true),
+        [IMarkdownRendererService.toString()]: new SyncDescriptor(MarkdownRendererService, [], true)
     };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-base-service-override",
-  "version": "22.1.9",
+  "version": "23.0.1",
   "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": "22.1.9",
-    "@codingame/monaco-vscode-23aade48-f094-5c08-9555-97fc9cca96c9-common": "22.1.9",
-    "@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common": "22.1.9",
-    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "22.1.9",
-    "@codingame/monaco-vscode-9a1a5840-af83-5d07-a156-ba32a36c5c4b-common": "22.1.9",
-    "@codingame/monaco-vscode-api": "22.1.9",
-    "@codingame/monaco-vscode-d987325e-3e05-53aa-b9ff-6f97476f64db-common": "22.1.9"
+    "@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common": "23.0.1",
+    "@codingame/monaco-vscode-23aade48-f094-5c08-9555-97fc9cca96c9-common": "23.0.1",
+    "@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common": "23.0.1",
+    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "23.0.1",
+    "@codingame/monaco-vscode-9a1a5840-af83-5d07-a156-ba32a36c5c4b-common": "23.0.1",
+    "@codingame/monaco-vscode-api": "23.0.1",
+    "@codingame/monaco-vscode-d987325e-3e05-53aa-b9ff-6f97476f64db-common": "23.0.1"
   },
   "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(
-                    13283,
+                    13580,
                     "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.d.ts

@@ -10,7 +10,7 @@ export declare class DecorationsService implements IDecorationsService {
     private readonly _store;
     private readonly _onDidChangeDecorationsDelayed;
     private readonly _onDidChangeDecorations;
-    onDidChangeDecorations: Event<IResourceDecorationChangeEvent>;
+    readonly onDidChangeDecorations: Event<IResourceDecorationChangeEvent>;
     private readonly _provider;
     private readonly _decorationStyles;
     private readonly _data;

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(13322, "Contains emphasized items"));
+            tooltip = ( localize(13619, "Contains emphasized items"));
         }
         return {
             labelClassName,

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

@@ -1,23 +1,39 @@
+import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 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 { IExtensionManagementService } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagement.service";
+import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
 import { IWorkbenchAssignmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/assignment/common/assignmentService.service";
+import { IWorkbenchExtensionEnablementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service";
+import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { IInlineCompletionsUnificationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/inlineCompletions/common/inlineCompletionsUnification.service";
 export interface IInlineCompletionsUnificationState {
     codeUnification: boolean;
     modelUnification: boolean;
+    extensionUnification: boolean;
     expAssignments: string[];
 }
 export declare const isRunningUnificationExperiment: RawContextKey<boolean>;
 export declare class InlineCompletionsUnificationImpl extends Disposable implements IInlineCompletionsUnificationService {
     private readonly _assignmentService;
     private readonly _contextKeyService;
+    private readonly _configurationService;
+    private readonly _extensionEnablementService;
+    private readonly _extensionManagementService;
+    private readonly _extensionService;
     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, _contextKeyService: IContextKeyService);
+    readonly onDidStateChange: Event<void>;
+    private readonly _onDidChangeExtensionUnificationState;
+    private readonly _onDidChangeExtensionUnificationSetting;
+    private readonly _completionsExtensionId;
+    private readonly _chatExtensionId;
+    constructor(_assignmentService: IWorkbenchAssignmentService, _contextKeyService: IContextKeyService, _configurationService: IConfigurationService, _extensionEnablementService: IWorkbenchExtensionEnablementService, _extensionManagementService: IExtensionManagementService, _extensionService: IExtensionService, productService: IProductService);
     private _update;
+    private _isExtensionUnificationActive;
 }

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

@@ -1,63 +1,139 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 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 { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 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 { IExtensionManagementService } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
+import { ExtensionType } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
+import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 import { IWorkbenchAssignmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/assignment/common/assignmentService.service';
+import { EnablementState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
+import { IWorkbenchExtensionEnablementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
+import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 
 const CODE_UNIFICATION_PREFIX = 'cmp-cht-';
+const EXTENSION_UNIFICATION_PREFIX = 'cmp-ext-';
 const CODE_UNIFICATION_FF = 'inlineCompletionsUnificationCode';
 const MODEL_UNIFICATION_FF = 'inlineCompletionsUnificationModel';
 const isRunningUnificationExperiment = ( new RawContextKey('isRunningUnificationExperiment', false));
+const ExtensionUnificationSetting = 'chat.extensionUnification.enabled';
 let InlineCompletionsUnificationImpl = class InlineCompletionsUnificationImpl extends Disposable {
     get state() { return this._state; }
-    constructor(_assignmentService, _contextKeyService) {
+    constructor(_assignmentService, _contextKeyService, _configurationService, _extensionEnablementService, _extensionManagementService, _extensionService, productService) {
         super();
         this._assignmentService = _assignmentService;
         this._contextKeyService = _contextKeyService;
-        this._state = ( new InlineCompletionsUnificationState(false, false, []));
+        this._configurationService = _configurationService;
+        this._extensionEnablementService = _extensionEnablementService;
+        this._extensionManagementService = _extensionManagementService;
+        this._extensionService = _extensionService;
+        this._state = ( new InlineCompletionsUnificationState(false, false, false, []));
         this._onDidStateChange = this._register(( new Emitter()));
         this.onDidStateChange = this._onDidStateChange.event;
+        this._onDidChangeExtensionUnificationState = this._register(( new Emitter()));
+        this._onDidChangeExtensionUnificationSetting = this._register(( new Emitter()));
+        this._completionsExtensionId = productService.defaultChatAgent?.extensionId.toLowerCase();
+        this._chatExtensionId = productService.defaultChatAgent?.chatExtensionId.toLowerCase();
+        const relevantExtensions = [this._completionsExtensionId, this._chatExtensionId].filter((id) => !!id);
         this.isRunningUnificationExperiment = isRunningUnificationExperiment.bindTo(this._contextKeyService);
+        this._assignmentService.addTelemetryAssignmentFilter({
+            exclude: (assignment) => assignment.startsWith(EXTENSION_UNIFICATION_PREFIX) && this._state.extensionUnification !== this._configurationService.getValue(ExtensionUnificationSetting),
+            onDidChange: Event.any(this._onDidChangeExtensionUnificationState.event, this._onDidChangeExtensionUnificationSetting.event)
+        });
+        this._register(this._extensionEnablementService.onEnablementChanged((extensions) => {
+            if (( extensions.some(ext => relevantExtensions.includes(ext.identifier.id.toLowerCase())))) {
+                this._update();
+            }
+        }));
+        this._register(this._configurationService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration(ExtensionUnificationSetting)) {
+                this._update();
+                this._onDidChangeExtensionUnificationSetting.fire();
+            }
+        }));
+        this._register(this._extensionService.onDidChangeExtensions(({ added }) => {
+            if (( added.some(ext => relevantExtensions.includes(ext.identifier.value.toLowerCase())))) {
+                this._update();
+            }
+        }));
         this._register(this._assignmentService.onDidRefetchAssignments(() => this._update()));
         this._update();
     }
     async _update() {
-        const [codeUnificationFF, modelUnificationFF] = await Promise.all([
+        const [codeUnificationFF, modelUnificationFF, extensionUnificationEnabled] = await Promise.all([
             this._assignmentService.getTreatment(CODE_UNIFICATION_FF),
             this._assignmentService.getTreatment(MODEL_UNIFICATION_FF),
+            this._isExtensionUnificationActive()
         ]);
+        const extensionStatesMatchUnificationSetting = this._configurationService.getValue(ExtensionUnificationSetting) === extensionUnificationEnabled;
         const currentExperiments = await this._assignmentService.getCurrentExperiments();
         const newState = ( new InlineCompletionsUnificationState(
             codeUnificationFF === true,
             modelUnificationFF === true,
-            currentExperiments?.filter(exp => exp.startsWith(CODE_UNIFICATION_PREFIX)) ?? []
+            extensionUnificationEnabled,
+            currentExperiments?.filter(exp => exp.startsWith(CODE_UNIFICATION_PREFIX) || (extensionStatesMatchUnificationSetting && exp.startsWith(EXTENSION_UNIFICATION_PREFIX))) ?? []
         ));
         if (this._state.equals(newState)) {
             return;
         }
+        const previousState = this._state;
         this._state = newState;
-        this.isRunningUnificationExperiment.set(this._state.codeUnification || this._state.modelUnification);
+        this.isRunningUnificationExperiment.set(this._state.codeUnification || this._state.modelUnification || this._state.extensionUnification);
         this._onDidStateChange.fire();
+        if (previousState.extensionUnification !== this._state.extensionUnification) {
+            this._onDidChangeExtensionUnificationState.fire();
+        }
+    }
+    async _isExtensionUnificationActive() {
+        if (!this._configurationService.getValue(ExtensionUnificationSetting)) {
+            return false;
+        }
+        if (!this._completionsExtensionId || !this._chatExtensionId) {
+            return false;
+        }
+        const [completionsExtension, chatExtension, installedExtensions] = await Promise.all([
+            this._extensionService.getExtension(this._completionsExtensionId),
+            this._extensionService.getExtension(this._chatExtensionId),
+            this._extensionManagementService.getInstalled(ExtensionType.User)
+        ]);
+        if (!chatExtension || completionsExtension) {
+            return false;
+        }
+        const completionExtensionInstalled = installedExtensions.filter(ext => ext.identifier.id.toLowerCase() === this._completionsExtensionId);
+        if (completionExtensionInstalled.length === 0) {
+            return false;
+        }
+        const completionsExtensionDisabledByUnification = ( completionExtensionInstalled.some(
+            ext => this._extensionEnablementService.getEnablementState(ext) === EnablementState.DisabledByUnification
+        ));
+        return !!chatExtension && completionsExtensionDisabledByUnification;
     }
 };
 InlineCompletionsUnificationImpl = ( __decorate([
     ( __param(0, IWorkbenchAssignmentService)),
-    ( __param(1, IContextKeyService))
+    ( __param(1, IContextKeyService)),
+    ( __param(2, IConfigurationService)),
+    ( __param(3, IWorkbenchExtensionEnablementService)),
+    ( __param(4, IExtensionManagementService)),
+    ( __param(5, IExtensionService)),
+    ( __param(6, IProductService))
 ], InlineCompletionsUnificationImpl));
 class InlineCompletionsUnificationState {
-    constructor(codeUnification, modelUnification, expAssignments) {
+    constructor(codeUnification, modelUnification, extensionUnification, expAssignments) {
         this.codeUnification = codeUnification;
         this.modelUnification = modelUnification;
+        this.extensionUnification = extensionUnification;
         this.expAssignments = expAssignments;
     }
     equals(other) {
         return this.codeUnification === other.codeUnification
             && this.modelUnification === other.modelUnification
+            && this.extensionUnification === other.extensionUnification
             && equals(this.expAssignments, other.expAssignments);
     }
 }

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

@@ -31,7 +31,7 @@ import { Memento } from '@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b0872
 const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'resourceLabelFormatters',
     jsonSchema: {
-        description: ( localize(13625, 'Contributes resource label formatting rules.')),
+        description: ( localize(13923, 'Contributes resource label formatting rules.')),
         type: 'array',
         items: {
             type: 'object',
@@ -40,52 +40,52 @@ const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoin
                 scheme: {
                     type: 'string',
                     description: ( localize(
-                        13626,
+                        13924,
                         'URI scheme on which to match the formatter on. For example "file". Simple glob patterns are supported.'
                     )),
                 },
                 authority: {
                     type: 'string',
                     description: ( localize(
-                        13627,
+                        13925,
                         'URI authority on which to match the formatter on. Simple glob patterns are supported.'
                     )),
                 },
                 formatting: {
-                    description: ( localize(13628, "Rules for formatting uri resource labels.")),
+                    description: ( localize(13926, "Rules for formatting uri resource labels.")),
                     type: 'object',
                     properties: {
                         label: {
                             type: 'string',
                             description: ( localize(
-                                13629,
+                                13927,
                                 "Label rules to display. For example: myLabel:/${path}. ${path}, ${scheme}, ${authority} and ${authoritySuffix} are supported as variables."
                             ))
                         },
                         separator: {
                             type: 'string',
                             description: ( localize(
-                                13630,
+                                13928,
                                 "Separator to be used in the uri label display. '/' or '\' as an example."
                             ))
                         },
                         stripPathStartingSeparator: {
                             type: 'boolean',
                             description: ( localize(
-                                13631,
+                                13929,
                                 "Controls whether `${path}` substitutions should have starting separator characters stripped."
                             ))
                         },
                         tildify: {
                             type: 'boolean',
                             description: ( localize(
-                                13632,
+                                13930,
                                 "Controls if the start of the uri label should be tildified when possible."
                             ))
                         },
                         workspaceSuffix: {
                             type: 'string',
-                            description: ( localize(13633, "Suffix appended to the workspace label."))
+                            description: ( localize(13931, "Suffix appended to the workspace label."))
                         }
                     }
                 }
@@ -163,9 +163,8 @@ let LabelService = class LabelService extends Disposable {
                 if (!formatter.authority) {
                     continue;
                 }
-                if (match(formatter.authority.toLowerCase(), resource.authority.toLowerCase()) &&
-                    (!bestResult ||
-                        !bestResult.authority ||
+                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;
@@ -268,10 +267,10 @@ let LabelService = class LabelService extends Disposable {
     }
     doGetWorkspaceLabel(workspaceUri, options) {
         if (isUntitledWorkspace(workspaceUri, this.environmentService)) {
-            return localize(13634, "Untitled (Workspace)");
+            return localize(13932, "Untitled (Workspace)");
         }
         if (isTemporaryWorkspace(workspaceUri)) {
-            return localize(13635, "Workspace");
+            return localize(13933, "Workspace");
         }
         let filename = basename(workspaceUri);
         if (filename.endsWith(WORKSPACE_EXTENSION)) {
@@ -284,14 +283,14 @@ let LabelService = class LabelService extends Disposable {
                 break;
             case Verbosity.LONG:
                 label = ( localize(
-                    13636,
+                    13934,
                     "{0} (Workspace)",
                     this.getUriLabel(joinPath(dirname(workspaceUri), filename))
                 ));
                 break;
             case Verbosity.MEDIUM:
             default:
-                label = ( localize(13637, "{0} (Workspace)", filename));
+                label = ( localize(13935, "{0} (Workspace)", filename));
                 break;
         }
         if (options?.verbose === Verbosity.SHORT) {

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(13743, "Network")), group: windowLogGroup });
+        const logger = loggerService.createLogger(`network`, { name: ( localize(14041, "Network")), group: windowLogGroup });
         const logService = ( new LogService(logger));
         super(logService);
         this.remoteAgentService = remoteAgentService;

package/vscode/src/vs/workbench/services/userActivity/common/userActivityService.d.ts

@@ -24,7 +24,7 @@ export declare class UserActivityService extends Disposable implements IUserActi
      */
     isActive: boolean;
     /** @inheritdoc */
-    onDidChangeIsActive: Event<boolean>;
+    readonly onDidChangeIsActive: Event<boolean>;
     constructor(instantiationService: IInstantiationService);
     /** @inheritdoc */
     markActive(opts?: IMarkActiveOptions): IDisposable;

package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopySaveParticipant.d.ts

@@ -4,7 +4,7 @@ import { IProgress, IProgressStep } from "@codingame/monaco-vscode-api/vscode/vs
 import { IProgressService } from "@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service";
 import { IDisposable, Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IStoredFileWorkingCopySaveParticipant, IStoredFileWorkingCopySaveParticipantContext } from "./workingCopyFileService.js";
-import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel } from "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy";
+import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel } from "@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy";
 export declare class StoredFileWorkingCopySaveParticipant extends Disposable {
     private readonly logService;
     private readonly progressService;

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(14133, "Running Code Actions and Formatters..."))
+            message: ( localize(14431, "Running Code Actions and Formatters..."))
         });
         let bubbleCancel = false;
         await this.progressService.withProgress({
             priority: NotificationPriority.URGENT,
             location: ProgressLocation.Notification,
-            cancellable: ( localize(14134, "Skip")),
+            cancellable: ( localize(14432, "Skip")),
             delay: workingCopy.isDirty() ? 5000 : 3000
         }, async (progress) => {
             const participants = Array.from(this.saveParticipants).sort((a, b) => {

package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyFileService.d.ts

@@ -6,12 +6,12 @@ import { FileOperation, IFileStatWithMetadata } from "@codingame/monaco-vscode-a
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { IWorkingCopyService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service";
-import { IWorkingCopy } from "@codingame/monaco-vscode-caeb744c-8e3f-5c11-80fb-0f057d24d544-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
+import { IWorkingCopy } from "@codingame/monaco-vscode-d392702e-4ad7-5904-a915-f6063284cf14-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
 import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
 import { VSBuffer, VSBufferReadable, VSBufferReadableStream } from "@codingame/monaco-vscode-api/vscode/vs/base/common/buffer";
 import { SaveReason } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
 import { IProgress, IProgressStep } from "@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress";
-import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel } from "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy";
+import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel } from "@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy";
 import { IWorkingCopyFileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service";
 export interface SourceTargetPair {
     /**