@codingame/monaco-vscode-extensions-service-override 37.6.0 → 38.0.0

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

@@ -10,6 +10,7 @@ import { IWorkingCopyFileService } from '@codingame/monaco-vscode-api/vscode/vs/
 import { IBulkEditService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService.service';
 import { ProgressLocation } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress';
 import { IProgressService } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service';
+import { NotificationTelemetryId } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notificationTelemetry';
 import { raceCancellation } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
@@ -65,6 +66,7 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                 const cts = ( new CancellationTokenSource(token));
                 const timer = setTimeout(() => cts.cancel(), timeout);
                 const data = await progressService.withProgress({
+                    telemetry: NotificationTelemetryId.FileOperationParticipants,
                     location: ProgressLocation.Notification,
                     title: this._progressLabel(operation),
                     cancellable: true,
@@ -94,25 +96,25 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                     if (data.extensionNames.length === 1) {
                         if (operation === FileOperation.CREATE) {
                             message = ( localize(
-                                5087,
+                                6407,
                                 "Extension '{0}' wants to make refactoring changes with this file creation",
                                 data.extensionNames[0]
                             ));
                         } else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                5088,
+                                6408,
                                 "Extension '{0}' wants to make refactoring changes with this file copy",
                                 data.extensionNames[0]
                             ));
                         } else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                5089,
+                                6409,
                                 "Extension '{0}' wants to make refactoring changes with this file move",
                                 data.extensionNames[0]
                             ));
                         } else  {
                             message = ( localize(
-                                5090,
+                                6410,
                                 "Extension '{0}' wants to make refactoring changes with this file deletion",
                                 data.extensionNames[0]
                             ));
@@ -120,25 +122,25 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                     } else {
                         if (operation === FileOperation.CREATE) {
                             message = ( localize(
-                                5091,
+                                6411,
                                 "{0} extensions want to make refactoring changes with this file creation",
                                 data.extensionNames.length
                             ));
                         } else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                5092,
+                                6412,
                                 "{0} extensions want to make refactoring changes with this file copy",
                                 data.extensionNames.length
                             ));
                         } else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                5093,
+                                6413,
                                 "{0} extensions want to make refactoring changes with this file move",
                                 data.extensionNames.length
                             ));
                         } else  {
                             message = ( localize(
-                                5094,
+                                6414,
                                 "{0} extensions want to make refactoring changes with this file deletion",
                                 data.extensionNames.length
                             ));
@@ -150,8 +152,8 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                         } = await dialogService.confirm({
                             type: Severity.Info,
                             message,
-                            primaryButton: ( localize(5095, "Show &&Preview")),
-                            cancelButton: ( localize(5096, "Skip Changes"))
+                            primaryButton: ( localize(6415, "Show &&Preview")),
+                            cancelButton: ( localize(6416, "Skip Changes"))
                         });
                         showPreview = true;
                         if (!confirmed) {
@@ -171,18 +173,18 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                             type: Severity.Info,
                             message,
                             buttons: [{
-                                label: ( localize(5097, "&&OK")),
+                                label: ( localize(6417, "&&OK")),
                                 run: () => Choice.OK
                             }, {
-                                label: ( localize(5095, "Show &&Preview")),
+                                label: ( localize(6415, "Show &&Preview")),
                                 run: () => Choice.Preview
                             }],
                             cancelButton: {
-                                label: ( localize(5096, "Skip Changes")),
+                                label: ( localize(6416, "Skip Changes")),
                                 run: () => Choice.Cancel
                             },
                             checkbox: {
-                                label: ( localize(5098, "Do not ask me again"))
+                                label: ( localize(6418, "Do not ask me again"))
                             }
                         });
                         if (result === Choice.Cancel) {
@@ -211,15 +213,15 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
             _progressLabel(operation) {
                 switch (operation) {
                 case FileOperation.CREATE:
-                    return localize(5099, "Running 'File Create' participants...");
+                    return localize(6419, "Running 'File Create' participants...");
                 case FileOperation.MOVE:
-                    return localize(5100, "Running 'File Rename' participants...");
+                    return localize(6420, "Running 'File Rename' participants...");
                 case FileOperation.COPY:
-                    return localize(5101, "Running 'File Copy' participants...");
+                    return localize(6421, "Running 'File Copy' participants...");
                 case FileOperation.DELETE:
-                    return localize(5102, "Running 'File Delete' participants...");
+                    return localize(6422, "Running 'File Delete' participants...");
                 case FileOperation.WRITE:
-                    return localize(5103, "Running 'File Write' participants...");
+                    return localize(6423, "Running 'File Write' participants...");
                 }
             }
         })();
