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

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

@@ -39,7 +39,7 @@ import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode
 import { NotebookDto } from './mainThreadNotebookDto.js';
 import { isUntitledChatSession, getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 import { ICustomizationHarnessService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/customizationHarnessService.service';
-import { AICustomizationManagementSection, AICustomizationSources } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService';
+import { AICustomizationManagementSection } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService';
 import { IAgentPluginService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService.service';
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { getAgentSessionProvider, AgentSessionProviders } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
@@ -187,6 +187,8 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
             return "extension";
         case PromptsStorage.plugin:
             return "plugin";
+        case PromptsStorage.builtIn:
+            return "builtin";
         }
     }
     _toCustomAgentDto(agent) {
@@ -734,7 +736,9 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
                 }
                 return ( folders.map(folder => ({
                     uri: URI.revive(folder.uri),
-                    label: folder.label
+                    label: folder.label,
+                    source: folder.source,
+                    destinationGroupId: folder.destinationGroupId
                 })));
             }
         };
@@ -762,9 +766,6 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
             label: metadata.label,
             icon: metadata.iconId ? ThemeIcon.fromId(metadata.iconId) : ThemeIcon.fromId(Codicon.extensions.id),
             hiddenSections,
-            getStorageSourceFilter: () => ({
-                sources: AICustomizationSources.all
-            }),
             itemProvider
         };
         const registration = this._customizationHarnessService.registerExternalHarness(descriptor);

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

