@codingame/monaco-vscode-extensions-service-override 27.0.0 → 28.0.0

package/vscode/src/vs/workbench/api/browser/mainThreadExtensionService.js

@@ -111,7 +111,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    2547,
+                    2552,
                     "Cannot activate the '{0}' extension because it depends on the '{1}' extension, which is not loaded. Would you like to reload the window to load the extension?",
                     extName,
                     missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
@@ -119,7 +119,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 actions: {
                     primary: [toAction({
                         id: "reload",
-                        label: ( localize(2548, "Reload Window")),
+                        label: ( localize(2553, "Reload Window")),
                         run: () => this._hostService.reload()
                     })]
                 }
@@ -130,7 +130,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2549,
+                        2554,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is not supported in the current workspace",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
@@ -140,7 +140,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2550,
+                        2555,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is not supported in Restricted Mode",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
@@ -148,7 +148,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                     actions: {
                         primary: [toAction({
                             id: "manageWorkspaceTrust",
-                            label: ( localize(2551, "Manage Workspace Trust")),
+                            label: ( localize(2556, "Manage Workspace Trust")),
                             run: () => this._commandService.executeCommand("workbench.trust.manage")
                         })]
                     }
@@ -157,7 +157,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2552,
+                        2557,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled. Would you like to enable the extension and reload the window?",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
@@ -165,7 +165,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                     actions: {
                         primary: [toAction({
                             id: "enable",
-                            label: ( localize(2553, "Enable and Reload")),
+                            label: ( localize(2558, "Enable and Reload")),
                             enabled: true,
                             run: () => this._extensionEnablementService.setEnablement(
                                 [missingInstalledDependency],
@@ -178,7 +178,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2554,
+                        2559,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled.",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
@@ -199,7 +199,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    2555,
+                    2560,
                     "Cannot activate the '{0}' extension because it depends on the '{1}' extension from '{2}', which is not installed. Would you like to install the extension and reload the window?",
                     extName,
                     dependencyExtension.displayName,
@@ -208,14 +208,14 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 actions: {
                     primary: [toAction({
                         id: "install",
-                        label: ( localize(2556, "Install and Reload")),
+                        label: ( localize(2561, "Install and Reload")),
                         run: () => this._extensionsWorkbenchService.install(dependencyExtension).then(() => this._hostService.reload(), e => this._notificationService.error(e))
                     })]
                 }
             });
         } else {
             this._notificationService.error(( localize(
-                2557,
+                2562,
                 "Cannot activate the '{0}' extension because it depends on an unknown '{1}' extension.",
                 extName,
                 missingDependency

package/vscode/src/vs/workbench/api/browser/mainThreadFileSystemEventService.js

@@ -94,25 +94,25 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                     if (data.extensionNames.length === 1) {
                         if (operation === FileOperation.CREATE) {
                             message = ( localize(
-                                2558,
+                                2563,
                                 "Extension '{0}' wants to make refactoring changes with this file creation",
                                 data.extensionNames[0]
                             ));
                         } else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                2559,
+                                2564,
                                 "Extension '{0}' wants to make refactoring changes with this file copy",
                                 data.extensionNames[0]
                             ));
                         } else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                2560,
+                                2565,
                                 "Extension '{0}' wants to make refactoring changes with this file move",
                                 data.extensionNames[0]
                             ));
                         } else  {
                             message = ( localize(
-                                2561,
+                                2566,
                                 "Extension '{0}' wants to make refactoring changes with this file deletion",
                                 data.extensionNames[0]
                             ));
@@ -120,25 +120,25 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                     } else {
                         if (operation === FileOperation.CREATE) {
                             message = ( localize(
-                                2562,
+                                2567,
                                 "{0} extensions want to make refactoring changes with this file creation",
                                 data.extensionNames.length
                             ));
                         } else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                2563,
+                                2568,
                                 "{0} extensions want to make refactoring changes with this file copy",
                                 data.extensionNames.length
                             ));
                         } else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                2564,