@@ -307,7 +309,7 @@ registerAction2(class ResetMemento extends Action2 {
         super({
             id: "files.participants.resetChoice",
             title: {
-                value: ( localize(5104, "Reset choice for 'File operation needs preview'")),
+                value: ( localize(6424, "Reset choice for 'File operation needs preview'")),
                 original: `Reset choice for 'File operation needs preview'`
             },
             f1: true

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

@@ -1025,7 +1025,10 @@ let MainThreadPasteEditProvider = class MainThreadPasteEditProvider {
                             };
                         }),
                         dispose: () => {
-                            this._proxy.$releasePasteEdits(this._handle, request.id);
+                            const cacheId = edits[0]?._cacheId?.[0];
+                            if (typeof cacheId === "number") {
+                                this._proxy.$releasePasteEdits(this._handle, cacheId);
+                            }
                         }
                     };
                 } finally {
@@ -1096,7 +1099,10 @@ let MainThreadDocumentOnDropEditProvider = class MainThreadDocumentOnDropEditPro
                     };
                 }),
                 dispose: () => {
-                    this._proxy.$releaseDocumentOnDropEdits(this._handle, request.id);
+                    const cacheId = edits[0]?._cacheId?.[0];
+                    if (typeof cacheId === "number") {
+                        this._proxy.$releaseDocumentOnDropEdits(this._handle, cacheId);
+                    }
                 }
             };
         } finally {
@@ -1129,10 +1135,11 @@ class MainThreadDocumentSemanticTokensProvider {
         if (!encodedDto) {
             return null;
         }
+        const dto = decodeSemanticTokensDto(encodedDto);
         if (token.isCancellationRequested) {
+            this._proxy.$releaseDocumentSemanticTokens(this._handle, dto.id);
             return null;
         }
-        const dto = decodeSemanticTokensDto(encodedDto);
         if (dto.type === "full") {
             return {
                 resultId: String(dto.id),

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

@@ -10,6 +10,8 @@ import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/pla
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { legacyExtensionLinkParsing } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notificationLegacy';
+import { withNotificationActionTelemetry, NotificationActionTelemetryId, extensionNotificationTelemetry } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notificationTelemetry';
 
 var MainThreadMessageService_1;
 let MainThreadMessageService = class MainThreadMessageService {
@@ -47,7 +49,7 @@ let MainThreadMessageService = class MainThreadMessageService {
     }
     _showMessage(severity, message, commands, options) {
         return (new Promise(resolve => {
-            const primaryActions = commands.map(command => toAction({
+            const primaryActions = commands.map(command => withNotificationActionTelemetry(toAction({
                 id: `_extension_message_handle_${command.handle}`,
                 label: command.title,
                 enabled: true,
@@ -55,6 +57,8 @@ let MainThreadMessageService = class MainThreadMessageService {
                     resolve(command.handle);
                     return Promise.resolve();
                 }
+            }), {
+                extensionButtonIndex: command.handle
             }));
             let source;
             let sourceIsUrgent = false;
@@ -66,21 +70,23 @@ let MainThreadMessageService = class MainThreadMessageService {
                 sourceIsUrgent = MainThreadMessageService_1.URGENT_NOTIFICATION_SOURCES.includes(source.id);
             }
             if (!source) {
-                source = ( localize(5120, "Extension"));
+                source = ( localize(6441, "Extension"));
             }
             const secondaryActions = [];
             if (options.source) {
-                secondaryActions.push(toAction({
+                secondaryActions.push(withNotificationActionTelemetry(toAction({
                     id: options.source.identifier.value,
-                    label: ( localize(5121, "Manage Extension")),
+                    label: ( localize(6442, "Manage Extension")),
                     run: () => {
                         return this._commandService.executeCommand("_extensions.manage", options.source.identifier.value);
                     }
-                }));
+                }), NotificationActionTelemetryId.ManageExtension));
             }
             const messageHandle = this._notificationService.notify({
+                telemetry: extensionNotificationTelemetry(options.source?.identifier.value, "message"),
                 severity,
                 message,
+                legacyExtensionLinkParsing,
                 actions: {
                     primary: primaryActions,
                     secondary: secondaryActions
@@ -111,12 +117,12 @@ let MainThreadMessageService = class MainThreadMessageService {
         if (!cancelButton) {
             if (buttons.length > 0) {
                 cancelButton = {
-                    label: ( localize(5122, "Cancel")),
+                    label: ( localize(6443, "Cancel")),
                     run: () => undefined
                 };
             } else {
                 cancelButton = {
-                    label: ( localize(5123, "&&OK")),
+                    label: ( localize(6444, "&&OK")),
                     run: () => 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(5125, "Show Output")),
+            name: ( localize(6446, "Show Output")),
             text: "$(output)",
-            ariaLabel: ( localize(5126, "Show {0} Output Channel", channel.label)),
+            ariaLabel: ( localize(6447, "Show {0} Output Channel", channel.label)),
             command: `workbench.action.output.show.${channel.id}`,
-            tooltip: ( localize(5127, "Show {0} Output Channel", channel.label)),
+            tooltip: ( localize(6448, "Show {0} Output Channel", channel.label)),
             kind: "prominent"
         };
         if (!this._outputStatusItem.value) {

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

@@ -1,6 +1,5 @@
-import { IProgressStep, IProgressOptions } from "@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress";
 import { IProgressService } from "@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service";
-import { MainThreadProgressShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
+import { MainThreadProgressShape, IProgressOptionsDto, IProgressStepDto } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 import { IExtHostContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers";
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 export declare class MainThreadProgress implements MainThreadProgressShape {
@@ -11,8 +10,8 @@ export declare class MainThreadProgress implements MainThreadProgressShape {
     private readonly _proxy;
     constructor(extHostContext: IExtHostContext, progressService: IProgressService, _commandService: ICommandService);
     dispose(): void;
-    $startProgress(handle: number, options: IProgressOptions, extensionId?: string): Promise<void>;
-    $progressReport(handle: number, message: IProgressStep): void;
+    $startProgress(handle: number, options: IProgressOptionsDto, extensionId?: string): Promise<void>;
+    $progressReport(handle: number, message: IProgressStepDto): void;
     $progressEnd(handle: number): void;
     private _createTask;
 }

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

@@ -9,6 +9,8 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { onUnexpectedExternalError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { toAction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { NotificationPriority } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification';
+import { legacyExtensionLinkParsing } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notificationLegacy';
+import { extensionNotificationTelemetry, withNotificationActionTelemetry, NotificationActionTelemetryId } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notificationTelemetry';
 
 var MainThreadProgress_1;
 let MainThreadProgress = class MainThreadProgress {
@@ -30,22 +32,27 @@ let MainThreadProgress = class MainThreadProgress {
     }
     async $startProgress(handle, options, extensionId) {
         const task = this._createTask(handle);
+        let progressOptions = {
+            ...options,
+            legacyExtensionLinkParsing,
+            telemetry: options.telemetryId ?? extensionNotificationTelemetry(extensionId, "progress")
+        };
         if (options.location === ProgressLocation.Notification && extensionId) {
             const sourceIsUrgent = MainThreadProgress_1.URGENT_PROGRESS_SOURCES.includes(extensionId);
             const notificationOptions = {
-                ...options,
+                ...progressOptions,
                 priority: sourceIsUrgent ? NotificationPriority.URGENT : NotificationPriority.DEFAULT,
                 location: ProgressLocation.Notification,
-                secondaryActions: [toAction({
+                secondaryActions: [withNotificationActionTelemetry(toAction({
                     id: extensionId,
-                    label: ( localize(5128, "Manage Extension")),
+                    label: ( localize(6449, "Manage Extension")),
                     run: () => this._commandService.executeCommand("_extensions.manage", extensionId)
-                })]
+                }), NotificationActionTelemetryId.ManageExtension)]
             };
-            options = notificationOptions;
+            progressOptions = notificationOptions;
         }
         try {
-            this._progressService.withProgress(options, task, () => this._proxy.$acceptProgressCanceled(handle));
+            this._progressService.withProgress(progressOptions, task, () => this._proxy.$acceptProgressCanceled(handle));
         } catch (err) {
             onUnexpectedExternalError(err);
         }

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

@@ -338,6 +338,9 @@ class MainThreadSCMProvider {
     get contextValue() {
         return this._contextValue;
     }
+    get activeRepositoryName() {
+        return this._activeRepositoryName;
+    }
     get acceptInputCommand() {
         return this.features.acceptInputCommand;
     }
@@ -396,6 +399,7 @@ class MainThreadSCMProvider {
         this._groupsByHandle = Object.create(null);
         this.features = {};
         this._contextValue = observableValue(this, undefined);
+        this._activeRepositoryName = observableValue(this, undefined);
         this._count = observableValue(this, undefined);
         this._statusBarCommands = observableValue(this, undefined);
         this._commitTemplate = observableValue(this, "");
@@ -425,6 +429,9 @@ class MainThreadSCMProvider {
         if (typeof features.contextValue !== "undefined") {
             this._contextValue.set(features.contextValue, undefined);
         }
+        if (typeof features.activeRepositoryName !== "undefined") {
+            this._activeRepositoryName.set(features.activeRepositoryName ?? undefined, undefined);
+        }
         if (typeof features.count !== "undefined") {
             this._count.set(features.count, undefined);
         }

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(5129, "Aborted onWillSaveTextDocument-event after 1750ms"))))), 1750);
+            setTimeout(() => reject(( new Error(( localize(6450, "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/mainThreadShare.d.ts

@@ -4,7 +4,6 @@ import { IExtHostContext } from "@codingame/monaco-vscode-api/vscode/vs/workbenc
 export declare class MainThreadShare implements MainThreadShareShape {
     private readonly shareService;
     private readonly proxy;
-    private providers;
     private providerDisposables;
     constructor(extHostContext: IExtHostContext, shareService: IShareService);
     $registerShareProvider(handle: number, selector: IDocumentFilterDto[], id: string, label: string, priority: number): void;

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

@@ -1,7 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
-import { dispose } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { IShareService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/share/common/share.service';
@@ -10,8 +10,7 @@ import { extHostNamedCustomer } from '@codingame/monaco-vscode-api/vscode/vs/wor
 let MainThreadShare = class MainThreadShare {
     constructor(extHostContext, shareService) {
         this.shareService = shareService;
-        this.providers = ( new Map());
-        this.providerDisposables = ( new Map());
+        this.providerDisposables = ( new DisposableMap());
         this.proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostShare));
     }
     $registerShareProvider(handle, selector, id, label, priority) {
@@ -25,18 +24,14 @@ let MainThreadShare = class MainThreadShare {
                 return typeof result === "string" ? result : URI.revive(result);
             }
         };
-        this.providers.set(handle, provider);
         const disposable = this.shareService.registerShareProvider(provider);
         this.providerDisposables.set(handle, disposable);
     }
     $unregisterShareProvider(handle) {
-        this.providers.delete(handle);
-        this.providerDisposables.delete(handle);
+        this.providerDisposables.deleteAndDispose(handle);
     }
     dispose() {
-        this.providers.clear();
-        dispose(( this.providerDisposables.values()));
-        this.providerDisposables.clear();
+        this.providerDisposables.dispose();
     }
 };
 MainThreadShare = __decorate([extHostNamedCustomer(MainContext.MainThreadShare), ( __param(1, IShareService))], MainThreadShare);

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(5130, "{0}: {1}", source.label, task.name));
+        const label = ( localize(6451, "{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/mainThreadTerminalService.js

@@ -178,8 +178,13 @@ let MainThreadTerminalService = class MainThreadTerminalService extends Disposab
         });
         this._extHostTerminals.set(extHostTerminalId, terminal);
         const terminalInstance = await terminal;
-        this._register(terminalInstance.onDisposed(() => {
+        if (terminalInstance.isDisposed) {
             this._extHostTerminals.delete(extHostTerminalId);
+            return;
+        }
+        const disposeListener = this._register(terminalInstance.onDisposed(() => {
+            this._extHostTerminals.delete(extHostTerminalId);
+            this._store.delete(disposeListener);
         }));
     }
     async _deserializeParentTerminal(location) {

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

@@ -1,7 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { Disposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableMap, DisposableStore, combinedDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { TerminalCapability } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/capabilities';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
@@ -21,12 +21,7 @@ let MainThreadTerminalShellIntegration = class MainThreadTerminalShellIntegratio
         this._terminalService = _terminalService;
         this._extensionService = _extensionService;
         this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostTerminalShellIntegration));
-        const instanceDataListeners = ( new Map());
-        this._register(toDisposable(() => {
-            for (const listener of ( instanceDataListeners.values())) {
-                listener.dispose();
-            }
-        }));
+        const instanceDataListeners = this._register(( new DisposableMap()));
         for (const terminal of this._terminalService.instances) {
             const cmdDetection = terminal.capabilities.get(TerminalCapability.CommandDetection);
             if (cmdDetection) {
@@ -72,13 +67,12 @@ let MainThreadTerminalShellIntegration = class MainThreadTerminalShellIntegratio
                 e.data.isTrusted,
                 e.data.cwd
             );
-            instanceDataListeners.get(instanceId)?.dispose();
-            instanceDataListeners.set(
-                instanceId,
-                Event.accumulate(e.instance.onData, 50, true, this._store)(events => {
-                    this._proxy.$shellExecutionData(instanceId, events.join(""));
-                })
-            );
+            instanceDataListeners.deleteAndDispose(instanceId);
+            const dataDisposables = ( new DisposableStore());
+            const listener = Event.accumulate(e.instance.onData, 50, true, dataDisposables)(events => {
+                this._proxy.$shellExecutionData(instanceId, events.join(""));
+            });
+            instanceDataListeners.set(instanceId, combinedDisposable(listener, dataDisposables));
         }));
         const commandDetectionEndEvent = this._store.add(
             this._terminalService.createOnInstanceCapabilityEvent(TerminalCapability.CommandDetection, e => e.onCommandFinished)
@@ -86,7 +80,7 @@ let MainThreadTerminalShellIntegration = class MainThreadTerminalShellIntegratio
         this._store.add(commandDetectionEndEvent.event(e => {
             currentCommand = undefined;
             const instanceId = e.instance.instanceId;
-            instanceDataListeners.get(instanceId)?.dispose();
+            instanceDataListeners.deleteAndDispose(instanceId);
             this._proxy.$shellExecutionEnd(
                 instanceId,
                 e.data.command,
@@ -95,9 +89,10 @@ let MainThreadTerminalShellIntegration = class MainThreadTerminalShellIntegratio
                 e.data.exitCode
             );
         }));
-        this._store.add(
-            this._terminalService.onDidDisposeInstance(e => this._proxy.$closeTerminal(e.instanceId))
-        );
+        this._store.add(this._terminalService.onDidDisposeInstance(e => {
+            instanceDataListeners.deleteAndDispose(e.instanceId);
+            this._proxy.$closeTerminal(e.instanceId);
+        }));
     }
     $executeCommand(terminalId, commandLine) {
         this._terminalService.getInstanceFromId(terminalId)?.runCommand(commandLine, true);

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(
-            5131,
+            6452,
             "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(5132, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)),
+            label: ( localize(6453, "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

@@ -59,11 +59,12 @@ let MainThreadUriOpeners = class MainThreadUriOpeners extends Disposable {
                 try {
                     await this.proxy.$openUri(id, {
                         resolvedUri: uri,
-                        sourceUri: ctx.sourceUri
+                        sourceUri: ctx.sourceUri,
+                        viewColumn: ctx.viewColumn
                     }, token);
                 } catch (e) {
                     if (!isCancellationError(e)) {
-                        const openDefaultAction = ( new Action("default", ( localize(5133, "Open using default opener")), undefined, undefined, async () => {
+                        const openDefaultAction = ( new Action("default", ( localize(6454, "Open using default opener")), undefined, undefined, async () => {
                             await this.openerService.open(uri, {
                                 allowTunneling: false,
                                 allowContributedOpeners: defaultExternalUriOpenerId
@@ -72,7 +73,7 @@ let MainThreadUriOpeners = class MainThreadUriOpeners extends Disposable {
                         openDefaultAction.tooltip = ( uri.toString());
                         this.notificationService.notify({
                             severity: Severity.Error,
-                            message: ( localize(5134, "Could not open uri with '{0}': {1}", id, (e.toString()))),
+                            message: ( localize(6455, "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(5135, "An error occurred while loading view: {0}", escape(viewType)))}</body>
+            <body>${( localize(6456, "An error occurred while loading view: {0}", escape(viewType)))}</body>
         </html>`;
     }
 };

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

@@ -114,10 +114,10 @@ let MainThreadWorkspace = class MainThreadWorkspace extends Disposable {
         const wantsToDelete = removeCount > 0;
         if (wantsToAdd && !wantsToDelete) {
             if (addCount === 1) {
-                message = ( localize(5136, "Extension '{0}' added 1 folder to the workspace", extensionName));
+                message = ( localize(6457, "Extension '{0}' added 1 folder to the workspace", extensionName));
             } else {
                 message = ( localize(
-                    5137,
+                    6458,
                     "Extension '{0}' added {1} folders to the workspace",
                     extensionName,
                     addCount
@@ -126,10 +126,10 @@ let MainThreadWorkspace = class MainThreadWorkspace extends Disposable {
         }
         else if (wantsToDelete && !wantsToAdd) {
             if (removeCount === 1) {
-                message = ( localize(5138, "Extension '{0}' removed 1 folder from the workspace", extensionName));
+                message = ( localize(6459, "Extension '{0}' removed 1 folder from the workspace", extensionName));
             } else {
                 message = ( localize(
-                    5139,
+                    6460,
                     "Extension '{0}' removed {1} folders from the workspace",
                     extensionName,
                     removeCount
@@ -137,7 +137,7 @@ let MainThreadWorkspace = class MainThreadWorkspace extends Disposable {
             }
         }
         else {
-            message = ( localize(5140, "Extension '{0}' changed folders of the workspace", extensionName));
+            message = ( localize(6461, "Extension '{0}' changed folders of the workspace", extensionName));
         }
         return message;
     }

package/vscode/src/vs/workbench/contrib/customEditor/common/customTextEditorModel.d.ts

@@ -23,6 +23,7 @@ export declare class CustomTextEditorModel extends Disposable implements ICustom
     readonly onDidChangeReadonly: Event<void>;
     constructor(viewType: string, _resource: URI, _model: IReference<IResolvedTextEditorModel>, textFileService: ITextFileService, _labelService: ILabelService, extensionService: IExtensionService);
     get resource(): URI;
+    get textEditorModel(): import("@codingame/monaco-vscode-api/vscode/vs/editor/common/model").ITextModel;
     get name(): string;
     isReadonly(): boolean | IMarkdownString;
     get backupId(): undefined;

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(
-                13531,
+                15911,
                 "An extension provided text editor for '{0}' is still open that would close otherwise.",
                 this.name
             )));
@@ -69,6 +69,9 @@ let CustomTextEditorModel = CustomTextEditorModel_1 = class CustomTextEditorMode
     get resource() {
         return this._resource;
     }
+    get textEditorModel() {
+        return this._model.object.textEditorModel;
+    }
     get name() {
         return basename(this._labelService.getUriLabel(this._resource));
     }