@codingame/monaco-vscode-extensions-service-override 37.6.1 → 38.0.1

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

@@ -1,11 +1,13 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { multibyteAwareBtoa } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
-import { DeferredPromise, createCancelablePromise } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { raceCancellation, DeferredPromise, createCancelablePromise } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { CancellationToken, CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { onUnexpectedError, isCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 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 { Disposable, DisposableMap, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { IOutlineService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/outline/browser/outline.service';
+import { MainThreadCustomTextEditorNavigation } from './mainThreadCustomTextEditorNavigation.js';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
 import { isEqualOrParent, isEqual, toLocalResource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
@@ -33,13 +35,14 @@ import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/wor
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
-import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService';
 import { ResourceWorkingCopy } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/resourceWorkingCopy';
 import { NO_TYPE_ID, WorkingCopyCapabilities } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopy';
 import { IWorkingCopyFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service';
 import { IWorkingCopyService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { IUntitledTextEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/untitled/common/untitledTextEditorService.service';
+import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/platform/path/common/pathService.service';
 
 var MainThreadCustomEditorModel_1;
 var CustomEditorModelType;
@@ -62,7 +65,8 @@ let MainThreadCustomEditors = class MainThreadCustomEditors extends Disposable {
         _instantiationService,
         _webviewWorkbenchService,
         _uriIdentityService,
-        _untitledTextEditorService
+        _untitledTextEditorService,
+        _outlineService
     ) {
         super();
         this.mainThreadWebview = mainThreadWebview;
@@ -74,9 +78,13 @@ let MainThreadCustomEditors = class MainThreadCustomEditors extends Disposable {
         this._webviewWorkbenchService = _webviewWorkbenchService;
         this._uriIdentityService = _uriIdentityService;
         this._untitledTextEditorService = _untitledTextEditorService;
+        this._outlineService = _outlineService;
         this._editorProviders = this._register(( new DisposableMap()));
+        this._navigation = this._register(( new DisposableMap()));
+        this._pendingNavigation = ( new Map());
         this._editorRenameBackups = ( new Map());
         this._pendingSideBySideDiffResolutions = ( new Map());
+        this._webviewHandles = ( new WeakMap());
         this._webviewOriginStore = ( new ExtensionKeyedWebviewOriginStore("mainThreadCustomEditors.origins", storageService));
         this._proxyCustomEditors = ( context.getProxy(ExtHostContext.ExtHostCustomEditors));
         this._register(workingCopyFileService.registerWorkingCopyProvider(editorResource => {
@@ -167,11 +175,8 @@ let MainThreadCustomEditors = class MainThreadCustomEditors extends Disposable {
                 if (!(webviewInput instanceof CustomEditorInput || webviewInput instanceof CustomEditorDiffInput || webviewInput instanceof CustomEditorSideBySideDiffInput)) {
                     return;
                 }
-                const handle = generateUuid();
                 webviewInput.webview.origin = this._webviewOriginStore.getOrigin(viewType, extension.id);
-                this.mainThreadWebviewPanels.addWebviewInput(handle, webviewInput, {
-                    serializeBuffersForPostMessage
-                });
+                const handle = this.getOrAddWebviewInput(webviewInput, serializeBuffersForPostMessage);
                 webviewInput.webview.options = options;
                 webviewInput.webview.extension = extension;
                 const resource = webviewInput instanceof CustomEditorDiffInput ? webviewInput.modifiedResource : webviewInput.resource;
@@ -203,11 +208,9 @@ let MainThreadCustomEditors = class MainThreadCustomEditors extends Disposable {
                         }
                     }
                 } catch (error) {
-                    onUnexpectedError(error);
-                    webviewInput.webview.setHtml(this.mainThreadWebview.getWebviewResolvedFailedContent(viewType));
                     additionalModelRefs.dispose();
                     modelRef?.dispose();
-                    return;
+                    throw error;
                 }
                 if (!modelRef) {
                     additionalModelRefs.dispose();
@@ -283,6 +286,17 @@ let MainThreadCustomEditors = class MainThreadCustomEditors extends Disposable {
                     } else {
                         const actualResource = modelType === CustomEditorModelType.Text ? this._uriIdentityService.asCanonicalUri(resource) : resource;
                         await this._proxyCustomEditors.$resolveCustomEditor(actualResource, handle, viewType, initData, position, cancellation);
+                        if (modelType === CustomEditorModelType.Text && capabilities.supportsNavigation && !cancellation.isCancellationRequested && !webviewInput.isDisposed()) {
+                            await this.resolveCustomTextEditorNavigation(
+                                webviewInput,
+                                handle,
+                                viewType,
+                                actualResource,
+                                resolvedModelRef.object,
+                                cancellation,
+                                disposables
+                            );
+                        }
                     }
                 } catch (error) {
                     onUnexpectedError(error);
@@ -295,6 +309,86 @@ let MainThreadCustomEditors = class MainThreadCustomEditors extends Disposable {
         }));
         this._editorProviders.set(viewType, disposables);
     }
+    getOrAddWebviewInput(webviewInput, serializeBuffersForPostMessage) {
+        let handle = this._webviewHandles.get(webviewInput);
+        if (!handle) {
+            handle = generateUuid();
+            this._webviewHandles.set(webviewInput, handle);
+            this.mainThreadWebviewPanels.addWebviewInput(handle, webviewInput, {
+                serializeBuffersForPostMessage
+            });
+        }
+        return handle;
+    }
+    async resolveCustomTextEditorNavigation(input, handle, viewType, resource, model, token, providerDisposables) {
+        if (!(model instanceof CustomTextEditorModel)) {
+            return;
+        }
+        const lifetime = ( new CancellationTokenSource(token));
+        const pending = {
+            selection: undefined,
+            changed: false
+        };
+        this._pendingNavigation.set(handle, pending);
+        const cleanup = ( new DisposableStore());
+        const clear = () => {
+            cleanup.dispose();
+        };
+        cleanup.add(toDisposable(() => {
+            providerDisposables.delete(cleanup);
+            lifetime.dispose(true);
+            this._pendingNavigation.delete(handle);
+            this._navigation.deleteAndDispose(handle);
+            if (input.navigation) {
+                input.navigation = undefined;
+                this._outlineService.notifyOutlineChanged();
+            }
+        }));
+        cleanup.add(input.onWillDispose(clear));
+        cleanup.add(input.webview.onDidDispose(clear));
+        providerDisposables.add(cleanup);
+        try {
+            const result = await raceCancellation(
+                this._proxyCustomEditors.$resolveCustomTextEditorNavigation(handle, viewType, resource, lifetime.token),
+                lifetime.token
+            );
+            if (!result || lifetime.token.isCancellationRequested || input.isDisposed()) {
+                this._proxyCustomEditors.$disposeCustomTextEditorNavigation(handle);
+                clear();
+                return;
+            }
+            const navigation = ( new MainThreadCustomTextEditorNavigation(
+                model.textEditorModel,
+                pending.changed ? pending.selection : result.selection,
+                handle,
+                this._proxyCustomEditors,
+                () => {
+                    const group = input.group === undefined ? undefined : this._editorGroupService.getGroup(input.group);
+                    if (group?.activeEditor === input) {
+                        group.focus();
+                    }
+                }
+            ));
+            this._navigation.set(handle, navigation);
+            input.navigation = navigation;
+            this._outlineService.notifyOutlineChanged();
+        } catch (error) {
+            clear();
+            if (!isCancellationError(error)) {
+                onUnexpectedError(error);
+            }
+        } finally {
+            this._pendingNavigation.delete(handle);
+        }
+    }
+    $onDidChangeCustomTextEditorSelection(handle, selection) {
+        this._navigation.get(handle)?.updateSelection(selection);
+        const pending = this._pendingNavigation.get(handle);
+        if (pending) {
+            pending.changed = true;
+            pending.selection = selection;
+        }
+    }
     resolveCustomEditorSideBySideDiff(
         modelType,
         webviewInput,
@@ -425,7 +519,7 @@ let MainThreadCustomEditors = class MainThreadCustomEditors extends Disposable {
         })());
     }
 };
-MainThreadCustomEditors = ( __decorate([( __param(3, IExtensionService)), ( __param(4, IStorageService)), ( __param(5, IWorkingCopyService)), ( __param(6, IWorkingCopyFileService)), ( __param(7, ICustomEditorService)), ( __param(8, IEditorGroupsService)), ( __param(9, IEditorService)), ( __param(10, IInstantiationService)), ( __param(11, IWebviewWorkbenchService)), ( __param(12, IUriIdentityService)), ( __param(13, IUntitledTextEditorService))], MainThreadCustomEditors));
+MainThreadCustomEditors = ( __decorate([( __param(3, IExtensionService)), ( __param(4, IStorageService)), ( __param(5, IWorkingCopyService)), ( __param(6, IWorkingCopyFileService)), ( __param(7, ICustomEditorService)), ( __param(8, IEditorGroupsService)), ( __param(9, IEditorService)), ( __param(10, IInstantiationService)), ( __param(11, IWebviewWorkbenchService)), ( __param(12, IUriIdentityService)), ( __param(13, IUntitledTextEditorService)), ( __param(14, IOutlineService))], MainThreadCustomEditors));
 var HotExitState;
 (function(HotExitState) {
     let Type;
@@ -532,7 +626,7 @@ let MainThreadCustomEditorModel = MainThreadCustomEditorModel_1 = class MainThre
             this._register(workingCopyService.registerWorkingCopy(this));
             this._register(extensionService.onWillStop(e => {
                 e.veto(true, ( localize(
-                    5068,
+                    6389,
                     "An extension provided editor for '{0}' is still open that would close otherwise.",
                     this.name
                 )));
@@ -600,7 +694,7 @@ let MainThreadCustomEditorModel = MainThreadCustomEditorModel_1 = class MainThre
         this._undoService.pushElement({
             type: UndoRedoElementType.Resource,
             resource: this._editorResource,
-            label: label ?? ( localize(5069, "Edit")),
+            label: label ?? ( localize(6390, "Edit")),
             code: "undoredo.customEditorEdit",
             undo: () => this.undo(),
             redo: () => this.redo()

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

@@ -0,0 +1,29 @@
+import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
+import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IRange } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range";
+import { ISelection } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/selection";
+import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
+import { ICustomTextEditorNavigation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/customEditor/common/customTextEditorNavigation";
+import { ExtHostCustomEditorsShape, WebviewHandle } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
+export declare class MainThreadCustomTextEditorNavigation extends Disposable implements ICustomTextEditorNavigation {
+    readonly model: ITextModel;
+    private readonly _handle;
+    private readonly _proxy;
+    private readonly _focus;
+    private readonly _onDidChangeSelection;
+    readonly onDidChangeSelection: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
+    private readonly _onDidDispose;
+    readonly onDidDispose: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
+    private readonly _lifetime;
+    private readonly _states;
+    private _nextState;
+    private _disposed;
+    private _selection;
+    constructor(model: ITextModel, selection: ISelection | undefined, _handle: WebviewHandle, _proxy: ExtHostCustomEditorsShape, _focus: () => void);
+    get selection(): ISelection | undefined;
+    updateSelection(selection: ISelection | undefined): void;
+    revealRange(range: IRange, selection: ISelection | undefined, preserveFocus: boolean, token: CancellationToken): Promise<void>;
+    captureViewState(): IDisposable;
+    dispose(): void;
+    private _handleError;
+}

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

@@ -0,0 +1,94 @@
+
+import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
+import { isCancellationError, onUnexpectedError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
+import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Disposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+
+class MainThreadCustomTextEditorNavigation extends Disposable {
+    constructor(model, selection, _handle, _proxy, _focus) {
+        super();
+        this.model = model;
+        this._handle = _handle;
+        this._proxy = _proxy;
+        this._focus = _focus;
+        this._onDidChangeSelection = this._register(( new Emitter()));
+        this.onDidChangeSelection = this._onDidChangeSelection.event;
+        this._onDidDispose = this._register(( new Emitter()));
+        this.onDidDispose = this._onDidDispose.event;
+        this._lifetime = ( new CancellationTokenSource());
+        this._states = ( new Set());
+        this._nextState = 0;
+        this._disposed = false;
+        this._selection = selection;
+    }
+    get selection() {
+        return this._selection;
+    }
+    updateSelection(selection) {
+        if (!this._disposed) {
+            this._selection = selection;
+            this._onDidChangeSelection.fire();
+        }
+    }
+    async revealRange(range, selection, preserveFocus, token) {
+        if (this._disposed || token.isCancellationRequested) {
+            return;
+        }
+        if (selection) {
+            for (const stateId of this._states) {
+                this._proxy.$releaseCustomTextEditorViewState(this._handle, stateId);
+            }
+            this._states.clear();
+        }
+        const cancellation = ( new CancellationTokenSource(this._lifetime.token));
+        const listener = token.onCancellationRequested(() => cancellation.cancel());
+        try {
+            await this._proxy.$revealCustomTextEditorRange(this._handle, range, selection, preserveFocus, cancellation.token);
+            if (!preserveFocus && !cancellation.token.isCancellationRequested) {
+                this._focus();
+            }
+        } catch (error) {
+            this._handleError(error);
+        } finally {
+            listener.dispose();
+            cancellation.dispose();
+        }
+    }
+    captureViewState() {
+        if (this._disposed) {
+            return Disposable.None;
+        }
+        const stateId = this._nextState++;
+        this._states.add(stateId);
+        const captured = this._proxy.$captureCustomTextEditorViewState(this._handle, stateId).catch(error => {
+            this._states.delete(stateId);
+            this._proxy.$releaseCustomTextEditorViewState(this._handle, stateId);
+            this._handleError(error);
+        });
+        return toDisposable(() => {
+            void captured.then(async () => {
+                if (this._states.delete(stateId)) {
+                    await this._proxy.$restoreCustomTextEditorViewState(this._handle, stateId, this._lifetime.token);
+                }
+            }).catch(error => this._handleError(error));
+        });
+    }
+    dispose() {
+        if (this._disposed) {
+            return;
+        }
+        this._disposed = true;
+        this._lifetime.dispose(true);
+        this._states.clear();
+        this._proxy.$disposeCustomTextEditorNavigation(this._handle);
+        this._onDidDispose.fire();
+        super.dispose();
+    }
+    _handleError(error) {
+        if (!isCancellationError(error)) {
+            onUnexpectedError(error);
+        }
+    }
+}
+
+export { MainThreadCustomTextEditorNavigation };

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

@@ -54,13 +54,13 @@ let MainThreadDataChannels = class MainThreadDataChannels extends Disposable {
                 kind,
                 status: {
                     kind: "error",
-                    label: ( localize(5070, "Not available"))
+                    label: ( localize(6391, "Not available"))
                 },
                 tooltip: ( localize(
-                    5071,
+                    6392,
                     "The selected link presentation provider does not accept this resource."
                 )),
-                ariaLabel: ( localize(5072, "Link presentation is not available"))
+                ariaLabel: ( localize(6393, "Link presentation is not available"))
             });
             return;
         }
@@ -105,10 +105,10 @@ let MainThreadDataChannels = class MainThreadDataChannels extends Disposable {
                 kind: "resource",
                 status: {
                     kind: "error",
-                    label: ( localize(5070, "Not available"))
+                    label: ( localize(6391, "Not available"))
                 },
-                tooltip: ( localize(5073, "The link presentation provider failed to load.")),
-                ariaLabel: ( localize(5072, "Link presentation is not available"))
+                tooltip: ( localize(6394, "The link presentation provider failed to load.")),
+                ariaLabel: ( localize(6393, "Link presentation is not available"))
             });
         });
         return watcher;

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

@@ -21,6 +21,8 @@ let MainThreadDebugService = class MainThreadDebugService {
         this.visualizerService = visualizerService;
         this._toDispose = ( new DisposableStore());
         this._debugAdaptersHandleCounter = 1;
+        this._debugConfigurationProviders = this._toDispose.add(( new DisposableMap()));
+        this._debugAdapterDescriptorFactories = this._toDispose.add(( new DisposableMap()));
         this._visualizerHandles = ( new Map());
         this._visualizerTreeHandles = ( new Map());
         this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostDebugService));
@@ -69,8 +71,6 @@ let MainThreadDebugService = class MainThreadDebugService {
             }
         }));
         this._debugAdapters = ( new Map());
-        this._debugConfigurationProviders = ( new Map());
-        this._debugAdapterDescriptorFactories = ( new Map());
         this._extHostKnownSessions = ( new Set());
         const viewModel = this.debugService.getViewModel();
         this._toDispose.add(
@@ -244,18 +244,14 @@ let MainThreadDebugService = class MainThreadDebugService {
                 return this._proxy.$resolveDebugConfigurationWithSubstitutedVariables(handle, folder, config, token);
             };
         }
-        this._debugConfigurationProviders.set(handle, provider);
-        this._toDispose.add(
+        this._debugConfigurationProviders.set(
+            handle,
             this.debugService.getConfigurationManager().registerDebugConfigurationProvider(provider)
         );
         return Promise.resolve(undefined);
     }
     $unregisterDebugConfigurationProvider(handle) {
-        const provider = this._debugConfigurationProviders.get(handle);
-        if (provider) {
-            this._debugConfigurationProviders.delete(handle);
-            this.debugService.getConfigurationManager().unregisterDebugConfigurationProvider(provider);
-        }
+        this._debugConfigurationProviders.deleteAndDispose(handle);
     }
     $registerDebugAdapterDescriptorFactory(debugType, handle) {
         const provider = {
@@ -264,18 +260,14 @@ let MainThreadDebugService = class MainThreadDebugService {
                 return Promise.resolve(this._proxy.$provideDebugAdapter(handle, this.getSessionDto(session)));
             }
         };
-        this._debugAdapterDescriptorFactories.set(handle, provider);
-        this._toDispose.add(
+        this._debugAdapterDescriptorFactories.set(
+            handle,
             this.debugService.getAdapterManager().registerDebugAdapterDescriptorFactory(provider)
         );
         return Promise.resolve(undefined);
     }
     $unregisterDebugAdapterDescriptorFactory(handle) {
-        const provider = this._debugAdapterDescriptorFactories.get(handle);
-        if (provider) {
-            this._debugAdapterDescriptorFactories.delete(handle);
-            this.debugService.getAdapterManager().unregisterDebugAdapterDescriptorFactory(provider);
-        }
+        this._debugAdapterDescriptorFactories.deleteAndDispose(handle);
     }
     getSession(sessionId) {
         if (sessionId) {

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

@@ -15,7 +15,7 @@ import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscod
 import { IWorkingCopyFileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service";
 import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
 import { IClipboardService } from "@codingame/monaco-vscode-api/vscode/vs/platform/clipboard/common/clipboardService.service";
-import { IPathService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service";
+import { IPathService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService";
 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";

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

@@ -21,12 +21,13 @@ import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscod
 import { IWorkingCopyFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { IClipboardService } from '@codingame/monaco-vscode-api/vscode/vs/platform/clipboard/common/clipboardService.service';
-import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService';
 import { diffSets, diffMaps } from '@codingame/monaco-vscode-api/vscode/vs/base/common/collections';
 import { IPaneCompositePartService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
 import { ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
 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';
+import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/platform/path/common/pathService.service';
 
 class TextEditorSnapshot {
     constructor(editor) {

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(5074, "Aborted onWillCreateEditSessionIdentity-event after 10000ms"))))), this.timeout);
+            setTimeout(() => reject(( new Error(( localize(6395, "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

@@ -238,7 +238,7 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
             tab: tabObject
         });
         if (editorInput instanceof MultiDiffEditorInput) {
-            this._multiDiffEditorInputListeners.set(editorInput, Event.fromObservableLight(editorInput.resources)(() => {
+            this._multiDiffEditorInputListeners.set(tabId, Event.fromObservableLight(editorInput.resources)(() => {
                 const tabInfo = this._tabInfoLookup.get(tabId);
                 if (!tabInfo) {
                     return;
@@ -270,10 +270,8 @@ let MainThreadEditorTabs = class MainThreadEditorTabs {
         if (removedTab.length === 0) {
             return;
         }
-        this._tabInfoLookup.delete(removedTab[0]?.id ?? "");
-        if (removedTab[0]?.input instanceof MultiDiffEditorInput) {
-            this._multiDiffEditorInputListeners.deleteAndDispose(removedTab[0]?.input);
-        }
+        this._tabInfoLookup.delete(removedTab[0].id);
+        this._multiDiffEditorInputListeners.deleteAndDispose(removedTab[0].id);
         this._proxy.$acceptTabOperation({
             groupId,
             index: editorIndex,

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(
-                    5075,
+                    6396,
                     "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(5076, "Reload Window")),
+                        label: ( localize(6397, "Reload Window")),
                         run: () => this._hostService.reload()
                     })]
                 }
@@ -130,7 +130,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        5077,
+                        6398,
                         "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(
-                        5078,
+                        6399,
                         "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(5079, "Manage Workspace Trust")),
+                            label: ( localize(6400, "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(
-                        5080,
+                        6401,
                         "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(5081, "Enable and Reload")),
+                            label: ( localize(6402, "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(
-                        5082,
+                        6403,
                         "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(
-                    5083,
+                    6404,
                     "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(5084, "Install and Reload")),
+                        label: ( localize(6405, "Install and Reload")),
                         run: () => this._extensionsWorkbenchService.install(dependencyExtension).then(() => this._hostService.reload(), e => this._notificationService.error(e))
                     })]
                 }
             });
         } else {
             this._notificationService.error(( localize(
-                5085,
+                6406,
                 "Cannot activate the '{0}' extension because it depends on an unknown '{1}' extension.",
                 extName,
                 missingDependency