+                                2569,
                                 "{0} extensions want to make refactoring changes with this file move",
                                 data.extensionNames.length
                             ));
                         } else  {
                             message = ( localize(
-                                2565,
+                                2570,
                                 "{0} extensions want to make refactoring changes with this file deletion",
                                 data.extensionNames.length
                             ));
@@ -150,8 +150,8 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                         } = await dialogService.confirm({
                             type: Severity.Info,
                             message,
-                            primaryButton: ( localize(2566, "Show &&Preview")),
-                            cancelButton: ( localize(2567, "Skip Changes"))
+                            primaryButton: ( localize(2571, "Show &&Preview")),
+                            cancelButton: ( localize(2572, "Skip Changes"))
                         });
                         showPreview = true;
                         if (!confirmed) {
@@ -171,18 +171,18 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                             type: Severity.Info,
                             message,
                             buttons: [{
-                                label: ( localize(2568, "&&OK")),
+                                label: ( localize(2573, "&&OK")),
                                 run: () => Choice.OK
                             }, {
-                                label: ( localize(2566, "Show &&Preview")),
+                                label: ( localize(2571, "Show &&Preview")),
                                 run: () => Choice.Preview
                             }],
                             cancelButton: {
-                                label: ( localize(2567, "Skip Changes")),
+                                label: ( localize(2572, "Skip Changes")),
                                 run: () => Choice.Cancel
                             },
                             checkbox: {
-                                label: ( localize(2569, "Do not ask me again"))
+                                label: ( localize(2574, "Do not ask me again"))
                             }
                         });
                         if (result === Choice.Cancel) {
@@ -211,15 +211,15 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
             _progressLabel(operation) {
                 switch (operation) {
                 case FileOperation.CREATE:
-                    return localize(2570, "Running 'File Create' participants...");
+                    return localize(2575, "Running 'File Create' participants...");
                 case FileOperation.MOVE:
-                    return localize(2571, "Running 'File Rename' participants...");
+                    return localize(2576, "Running 'File Rename' participants...");
                 case FileOperation.COPY:
-                    return localize(2572, "Running 'File Copy' participants...");
+                    return localize(2577, "Running 'File Copy' participants...");
                 case FileOperation.DELETE:
-                    return localize(2573, "Running 'File Delete' participants...");
+                    return localize(2578, "Running 'File Delete' participants...");
                 case FileOperation.WRITE:
-                    return localize(2574, "Running 'File Write' participants...");
+                    return localize(2579, "Running 'File Write' participants...");
                 }
             }
         })();