@@ -1,6 +1,6 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
-import { IChatContextItemDto, IDocumentFilterDto, MainThreadChatContextShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
+import { IChatContextItemDto, ITabSelectorDto, MainThreadChatContextShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 import { IChatContextService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/contextContrib/chatContextService.service";
 export declare class MainThreadChatContext extends Disposable implements MainThreadChatContextShape {
     private readonly _chatContextService;
@@ -9,7 +9,7 @@ export declare class MainThreadChatContext extends Disposable implements MainThr
     constructor(extHostContext: IExtHostContext, _chatContextService: IChatContextService);
     $registerChatWorkspaceContextProvider(handle: number, id: string): void;
     $registerChatExplicitContextProvider(handle: number, id: string): void;
-    $registerChatResourceContextProvider(handle: number, id: string, selector: IDocumentFilterDto[]): void;
+    $registerChatResourceContextProvider(handle: number, id: string, selector: ITabSelectorDto): void;
     $unregisterChatContextProvider(handle: number): void;
     $updateWorkspaceContextItems(handle: number, items: IChatContextItemDto[]): void;
     $executeChatContextItemCommand(itemHandle: number): Promise<void>;

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

@@ -5,10 +5,12 @@ import { extHostNamedCustomer } from '../../services/extensions/common/extHostCu
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { IChatContextService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/contextContrib/chatContextService.service';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { IconPath } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHostTypeConverters';
 
 function reviveContextItem(item) {
     return {
         ...item,
+        iconPath: IconPath.to(item.iconPath),
         resourceUri: item.resourceUri ? URI.revive(item.resourceUri) : undefined
     };
 }
@@ -55,10 +57,11 @@ let MainThreadChatContext = class MainThreadChatContext extends Disposable {
             selector
         });
         this._chatContextService.registerChatResourceContextProvider(id, selector, {
-            provideChatContext: async (resource, withValue, token) => {
+            provideChatContext: async (resource, withValue, viewType, token) => {
                 const result = await this._proxy.$provideResourceChatContext(handle, {
                     resource,
-                    withValue
+                    withValue,
+                    viewType
                 }, token);
                 return result ? reviveContextItem(result) : undefined;
             },

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

@@ -60,13 +60,13 @@ let MainThreadChatDebug = class MainThreadChatDebug extends Disposable {
                 return uri;
             }
         }));
-        this._chatDebugService.registerAvailableSessionsFetcher(async token => {
+        disposables.add(this._chatDebugService.registerAvailableSessionsFetcher(async token => {
             const entries = await this._proxy.$getAvailableDebugSessionResources(handle, token);
             return ( entries.map(e => ({
                 uri: URI.revive(e.uri),
                 title: e.title
             })));
-        });
+        }));
     }
     $unregisterChatDebugLogProvider(handle) {
         const disposables = this._providerDisposables.get(handle);

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

@@ -1,6 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { ChatInputNotificationActionKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/input/chatInputNotificationService';
 import { IChatInputNotificationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/input/chatInputNotificationService.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
@@ -16,9 +17,13 @@ let MainThreadChatInputNotification = class MainThreadChatInputNotification exte
             severity: notification.severity,
             message: notification.message,
             description: notification.description,
-            actions: notification.actions,
+            actions: ( notification.actions.map(action => ({
+                ...action,
+                kind: ChatInputNotificationActionKind.Command
+            }))),
             dismissible: notification.dismissible,
-            autoDismissOnMessage: notification.autoDismissOnMessage
+            autoDismissOnMessage: notification.autoDismissOnMessage,
+            sessionTypes: notification.sessionTypes
         });
     }
     $disposeNotification(id) {

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

@@ -2,6 +2,7 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { raceCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
+import { isCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { markdownStringEqual, MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { Disposable, DisposableResourceMap, DisposableMap, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
@@ -137,7 +138,7 @@ class ObservableChatSession extends Disposable {
                         return confirmInterrupt();
                     }
                     return this._dialogService.confirm({
-                        message: ( localize(2738, "Are you sure you want to interrupt the active session?"))
+                        message: ( localize(2973, "Are you sure you want to interrupt the active session?"))
                     }).then(confirmed => {
                         if (confirmed.confirmed) {
                             return confirmInterrupt();
@@ -662,7 +663,7 @@ let MainThreadChatSessions = class MainThreadChatSessions extends Disposable {
             const options = {
                 title: {
                     preferred: originalEditor?.getName() || undefined,
-                    fallback: ( localize(2739, "{0}", contribution?.displayName))
+                    fallback: ( localize(2974, "{0}", contribution?.displayName))
                 }
             };
             const newSession = await this._chatSessionsService.getOrCreateChatSession(URI.revive(modifiedResource), CancellationToken.None);
@@ -850,7 +851,11 @@ let MainThreadChatSessions = class MainThreadChatSessions extends Disposable {
             if (options?.optionGroups && options.optionGroups.length) {
                 this._chatSessionsService.setOptionGroupsForSessionType(chatSessionScheme, handle, [...options.optionGroups]);
             }
-        }).catch(err => this._logService.error("Error fetching chat session options", err));
+        }).catch(err => {
+            if (!isCancellationError(err)) {
+                this._logService.error("Error fetching chat session options", err);
+            }
+        });
     }
     dispose() {
         for (const session of ( this._activeSessions.values())) {

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

@@ -468,7 +468,7 @@ let MainThreadCommentController = class MainThreadCommentController extends Disp
     }
 };
 MainThreadCommentController = ( __decorate([( __param(6, ICommentService)), ( __param(7, IUriIdentityService))], MainThreadCommentController));
-const commentsViewIcon = registerIcon("comments-view-icon", Codicon.commentDiscussion, ( localize(2740, "View icon of the comments view.")));
+const commentsViewIcon = registerIcon("comments-view-icon", Codicon.commentDiscussion, ( localize(2975, "View icon of the comments view.")));
 let MainThreadComments = class MainThreadComments extends Disposable {
     constructor(
         extHostContext,
@@ -627,8 +627,8 @@ let MainThreadComments = class MainThreadComments extends Disposable {
         thread.collapsibleState = CommentThreadCollapsibleState.Collapsed;
     }
     registerView() {
-        const commentsPanelAlreadyConstructed = !!this._viewDescriptorService.getViewDescriptorById(COMMENTS_VIEW_ID);
-        if (!commentsPanelAlreadyConstructed) {
+        const commentsViewAlreadyRegistered = ( Registry.as(Extensions.ViewsRegistry)).getView(COMMENTS_VIEW_ID) !== null;
+        if (!commentsViewAlreadyRegistered) {
             const VIEW_CONTAINER = ( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
                 id: COMMENTS_VIEW_ID,
                 title: COMMENTS_VIEW_TITLE,
@@ -652,7 +652,7 @@ let MainThreadComments = class MainThreadComments extends Disposable {
                 }
             }], VIEW_CONTAINER);
         }
-        this.registerViewListeners(commentsPanelAlreadyConstructed);
+        this.registerViewListeners(commentsViewAlreadyRegistered);
     }
     setComments() {
         [...( this._commentControllers.keys())].forEach(handle => {
@@ -675,8 +675,8 @@ let MainThreadComments = class MainThreadComments extends Disposable {
             });
         }
     }
-    registerViewListeners(commentsPanelAlreadyConstructed) {
-        if (!commentsPanelAlreadyConstructed) {
+    registerViewListeners(commentsViewAlreadyRegistered) {
+        if (!commentsViewAlreadyRegistered) {
             this.registerViewOpenedListener();
         }
         if (!this._onChangeContainerListener.value) {

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

@@ -532,7 +532,7 @@ let MainThreadCustomEditorModel = MainThreadCustomEditorModel_1 = class MainThre
             this._register(workingCopyService.registerWorkingCopy(this));
             this._register(extensionService.onWillStop(e => {
                 e.veto(true, ( localize(
-                    2741,
+                    2976,
                     "An extension provided editor for '{0}' is still open that would close otherwise.",
                     this.name
                 )));
@@ -600,7 +600,7 @@ let MainThreadCustomEditorModel = MainThreadCustomEditorModel_1 = class MainThre
         this._undoService.pushElement({
             type: UndoRedoElementType.Resource,
             resource: this._editorResource,
-            label: label ?? ( localize(2742, "Edit")),
+            label: label ?? ( localize(2977, "Edit")),
             code: "undoredo.customEditorEdit",
             undo: () => this.undo(),
             redo: () => this.redo()

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

@@ -1,9 +1,25 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { UriComponents } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { LinkPresentationKind } from "@codingame/monaco-vscode-api/vscode/vs/platform/dataChannel/common/dataChannel";
+import { ILinkPresentationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dataChannel/common/dataChannel.service";
 import { IDataChannelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dataChannel/common/dataChannel.service";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
 import { MainThreadDataChannelsShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 export declare class MainThreadDataChannels extends Disposable implements MainThreadDataChannelsShape {
     private readonly _dataChannelService;
+    private readonly _linkPresentationService;
+    private readonly _logService;
     private readonly _proxy;
-    constructor(extHostContext: IExtHostContext, _dataChannelService: IDataChannelService);
+    private readonly _linkPresentationWatchers;
+    private readonly _linkPresentationProviders;
+    private readonly _providedLinkPresentationWatchers;
+    private static _providedLinkPresentationWatcherHandlePool;
+    constructor(extHostContext: IExtHostContext, _dataChannelService: IDataChannelService, _linkPresentationService: ILinkPresentationService, _logService: ILogService);
+    $createLinkPresentationWatcher(handle: number, providerId: string, kind: LinkPresentationKind, resource: UriComponents): void;
+    $disposeLinkPresentationWatcher(handle: number): void;
+    $registerLinkPresentationProvider(handle: number, extensionId: string, providerId: string): void;
+    $unregisterLinkPresentationProvider(handle: number): void;
+    $acceptLinkPresentationProviderData(handle: number, data: unknown): void;
+    private _createExtensionLinkPresentationWatcher;
 }

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

@@ -1,20 +1,146 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { IDataChannelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dataChannel/common/dataChannel.service';
+import { onUnexpectedError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
+import { Disposable, DisposableMap, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { parseLinkPresentation } from '@codingame/monaco-vscode-api/vscode/vs/platform/dataChannel/common/dataChannel';
+import { IDataChannelService, ILinkPresentationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dataChannel/common/dataChannel.service';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 
+var MainThreadDataChannels_1;
 let MainThreadDataChannels = class MainThreadDataChannels extends Disposable {
-    constructor(extHostContext, _dataChannelService) {
+    static {
+        MainThreadDataChannels_1 = this;
+    }
+    static {
+        this._providedLinkPresentationWatcherHandlePool = 0;
+    }
+    constructor(extHostContext, _dataChannelService, _linkPresentationService, _logService) {
         super();
         this._dataChannelService = _dataChannelService;
+        this._linkPresentationService = _linkPresentationService;
+        this._logService = _logService;
+        this._linkPresentationWatchers = this._register(( new DisposableMap()));
+        this._linkPresentationProviders = this._register(( new DisposableMap()));
+        this._providedLinkPresentationWatchers = this._register(( new DisposableMap()));
         this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostDataChannels));
         this._register(this._dataChannelService.onDidSendData(e => {
             this._proxy.$onDidReceiveData(e.channelId, e.data);
         }));
+        const updateLinkPresentationRules = () => this._proxy.$acceptLinkPresentationRules(( this._linkPresentationService.linkPresentationRules.map(rule => ({
+            id: rule.id,
+            source: rule.uriPattern.source,
+            flags: rule.uriPattern.flags,
+            kind: rule.kind
+        }))));
+        updateLinkPresentationRules();
+        this._register(
+            this._linkPresentationService.onDidChangeLinkPresentationRules(updateLinkPresentationRules)
+        );
+    }
+    $createLinkPresentationWatcher(handle, providerId, kind, resource) {
+        const watcher = this._linkPresentationService.createLinkPresentationWatcher(providerId, URI.revive(resource));
+        if (!watcher) {
+            this._logService.warn(
+                `[MainThreadDataChannels] Link presentation provider '${providerId}' does not accept '${( URI.revive(resource).toString(true))}'`
+            );
+            this._proxy.$acceptLinkPresentation(handle, {
+                kind,
+                status: {
+                    kind: "error",
+                    label: ( localize(2978, "Not available"))
+                },
+                tooltip: ( localize(
+                    2979,
+                    "The selected link presentation provider does not accept this resource."
+                )),
+                ariaLabel: ( localize(2980, "Link presentation is not available"))
+            });
+            return;
+        }
+        const store = ( new DisposableStore());
+        store.add(autorun(reader => {
+            const presentation = watcher.presentation.read(reader);
+            if (presentation) {
+                this._proxy.$acceptLinkPresentation(handle, presentation);
+            }
+        }));
+        store.add(watcher);
+        this._linkPresentationWatchers.set(handle, store);
+    }
+    $disposeLinkPresentationWatcher(handle) {
+        this._linkPresentationWatchers.deleteAndDispose(handle);
+    }
+    $registerLinkPresentationProvider(handle, extensionId, providerId) {
+        const provider = {
+            createLinkPresentationWatcher: resource => this._createExtensionLinkPresentationWatcher(handle, resource)
+        };
+        this._linkPresentationProviders.set(
+            handle,
+            this._linkPresentationService.registerExtensionLinkPresentationProvider(extensionId, providerId, provider)
+        );
+    }
+    $unregisterLinkPresentationProvider(handle) {
+        this._linkPresentationProviders.deleteAndDispose(handle);
+    }
+    $acceptLinkPresentationProviderData(handle, data) {
+        this._providedLinkPresentationWatchers.get(handle)?.acceptPresentation(data);
+    }
+    _createExtensionLinkPresentationWatcher(providerHandle, resource) {
+        const handle = MainThreadDataChannels_1._providedLinkPresentationWatcherHandlePool++;
+        const watcher = ( new MainThreadExtensionLinkPresentationWatcher(() => {
+            this._providedLinkPresentationWatchers.deleteAndLeak(handle);
+            this._proxy.$disposeLinkPresentationWatcher(handle);
+        }));
+        this._providedLinkPresentationWatchers.set(handle, watcher);
+        void this._proxy.$createLinkPresentationWatcher(handle, providerHandle, resource).then(data => watcher.initializePresentation(data), error => {
+            onUnexpectedError(error);
+            watcher.initializePresentation({
+                kind: "resource",
+                status: {
+                    kind: "error",
+                    label: ( localize(2978, "Not available"))
+                },
+                tooltip: ( localize(2981, "The link presentation provider failed to load.")),
+                ariaLabel: ( localize(2980, "Link presentation is not available"))
+            });
+        });
+        return watcher;
     }
 };
-MainThreadDataChannels = __decorate([extHostNamedCustomer(MainContext.MainThreadDataChannels), ( __param(1, IDataChannelService))], MainThreadDataChannels);
+MainThreadDataChannels = MainThreadDataChannels_1 = __decorate([extHostNamedCustomer(MainContext.MainThreadDataChannels), ( __param(1, IDataChannelService)), ( __param(2, ILinkPresentationService)), ( __param(3, ILogService))], MainThreadDataChannels);
+class MainThreadExtensionLinkPresentationWatcher extends Disposable {
+    constructor(_onDispose) {
+        super();
+        this._onDispose = _onDispose;
+        this._presentation = observableValue(this, undefined);
+        this.presentation = this._presentation;
+        this._isDisposed = false;
+    }
+    acceptPresentation(data) {
+        if (!this._isDisposed) {
+            this._presentation.set(parseLinkPresentation(data), undefined);
+        }
+    }
+    initializePresentation(data) {
+        if (!this._isDisposed && !this._presentation.get()) {
+            this.acceptPresentation(data);
+        }
+    }
+    dispose() {
+        if (this._isDisposed) {
+            return;
+        }
+        this._isDisposed = true;
+        super.dispose();
+        this._onDispose();
+    }
+}
 
 export { MainThreadDataChannels };

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

@@ -52,14 +52,8 @@ let MainThreadDiagnostics = class MainThreadDiagnostics {
                 resource,
                 ignoreResourceFilters: true
             });
-            if (allMarkerData.length === 0) {
-                data.push([resource, []]);
-            } else {
-                const foreignMarkerData = allMarkerData.filter(marker => marker?.origin !== this.extHostId);
-                if (foreignMarkerData.length > 0) {
-                    data.push([resource, foreignMarkerData]);
-                }
-            }
+            const markerData = allMarkerData.filter(marker => marker.origin !== this.extHostId);
+            data.push([resource, markerData]);
         }
         if (data.length > 0) {
             this._proxy.$acceptMarkersChange(data);

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

@@ -1,3 +1,4 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { ICodeEditor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser";
 import { ICodeEditorService } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service";
 import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
@@ -18,19 +19,17 @@ import { IPathService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/s
 import { IPaneCompositePartService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IQuickDiffModelService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/browser/quickDiffModel.service";
-export declare class MainThreadDocumentsAndEditors implements IMainThreadEditorLocator {
+export declare class MainThreadDocumentsAndEditors extends Disposable implements IMainThreadEditorLocator {
     private readonly _modelService;
     private readonly _textFileService;
     private readonly _editorService;
     private readonly _editorGroupService;
     private readonly _clipboardService;
-    private readonly _toDispose;
     private readonly _proxy;
     private readonly _mainThreadDocuments;
     private readonly _mainThreadEditors;
     private readonly _textEditors;
     constructor(extHostContext: IExtHostContext, _modelService: IModelService, _textFileService: ITextFileService, _editorService: IEditorService, codeEditorService: ICodeEditorService, fileService: IFileService, textModelResolverService: ITextModelService, _editorGroupService: IEditorGroupsService, paneCompositeService: IPaneCompositePartService, environmentService: IWorkbenchEnvironmentService, workingCopyFileService: IWorkingCopyFileService, uriIdentityService: IUriIdentityService, _clipboardService: IClipboardService, pathService: IPathService, configurationService: IConfigurationService, quickDiffModelService: IQuickDiffModelService);
-    dispose(): void;
     private _onDelta;
     private _toModelAddData;
     private _toTextEditorAddData;

package/vscode/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.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 { DisposableStore, DisposableMap, combinedDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { DisposableStore, DisposableMap, combinedDisposable, Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { isCodeEditor, isDiffEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
 import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
 import { shouldSynchronizeModel } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
@@ -233,7 +233,7 @@ let MainThreadDocumentAndEditorStateComputer = class MainThreadDocumentAndEditor
     }
 };
 MainThreadDocumentAndEditorStateComputer = ( __decorate([( __param(1, IModelService)), ( __param(2, ICodeEditorService)), ( __param(3, IEditorService)), ( __param(4, IPaneCompositePartService))], MainThreadDocumentAndEditorStateComputer));
-let MainThreadDocumentsAndEditors = class MainThreadDocumentsAndEditors {
+let MainThreadDocumentsAndEditors = class MainThreadDocumentsAndEditors extends Disposable {
     constructor(
         extHostContext,
         _modelService,
@@ -252,15 +252,15 @@ let MainThreadDocumentsAndEditors = class MainThreadDocumentsAndEditors {
         configurationService,
         quickDiffModelService
     ) {
+        super();
         this._modelService = _modelService;
         this._textFileService = _textFileService;
         this._editorService = _editorService;
         this._editorGroupService = _editorGroupService;
         this._clipboardService = _clipboardService;
-        this._toDispose = ( new DisposableStore());
-        this._textEditors = ( new Map());
+        this._textEditors = this._register(( new DisposableMap()));
         this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostDocumentsAndEditors));
-        this._mainThreadDocuments = this._toDispose.add(( new MainThreadDocuments(
+        this._mainThreadDocuments = this._register(( new MainThreadDocuments(
             extHostContext,
             this._modelService,
             this._textFileService,
@@ -272,7 +272,7 @@ let MainThreadDocumentsAndEditors = class MainThreadDocumentsAndEditors {
             pathService
         )));
         extHostContext.set(MainContext.MainThreadDocuments, this._mainThreadDocuments);
-        this._mainThreadEditors = this._toDispose.add(( new MainThreadTextEditors(
+        this._mainThreadEditors = this._register(( new MainThreadTextEditors(
             this,
             extHostContext,
             codeEditorService,
@@ -283,7 +283,7 @@ let MainThreadDocumentsAndEditors = class MainThreadDocumentsAndEditors {
             uriIdentityService
         )));
         extHostContext.set(MainContext.MainThreadTextEditors, this._mainThreadEditors);
-        this._toDispose.add(( new MainThreadDocumentAndEditorStateComputer(
+        this._register(( new MainThreadDocumentAndEditorStateComputer(
             delta => this._onDelta(delta),
             _modelService,
             codeEditorService,
@@ -291,9 +291,6 @@ let MainThreadDocumentsAndEditors = class MainThreadDocumentsAndEditors {
             paneCompositeService
         )));
     }
-    dispose() {
-        this._toDispose.dispose();
-    }
     _onDelta(delta) {
         const removedEditors = [];
         const addedEditors = [];
@@ -311,8 +308,7 @@ let MainThreadDocumentsAndEditors = class MainThreadDocumentsAndEditors {
         } of delta.removedEditors) {
             const mainThreadEditor = this._textEditors.get(id);
             if (mainThreadEditor) {
-                mainThreadEditor.dispose();
-                this._textEditors.delete(id);
+                this._textEditors.deleteAndDispose(id);
                 removedEditors.push(id);
             }
         }

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

@@ -14,7 +14,7 @@ class ExtHostEditSessionIdentityCreateParticipant {
     }
     async participate(workspaceFolder, token) {
         const p = ( new Promise((resolve, reject) => {
-            setTimeout(() => reject(( new Error(( localize(2743, "Aborted onWillCreateEditSessionIdentity-event after 10000ms"))))), this.timeout);
+            setTimeout(() => reject(( new Error(( localize(2982, "Aborted onWillCreateEditSessionIdentity-event after 10000ms"))))), this.timeout);
             this._proxy.$onWillCreateEditSessionIdentity(workspaceFolder.uri, token, this.timeout).then(resolve, reject);
         }));
         return raceCancellationError(p, token);

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

@@ -211,6 +211,9 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
                 kind: TabModelOperationKind.TAB_UPDATE
             });
         } else {
+            if (this._editorGroupsService.activeModalEditorPart?.groups.some(group => group.id === groupId)) {
+                return;
+            }
             this._logService.error("Invalid model for label change, rebuilding");
             this._createTabsModel();
         }
@@ -240,7 +243,7 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
                 if (!tabInfo) {
                     return;
                 }
-                tabInfo.tab = this._buildTabObject(group, editorInput, editorIndex);
+                Object.assign(tabInfo.tab, this._buildTabObject(group, editorInput, editorIndex));
                 this._proxy.$acceptTabOperation({
                     groupId,
                     index: editorIndex,
@@ -285,6 +288,11 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
         }
         const activeTab = tabs[editorIndex];
         activeTab.isActive = true;
+        for (const tab of tabs) {
+            if (tab !== activeTab) {
+                tab.isActive = false;
+            }
+        }
         this._proxy.$acceptTabOperation({
             groupId,
             index: editorIndex,