@@ -307,7 +307,7 @@ registerAction2(class ResetMemento extends Action2 {
         super({
             id: "files.participants.resetChoice",
             title: {
-                value: ( localize(2575, "Reset choice for 'File operation needs preview'")),
+                value: ( localize(2580, "Reset choice for 'File operation needs preview'")),
                 original: `Reset choice for 'File operation needs preview'`
             },
             f1: true

package/vscode/src/vs/workbench/api/browser/mainThreadLanguageModels.js

@@ -178,7 +178,7 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
         if (this._authenticationService.getProviderIds().includes(authProviderId)) {
             return Disposable.None;
         }
-        const accountLabel = auth.accountLabel ?? ( localize(2576, "Language Models"));
+        const accountLabel = auth.accountLabel ?? ( localize(2581, "Language Models"));
         const disposables = ( new DisposableStore());
         const provider = ( new LanguageModelAccessAuthProvider(authProviderId, auth.providerLabel, accountLabel));
         this._authenticationService.registerAuthenticationProvider(authProviderId, provider);
@@ -261,7 +261,7 @@ class LanguageModelAccessAuthProvider {
     }
     confirmation(extensionName, _recreatingSession) {
         return localize(
-            2577,
+            2582,
             "The extension '{0}' wants to access the language models provided by {1}.",
             extensionName,
             this.label

package/vscode/src/vs/workbench/api/browser/mainThreadManagedSockets.d.ts

@@ -2,8 +2,8 @@ import { VSBuffer } from "@codingame/monaco-vscode-api/vscode/vs/base/common/buf
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { ManagedSocket, RemoteSocketHalf } from "../../../platform/remote/common/managedSocket.js";
 import { IRemoteSocketFactoryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/remote/common/remoteSocketFactoryService.service";
-import { ExtHostManagedSocketsShape, MainThreadManagedSocketsShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
+import { ExtHostManagedSocketsShape, MainThreadManagedSocketsShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 export declare class MainThreadManagedSockets extends Disposable implements MainThreadManagedSocketsShape {
     private readonly _remoteSocketFactoryService;
     private readonly _proxy;

package/vscode/src/vs/workbench/api/browser/mainThreadManagedSockets.js

@@ -1,24 +1,25 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-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 { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Disposable, DisposableMap, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { SocketCloseEventType } from '@codingame/monaco-vscode-api/vscode/vs/base/parts/ipc/common/ipc.net';
 import { ManagedSocket, connectManagedSocket } from '../../../platform/remote/common/managedSocket.js';
 import { RemoteConnectionType } from '@codingame/monaco-vscode-api/vscode/vs/platform/remote/common/remoteAuthorityResolver';
 import { IRemoteSocketFactoryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/remote/common/remoteSocketFactoryService.service';
-import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 
 let MainThreadManagedSockets = class MainThreadManagedSockets extends Disposable {
     constructor(extHostContext, _remoteSocketFactoryService) {
         super();
         this._remoteSocketFactoryService = _remoteSocketFactoryService;
-        this._registrations = ( new Map());
+        this._registrations = this._register(( new DisposableMap()));
         this._remoteSockets = ( new Map());
         this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostManagedSockets));
     }
     async $registerSocketFactory(socketFactoryId) {
         const that = this;
+        const store = ( new DisposableStore());
         const socketFactory = new (class {
             supports(connectTo) {
                 return (connectTo.id === socketFactoryId);
@@ -37,7 +38,9 @@ let MainThreadManagedSockets = class MainThreadManagedSockets extends Disposable
                         };
                         that._remoteSockets.set(socketId, half);
                         MainThreadManagedSocket.connect(socketId, that._proxy, path, query, debugLabel, half).then(socket => {
-                            socket.onDidDispose(() => that._remoteSockets.delete(socketId));
+                            store.add(
+                                Event.once(socket.onDidDispose)(() => that._remoteSockets.delete(socketId))
+                            );
                             resolve(socket);
                         }, err => {
                             that._remoteSockets.delete(socketId);
@@ -47,13 +50,13 @@ let MainThreadManagedSockets = class MainThreadManagedSockets extends Disposable
                 }));
             }
         })();
-        this._registrations.set(
-            socketFactoryId,
+        store.add(
             this._remoteSocketFactoryService.register(RemoteConnectionType.Managed, socketFactory)
         );
+        this._registrations.set(socketFactoryId, store);
     }
     async $unregisterSocketFactory(socketFactoryId) {
-        this._registrations.get(socketFactoryId)?.dispose();
+        this._registrations.deleteAndDispose(socketFactoryId);
     }
     $onDidManagedSocketHaveData(socketId, data) {
         this._remoteSockets.get(socketId)?.onData.fire(data);

package/vscode/src/vs/workbench/api/browser/mainThreadMcp.js

@@ -327,9 +327,9 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
     }
     async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
         const result = await this.dialogService.prompt({
-            message: ( localize(2578, "Incorrect account detected")),
+            message: ( localize(2583, "Incorrect account detected")),
             detail: ( localize(
-                2579,
+                2584,
                 "The chosen account, {0}, does not match the requested account, {1}.",
                 chosenAccountLabel,
                 requestedAccountLabel
@@ -337,10 +337,10 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
             type: Severity.Warning,
             cancelButton: true,
             buttons: [{
-                label: ( localize(2580, "Keep {0}", chosenAccountLabel)),
+                label: ( localize(2585, "Keep {0}", chosenAccountLabel)),
                 run: () => chosenAccountLabel
             }, {
-                label: ( localize(2581, "Login with {0}", requestedAccountLabel)),
+                label: ( localize(2586, "Login with {0}", requestedAccountLabel)),
                 run: () => requestedAccountLabel
             }]
         });
@@ -372,7 +372,7 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
             } catch (e) {
                 if (UserInteractionRequiredError.is(e)) {
                     server.pushLog(LogLevel.Warning, ( localize(
-                        2582,
+                        2587,
                         "Authentication session for {0} removed, stopping server",
                         providerLabel
                     )));
@@ -405,18 +405,18 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
     }
     async loginPrompt(mcpLabel, providerLabel, recreatingSession) {
         const message = recreatingSession ? ( localize(
-            2583,
+            2588,
             "The MCP Server Definition '{0}' wants you to authenticate to {1}.",
             mcpLabel,
             providerLabel
         )) : ( localize(
-            2584,
+            2589,
             "The MCP Server Definition '{0}' wants to authenticate to {1}.",
             mcpLabel,
             providerLabel
         ));
         const buttons = [{
-            label: ( localize(2585, "&&Allow")),
+            label: ( localize(2590, "&&Allow")),
             run() {
                 return true;
             }

package/vscode/src/vs/workbench/api/browser/mainThreadMessageService.js

@@ -66,13 +66,13 @@ let MainThreadMessageService = class MainThreadMessageService {
                 sourceIsUrgent = MainThreadMessageService_1.URGENT_NOTIFICATION_SOURCES.includes(source.id);
             }
             if (!source) {
-                source = ( localize(2586, "Extension"));
+                source = ( localize(2591, "Extension"));
             }
             const secondaryActions = [];
             if (options.source) {
                 secondaryActions.push(toAction({
                     id: options.source.identifier.value,
-                    label: ( localize(2587, "Manage Extension")),
+                    label: ( localize(2592, "Manage Extension")),
                     run: () => {
                         return this._commandService.executeCommand("_extensions.manage", options.source.identifier.value);
                     }
@@ -111,12 +111,12 @@ let MainThreadMessageService = class MainThreadMessageService {
         if (!cancelButton) {
             if (buttons.length > 0) {
                 cancelButton = {
-                    label: ( localize(2588, "Cancel")),
+                    label: ( localize(2593, "Cancel")),
                     run: () => undefined
                 };
             } else {
                 cancelButton = {
-                    label: ( localize(2589, "&&OK")),
+                    label: ( localize(2594, "&&OK")),
                     run: () => undefined
                 };
             }

package/vscode/src/vs/workbench/api/browser/mainThreadNotebookSaveParticipant.js

@@ -18,7 +18,7 @@ class ExtHostNotebookDocumentSaveParticipant {
         }
         let _warningTimeout;
         const p = ( new Promise((resolve, reject) => {
-            _warningTimeout = setTimeout(() => reject(( new Error(( localize(2590, "Aborted onWillSaveNotebookDocument-event after 1750ms"))))), 1750);
+            _warningTimeout = setTimeout(() => reject(( new Error(( localize(2595, "Aborted onWillSaveNotebookDocument-event after 1750ms"))))), 1750);
             this._proxy.$participateInSave(workingCopy.resource, context.reason, token).then(_ => {
                 clearTimeout(_warningTimeout);
                 return undefined;

package/vscode/src/vs/workbench/api/browser/mainThreadOutputService.js

@@ -94,11 +94,11 @@ let MainThreadOutputService = class MainThreadOutputService extends Disposable {
     }
     _showChannelQuietly(channel) {
         const statusProperties = {
-            name: ( localize(2591, "Show Output")),
+            name: ( localize(2596, "Show Output")),
             text: "$(output)",
-            ariaLabel: ( localize(2592, "Show {0} Output Channel", channel.label)),
+            ariaLabel: ( localize(2597, "Show {0} Output Channel", channel.label)),
             command: `workbench.action.output.show.${channel.id}`,
-            tooltip: ( localize(2593, "Show {0} Output Channel", channel.label)),
+            tooltip: ( localize(2598, "Show {0} Output Channel", channel.label)),
             kind: "prominent"
         };
         if (!this._outputStatusItem.value) {

package/vscode/src/vs/workbench/api/browser/mainThreadProgress.js

@@ -38,7 +38,7 @@ let MainThreadProgress = class MainThreadProgress {
                 location: ProgressLocation.Notification,
                 secondaryActions: [toAction({
                     id: extensionId,
-                    label: ( localize(2594, "Manage Extension")),
+                    label: ( localize(2599, "Manage Extension")),
                     run: () => this._commandService.executeCommand("_extensions.manage", extensionId)
                 })]
             };

package/vscode/src/vs/workbench/api/browser/mainThreadSaveParticipant.js

@@ -17,7 +17,7 @@ class ExtHostSaveParticipant {
             return undefined;
         }
         const p = ( new Promise((resolve, reject) => {
-            setTimeout(() => reject(( new Error(( localize(2595, "Aborted onWillSaveTextDocument-event after 1750ms"))))), 1750);
+            setTimeout(() => reject(( new Error(( localize(2600, "Aborted onWillSaveTextDocument-event after 1750ms"))))), 1750);
             this._proxy.$participateInSave(editorModel.resource, context.reason).then(values => {
                 if (!values.every(success => success)) {
                     return Promise.reject(( new Error("listener failed")));

package/vscode/src/vs/workbench/api/browser/mainThreadTask.js

@@ -397,7 +397,7 @@ var TaskDTO;
         }
         command.presentation = TaskPresentationOptionsDTO.to(task.presentationOptions);
         const source = TaskSourceDTO.to(task.source, workspace);
-        const label = ( localize(2596, "{0}: {1}", source.label, task.name));
+        const label = ( localize(2601, "{0}: {1}", source.label, task.name));
         const definition = TaskDefinitionDTO.to(task.definition, executeOnly);
         const id = (CustomExecutionDTO.is(task.execution) && task._id) ? task._id : `${task.source.extensionId}.${definition._key}`;
         const result = ( new ContributedTask(

package/vscode/src/vs/workbench/api/browser/mainThreadTunnelService.js

@@ -116,13 +116,13 @@ let MainThreadTunnelService = class MainThreadTunnelService extends Disposable {
     }
     async elevationPrompt(tunnelOptions, tunnel, source) {
         return this.notificationService.prompt(Severity.Info, ( localize(
-            2597,
+            2602,
             "The extension {0} has forwarded port {1}. You'll need to run as superuser to use port {2} locally.",
             source,
             tunnelOptions.remoteAddress.port,
             tunnelOptions.localAddressPort
         )), [{
-            label: ( localize(2598, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)),
+            label: ( localize(2603, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)),
             run: async () => {
                 this.elevateionRetry = true;
                 await this.remoteExplorerService.close({

package/vscode/src/vs/workbench/api/browser/mainThreadUriOpeners.js

@@ -61,7 +61,7 @@ let MainThreadUriOpeners = class MainThreadUriOpeners extends Disposable {
                     }, token);
                 } catch (e) {
                     if (!isCancellationError(e)) {
-                        const openDefaultAction = ( new Action("default", ( localize(2599, "Open using default opener")), undefined, undefined, async () => {
+                        const openDefaultAction = ( new Action("default", ( localize(2604, "Open using default opener")), undefined, undefined, async () => {
                             await this.openerService.open(uri, {
                                 allowTunneling: false,
                                 allowContributedOpeners: defaultExternalUriOpenerId
@@ -70,7 +70,7 @@ let MainThreadUriOpeners = class MainThreadUriOpeners extends Disposable {
                         openDefaultAction.tooltip = ( uri.toString());
                         this.notificationService.notify({
                             severity: Severity.Error,
-                            message: ( localize(2600, "Could not open uri with '{0}': {1}", id, (e.toString()))),
+                            message: ( localize(2605, "Could not open uri with '{0}': {1}", id, (e.toString()))),
                             actions: {
                                 primary: [openDefaultAction]
                             }

package/vscode/src/vs/workbench/api/browser/mainThreadWebviews.js

@@ -118,7 +118,7 @@ let MainThreadWebviews = class MainThreadWebviews extends Disposable {
                 <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
                 <meta http-equiv="Content-Security-Policy" content="default-src 'none';">
             </head>
-            <body>${( localize(2601, "An error occurred while loading view: {0}", escape(viewType)))}</body>
+            <body>${( localize(2606, "An error occurred while loading view: {0}", escape(viewType)))}</body>
         </html>`;
     }
 };

package/vscode/src/vs/workbench/api/browser/mainThreadWorkspace.js

@@ -12,7 +12,7 @@ import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/l
 import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
 import { IRequestService } from '@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request.service';
 import { IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service';
-import { WorkbenchState, isUntitledWorkspace } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace';
+import { isUntitledWorkspace } 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 { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { checkGlobFileExists } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/workspaceContains';
@@ -106,10 +106,10 @@ let MainThreadWorkspace = class MainThreadWorkspace {
         const wantsToDelete = removeCount > 0;
         if (wantsToAdd && !wantsToDelete) {
             if (addCount === 1) {
-                message = ( localize(2602, "Extension '{0}' added 1 folder to the workspace", extensionName));
+                message = ( localize(2607, "Extension '{0}' added 1 folder to the workspace", extensionName));
             } else {
                 message = ( localize(
-                    2603,
+                    2608,
                     "Extension '{0}' added {1} folders to the workspace",
                     extensionName,
                     addCount
@@ -118,10 +118,10 @@ let MainThreadWorkspace = class MainThreadWorkspace {
         }
         else if (wantsToDelete && !wantsToAdd) {
             if (removeCount === 1) {
-                message = ( localize(2604, "Extension '{0}' removed 1 folder from the workspace", extensionName));
+                message = ( localize(2609, "Extension '{0}' removed 1 folder from the workspace", extensionName));
             } else {
                 message = ( localize(
-                    2605,
+                    2610,
                     "Extension '{0}' removed {1} folders from the workspace",
                     extensionName,
                     removeCount
@@ -129,7 +129,7 @@ let MainThreadWorkspace = class MainThreadWorkspace {
             }
         }
         else {
-            message = ( localize(2606, "Extension '{0}' changed folders of the workspace", extensionName));
+            message = ( localize(2611, "Extension '{0}' changed folders of the workspace", extensionName));
         }
         return message;
     }
@@ -137,7 +137,7 @@ let MainThreadWorkspace = class MainThreadWorkspace {
         this._proxy.$acceptWorkspaceData(this.getWorkspaceData(this._contextService.getWorkspace()));
     }
     getWorkspaceData(workspace) {
-        if (this._contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
+        if (!this._contextService.hasWorkspaceData()) {
             return null;
         }
         return {

package/vscode/src/vs/workbench/contrib/customEditor/common/customTextEditorModel.js

@@ -60,7 +60,7 @@ let CustomTextEditorModel = CustomTextEditorModel_1 = class CustomTextEditorMode
         }));
         this._register(extensionService.onWillStop(e => {
             e.veto(true, ( localize(
-                7538,
+                7723,
                 "An extension provided text editor for '{0}' is still open that would close otherwise.",
                 this.name
             )));