@codingame/monaco-vscode-api 1.82.6 → 1.83.0-next.0

package/vscode/src/vs/workbench/api/common/extHostLanguageFeatures.js

@@ -1,7 +1,7 @@
 import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
 import { mixin, equals } from 'monaco-editor/esm/vs/base/common/objects.js';
 import { Range, Selection as Selection$1, CodeActionTriggerKind, Diagnostic, WorkspaceEdit, DocumentSelector, DocumentSymbol as DocumentSymbol$1, SymbolKind, SymbolTag, Position, Hover, EvaluatableExpression, InlineValueContext, InlineValue, DocumentHighlight, location, DataTransfer, TextEdit, WorkspaceSymbol, CompletionContext, CompletionItemKind, CompletionItemTag, MarkdownString, SignatureHelp, InlayHintKind, DocumentLink, Color, ColorPresentation, FoldingRange, SelectionRange, CallHierarchyItem, TypeHierarchyItem, DefinitionLink } from './extHostTypeConverters.js';
-import { CodeActionKind, CodeActionTriggerKind as CodeActionTriggerKind$1, Disposable, DocumentSymbol, Range as Range$2, InternalDataTransferItem, SemanticTokens, SemanticTokensEdits, SemanticTokensEdit, SnippetString, Location, CompletionList, InlineCompletionTriggerKind } from './extHostTypes.js';
+import { CodeActionKind, Disposable, SyntaxTokenType, DocumentSymbol, Range as Range$2, InternalDataTransferItem, SemanticTokens, SemanticTokensEdits, SemanticTokensEdit, SnippetString, Location, CompletionList, InlineCompletionTriggerKind } from './extHostTypes.js';
 import * as languages from 'monaco-editor/esm/vs/editor/common/languages.js';
 import { MainContext } from './extHost.protocol.js';
 import { regExpLeadsToEndlessLoop } from 'monaco-editor/esm/vs/base/common/strings.js';
@@ -18,7 +18,7 @@ import { Cache } from './cache.js';
 import { StopWatch } from 'monaco-editor/esm/vs/base/common/stopwatch.js';
 import { isCancellationError, NotImplementedError } from 'monaco-editor/esm/vs/base/common/errors.js';
 import { raceCancellationError } from 'monaco-editor/esm/vs/base/common/async.js';
-import { isProposedApiEnabled, checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+import { isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import { localize } from 'monaco-editor/esm/vs/nls.js';
 class DocumentSymbolAdapter {
     constructor(_documents, _provider) {
@@ -316,7 +316,6 @@ class CodeActionAdapter {
         this._apiDeprecation = _apiDeprecation;
         this._cache = ( (new Cache('CodeAction')));
         this._disposables = ( (new Map()));
-        this.nbKind = ( (new CodeActionKind('notebook')));
     }
     async provideCodeActions(resource, rangeOrSelection, context, token) {
         const doc = this._documents.getDocument(resource);
@@ -359,9 +358,6 @@ class CodeActionAdapter {
                 });
             }
             else {
-                if (codeActionContext.triggerKind !== CodeActionTriggerKind$1.Invoke && candidate.kind && this.nbKind.contains(candidate.kind)) {
-                    continue;
-                }
                 if (codeActionContext.only) {
                     if (!candidate.kind) {
                         this._logService.warn(`${this._extension.identifier.value} - Code actions of kind '${codeActionContext.only.value} 'requested but returned code action does not have a 'kind'. Code action will be dropped. Please set 'CodeAction.kind'.`);
@@ -1542,9 +1538,16 @@ class MappedEditsAdapter {
     async provideMappedEdits(resource, codeBlocks, context, token) {
         const uri = URI.revive(resource);
         const doc = this._documents.getDocument(uri);
+        const usedContext = ( (context.documents.map((docSubArray) => ( (docSubArray.map((r) => {
+            return {
+                uri: URI.revive(r.uri),
+                version: r.version,
+                ranges: ( (r.ranges.map((range) => Range.to(range)))),
+            };
+        }))))));
         const ctx = {
-            selections: ( (context.selections.map(s => Selection$1.to(s)))),
-            related: ( (context.related.map(r => ({ uri: URI.revive(r.uri), range: Range.to(r.range) })))),
+            documents: usedContext,
+            selections: usedContext[0]?.[0]?.ranges ?? []
         };
         const mappedEdits = await this._provider.provideMappedEdits(doc, codeBlocks, ctx, token);
         return mappedEdits ? WorkspaceEdit.from(mappedEdits) : null;
@@ -2089,6 +2092,18 @@ class ExtHostLanguageFeatures {
              (onEnterRules.map(ExtHostLanguageFeatures._serializeOnEnterRule))
         );
     }
+    static _serializeAutoClosingPair(autoClosingPair) {
+        return {
+            open: autoClosingPair.open,
+            close: autoClosingPair.close,
+            notIn: autoClosingPair.notIn ? ( (autoClosingPair.notIn.map(v => ( (SyntaxTokenType.toString(v)))))) : undefined,
+        };
+    }
+    static _serializeAutoClosingPairs(autoClosingPairs) {
+        return (
+             (autoClosingPairs.map(ExtHostLanguageFeatures._serializeAutoClosingPair))
+        );
+    }
     setLanguageConfiguration(extension, languageId, configuration) {
         const { wordPattern } = configuration;
         if (wordPattern && regExpLeadsToEndlessLoop(wordPattern)) {
@@ -2106,9 +2121,6 @@ class ExtHostLanguageFeatures {
         if (configuration.__characterPairSupport) {
             this._apiDeprecation.report('LanguageConfiguration.__characterPairSupport', extension, `Do not use.`);
         }
-        if (configuration.autoClosingPairs) {
-            checkProposedApiEnabled(extension, 'languageConfigurationAutoClosingPairs');
-        }
         const handle = this._nextHandle();
         const serializedConfiguration = {
             comments: configuration.comments,
@@ -2118,7 +2130,7 @@ class ExtHostLanguageFeatures {
             onEnterRules: configuration.onEnterRules ? ExtHostLanguageFeatures._serializeOnEnterRules(configuration.onEnterRules) : undefined,
             __electricCharacterSupport: configuration.__electricCharacterSupport,
             __characterPairSupport: configuration.__characterPairSupport,
-            autoClosingPairs: configuration.autoClosingPairs
+            autoClosingPairs: configuration.autoClosingPairs ? ExtHostLanguageFeatures._serializeAutoClosingPairs(configuration.autoClosingPairs) : undefined,
         };
         this._proxy.$setLanguageConfiguration(handle, languageId, serializedConfiguration);
         return this._createDisposable(handle);

package/vscode/src/vs/workbench/api/common/extHostNotebookKernels.js

@@ -72,7 +72,6 @@ let ExtHostNotebookKernels = class ExtHostNotebookKernels {
         this._logService.trace(`NotebookController[${handle}], CREATED by ${extension.identifier.value}, ${id}`);
         const _defaultExecutHandler = () => console.warn(`NO execute handler from notebook controller '${data.id}' of extension: '${extension.identifier}'`);
         let isDisposed = false;
-        const commandDisposables = ( new DisposableStore());
         const onDidChangeSelection = ( new Emitter());
         const onDidReceiveMessage = ( new Emitter());
         const data = {
@@ -184,7 +183,6 @@ let ExtHostNotebookKernels = class ExtHostNotebookKernels {
                     this._logService.trace(`NotebookController[${handle}], DISPOSED`);
                     isDisposed = true;
                     this._kernelData.delete(handle);
-                    commandDisposables.dispose();
                     onDidChangeSelection.dispose();
                     onDidReceiveMessage.dispose();
                     this._proxy.$removeKernel(handle);

package/vscode/src/vs/workbench/api/common/extHostRequireInterceptor.js

@@ -9,7 +9,6 @@ import { IExtHostRpcService } from './extHostRpcService.js';
 import { IExtHostInitDataService } from './extHostInitDataService.js';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
 import { IExtHostExtensionService } from './extHostExtensionService.js';
-import { platform } from 'monaco-editor/esm/vs/base/common/process.js';
 import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
 import { escapeRegExpCharacters } from 'monaco-editor/esm/vs/base/common/strings.js';
 var NodeModuleAliasingModuleFactory_1;
@@ -38,7 +37,6 @@ let RequireInterceptor = class RequireInterceptor {
             configProvider,
             this._logService
         )));
-        this.register(this._instaService.createInstance(KeytarNodeModuleFactory, extensionPaths));
         this.register(this._instaService.createInstance(NodeModuleAliasingModuleFactory));
         if (this._initData.remote.isRemote) {
             this.register(this._instaService.createInstance(OpenNodeModuleFactory, extensionPaths, this._initData.environment.appUriScheme));
@@ -136,67 +134,6 @@ class VSCodeNodeModuleFactory {
         return this._defaultApiImpl;
     }
 }
-let KeytarNodeModuleFactory = class KeytarNodeModuleFactory {
-    constructor(_extensionPaths, rpcService, initData) {
-        this._extensionPaths = _extensionPaths;
-        this.nodeModuleName = 'keytar';
-        this._mainThreadTelemetry = ( rpcService.getProxy(MainContext.MainThreadTelemetry));
-        const { environment } = initData;
-        const mainThreadKeytar = ( rpcService.getProxy(MainContext.MainThreadKeytar));
-        if (environment.appRoot) {
-            let appRoot = environment.appRoot.fsPath;
-            if (platform === 'win32') {
-                appRoot = appRoot.replace(/\\/g, '/');
-            }
-            if (appRoot[appRoot.length - 1] === '/') {
-                appRoot = appRoot.substr(0, appRoot.length - 1);
-            }
-            this.alternativeNames = ( new Set());
-            this.alternativeNames.add(`${appRoot}/node_modules.asar/keytar`);
-            this.alternativeNames.add(`${appRoot}/node_modules/keytar`);
-        }
-        this._impl = {
-            getPassword: (service, account) => {
-                return mainThreadKeytar.$getPassword(service, account);
-            },
-            setPassword: (service, account, password) => {
-                return mainThreadKeytar.$setPassword(service, account, password);
-            },
-            deletePassword: (service, account) => {
-                return mainThreadKeytar.$deletePassword(service, account);
-            },
-            findPassword: (service) => {
-                return mainThreadKeytar.$findPassword(service);
-            },
-            findCredentials(service) {
-                return mainThreadKeytar.$findCredentials(service);
-            }
-        };
-    }
-    load(_request, parent) {
-        const ext = this._extensionPaths.findSubstr(parent);
-        this._mainThreadTelemetry.$publicLog2('shimming.keytar', { extension: ext?.identifier.value ?? 'unknown_extension' });
-        return this._impl;
-    }
-    alternativeModuleName(name) {
-        const length = name.length;
-        if (length <= 7 || !this.alternativeNames) {
-            return undefined;
-        }
-        const sep = length - 7;
-        if ((name.charAt(sep) === '/' || name.charAt(sep) === '\\') && name.endsWith('keytar')) {
-            name = name.replace(/\\/g, '/');
-            if (( this.alternativeNames.has(name))) {
-                return 'keytar';
-            }
-        }
-        return undefined;
-    }
-};
-KeytarNodeModuleFactory = ( __decorate([
-    ( __param(1, IExtHostRpcService)),
-    ( __param(2, IExtHostInitDataService))
-], KeytarNodeModuleFactory));
 let OpenNodeModuleFactory = class OpenNodeModuleFactory {
     constructor(_extensionPaths, _appUriScheme, rpcService) {
         this._extensionPaths = _extensionPaths;

package/vscode/src/vs/workbench/api/common/extHostSCM.js

@@ -31,6 +31,21 @@ function getIconResource(decorations) {
         return undefined;
     }
 }
+function getHistoryItemIconDto(historyItem) {
+    if (!historyItem.icon) {
+        return undefined;
+    }
+    else if (URI.isUri(historyItem.icon)) {
+        return historyItem.icon;
+    }
+    else if (ThemeIcon.isThemeIcon(historyItem.icon)) {
+        return historyItem.icon;
+    }
+    else {
+        const icon = historyItem.icon;
+        return { light: icon.light, dark: icon.dark };
+    }
+}
 function compareResourceThemableDecorations(a, b) {
     if (!a.iconPath && !b.iconPath) {
         return 0;
@@ -168,6 +183,15 @@ function commandEquals(a, b) {
 function commandListEquals(a, b) {
     return equals(a, b, commandEquals);
 }
+function historyItemGroupEquals(a, b) {
+    if (a === b) {
+        return true;
+    }
+    if (!a || !b) {
+        return false;
+    }
+    return a.id === b.id && a.label === b.label && a.upstream?.id === b.upstream?.id && a.upstream?.label === b.upstream?.label;
+}
 class ExtHostSCMInputBox {
     #proxy;
     #extHostDocuments;
@@ -395,6 +419,36 @@ class ExtHostSourceControl {
         }
         this.#proxy.$updateSourceControl(this.handle, { hasQuickDiffProvider: !!quickDiffProvider, quickDiffLabel });
     }
+    get historyProvider() {
+        checkProposedApiEnabled(this._extension, 'scmHistoryProvider');
+        return this._historyProvider;
+    }
+    set historyProvider(historyProvider) {
+        checkProposedApiEnabled(this._extension, 'scmHistoryProvider');
+        this._historyProvider = historyProvider;
+        this._historyProviderDisposable.value = ( (new DisposableStore()));
+        this.#proxy.$updateSourceControl(this.handle, { hasHistoryProvider: !!historyProvider });
+        if (historyProvider) {
+            this._historyProviderDisposable.value.add(historyProvider.onDidChangeCurrentHistoryItemGroup(() => {
+                if (historyItemGroupEquals(this._historyProviderCurrentHistoryItemGroup, historyProvider?.currentHistoryItemGroup)) {
+                    return;
+                }
+                this._historyProviderCurrentHistoryItemGroup = historyProvider?.currentHistoryItemGroup;
+                this.#proxy.$onDidChangeHistoryProviderCurrentHistoryItemGroup(this.handle, this._historyProviderCurrentHistoryItemGroup);
+            }));
+            this._historyProviderDisposable.value.add(historyProvider.onDidChangeActionButton(() => {
+                checkProposedApiEnabled(this._extension, 'scmActionButton');
+                this._historyProviderActionButtonDisposable.value = ( (new DisposableStore()));
+                const internal = historyProvider.actionButton !== undefined ?
+                    {
+                        command: this._commands.converter.toInternal(historyProvider.actionButton.command, this._historyProviderActionButtonDisposable.value),
+                        description: historyProvider.actionButton.description,
+                        enabled: historyProvider.actionButton.enabled
+                    } : undefined;
+                this.#proxy.$onDidChangeHistoryProviderActionButton(this.handle, internal ?? null);
+            }));
+        }
+    }
     get commitTemplate() {
         return this._commitTemplate;
     }
@@ -463,6 +517,8 @@ class ExtHostSourceControl {
         this._groups = ( (new Map()));
         this._count = undefined;
         this._quickDiffProvider = undefined;
+        this._historyProviderDisposable = ( (new MutableDisposable()));
+        this._historyProviderActionButtonDisposable = ( (new MutableDisposable()));
         this._commitTemplate = undefined;
         this._acceptInputDisposables = ( (new MutableDisposable()));
         this._acceptInputCommand = undefined;
@@ -690,6 +746,30 @@ let ExtHostSCM = class ExtHostSCM {
         this._selectedSourceControlHandle = selectedSourceControlHandle;
         return Promise.resolve(undefined);
     }
+    async $resolveHistoryItemGroupBase(sourceControlHandle, historyItemGroupId, token) {
+        const historyProvider = this._sourceControls.get(sourceControlHandle)?.historyProvider;
+        return (await historyProvider?.resolveHistoryItemGroupBase(historyItemGroupId, token)) ?? undefined;
+    }
+    async $resolveHistoryItemGroupCommonAncestor(sourceControlHandle, historyItemGroupId1, historyItemGroupId2, token) {
+        const historyProvider = this._sourceControls.get(sourceControlHandle)?.historyProvider;
+        return (await historyProvider?.resolveHistoryItemGroupCommonAncestor(historyItemGroupId1, historyItemGroupId2, token)) ?? undefined;
+    }
+    async $provideHistoryItems(sourceControlHandle, historyItemGroupId, options, token) {
+        const historyProvider = this._sourceControls.get(sourceControlHandle)?.historyProvider;
+        const historyItems = await historyProvider?.provideHistoryItems(historyItemGroupId, options, token);
+        return historyItems?.map(item => ({
+            id: item.id,
+            parentIds: item.parentIds,
+            label: item.label,
+            description: item.description,
+            icon: getHistoryItemIconDto(item),
+            timestamp: item.timestamp,
+        })) ?? undefined;
+    }
+    async $provideHistoryItemChanges(sourceControlHandle, historyItemId, token) {
+        const historyProvider = this._sourceControls.get(sourceControlHandle)?.historyProvider;
+        return (await historyProvider?.provideHistoryItemChanges(historyItemId, token)) ?? undefined;
+    }
 };
 ExtHostSCM = ExtHostSCM_1 = ( (__decorate([
     ( (__param(3, ILogService)))

package/vscode/src/vs/workbench/api/common/extHostTerminalService.js

@@ -284,6 +284,30 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
         this._proxy = ( extHostRpc.getProxy(MainContext.MainThreadTerminalService));
         this._bufferer = ( new TerminalDataBufferer(this._proxy.$sendProcessData));
         this._proxy.$registerProcessSupport(supportsProcesses);
+        this._extHostCommands.registerArgumentProcessor({
+            processArgument: arg => {
+                const deserialize = (arg) => {
+                    const cast = arg;
+                    return this._getTerminalById(cast.instanceId)?.value;
+                };
+                switch (arg?.$mid) {
+                    case 15 : return deserialize(arg);
+                    default: {
+                        if (Array.isArray(arg)) {
+                            for (let i = 0; i < arg.length; i++) {
+                                if (arg[i].$mid === 15 ) {
+                                    arg[i] = deserialize(arg[i]);
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                        }
+                        return arg;
+                    }
+                }
+            }
+        });
         this._register({
             dispose: () => {
                 for (const [_, terminalProcess] of this._terminalProcesses) {

package/vscode/src/vs/workbench/api/common/extHostTesting.js

@@ -1,10 +1,10 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { mapFind } from 'monaco-editor/esm/vs/base/common/arrays.js';
+import { mapFindFirst } from 'monaco-editor/esm/vs/base/common/arraysFind.js';
 import { RunOnceScheduler } from 'monaco-editor/esm/vs/base/common/async.js';
 import { VSBuffer } from 'monaco-editor/esm/vs/base/common/buffer.js';
 import { CancellationToken, CancellationTokenSource } from 'monaco-editor/esm/vs/base/common/cancellation.js';
 import { Emitter, Event } from 'monaco-editor/esm/vs/base/common/event.js';
-import { once } from 'monaco-editor/esm/vs/base/common/functional.js';
+import { createSingleCallFunction } from 'monaco-editor/esm/vs/base/common/functional.js';
 import { hash } from 'monaco-editor/esm/vs/base/common/hash.js';
 import { toDisposable, DisposableStore, Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { deepFreeze } from 'monaco-editor/esm/vs/base/common/objects.js';
@@ -32,13 +32,13 @@ let ExtHostTesting = class ExtHostTesting {
         commands.registerArgumentProcessor({
             processArgument: arg => {
                 switch (arg?.$mid) {
-                    case 15 : {
+                    case 16 : {
                         const cast = arg;
                         const targetTest = cast.tests[cast.tests.length - 1].item.extId;
                         const controller = this.controllers.get(TestId.root(targetTest));
                         return controller?.collection.tree.get(targetTest)?.actual ?? toItemFromContext(arg);
                     }
-                    case 17 : {
+                    case 18 : {
                         const { extId, message } = arg;
                         return {
                             test: this.controllers.get(TestId.root(extId))?.collection.tree.get(extId)?.actual,
@@ -174,11 +174,11 @@ let ExtHostTesting = class ExtHostTesting {
         return Promise.resolve();
     }
     $provideFileCoverage(runId, taskId, token) {
-        const coverage = mapFind(this.runTracker.trackers, t => t.id === runId ? t.getCoverage(taskId) : undefined);
+        const coverage = mapFindFirst(this.runTracker.trackers, t => t.id === runId ? t.getCoverage(taskId) : undefined);
         return coverage?.provideFileCoverage(token) ?? Promise.resolve([]);
     }
     $resolveFileCoverage(runId, taskId, fileIndex, token) {
-        const coverage = mapFind(this.runTracker.trackers, t => t.id === runId ? t.getCoverage(taskId) : undefined);
+        const coverage = mapFindFirst(this.runTracker.trackers, t => t.id === runId ? t.getCoverage(taskId) : undefined);
         return coverage?.resolveFileCoverage(fileIndex, token) ?? Promise.resolve([]);
     }
     $configureRunProfile(controllerId, profileId) {
@@ -429,6 +429,10 @@ class TestRunTracker extends Disposable {
         }
         this.proxy.$addTestsToRun(this.dto.controllerId, this.dto.id, chain);
     }
+    dispose() {
+        this.markEnded();
+        super.dispose();
+    }
 }
 class TestRunCoordinator {
     get trackers() {
@@ -471,7 +475,7 @@ class TestRunCoordinator {
             persist
         });
         const tracker = this.getTracker(request, dto, extension);
-        tracker.onEnd(() => {
+        Event.once(tracker.onEnd)(() => {
             this.proxy.$finishedExtensionTestRun(dto.id);
             tracker.dispose();
         });
@@ -480,7 +484,7 @@ class TestRunCoordinator {
     getTracker(req, dto, extension, token) {
         const tracker = ( new TestRunTracker(dto, this.proxy, extension, token));
         this.tracked.set(req, tracker);
-        tracker.onEnd(() => this.tracked.delete(req));
+        Event.once(tracker.onEnd)(() => this.tracked.delete(req));
         return tracker;
     }
 }
@@ -631,7 +635,7 @@ class MirroredTestCollection extends AbstractIncrementalTestCollection {
         this.onDidChangeTests = this.changeEmitter.event;
     }
     get rootTests() {
-        return super.roots;
+        return this.roots;
     }
     getMirroredTestDataById(itemId) {
         return this.items.get(itemId);
@@ -664,7 +668,7 @@ class TestObservers {
         return {
             onDidChangeTest: current.tests.onDidChangeTests,
             get tests() { return ( [...current.tests.rootTests].map(t => t.revived)); },
-            dispose: once(() => {
+            dispose: createSingleCallFunction(() => {
                 if (--current.observers === 0) {
                     this.proxy.$unsubscribeFromDiffs();
                     this.current = undefined;

package/vscode/src/vs/workbench/api/common/extHostTextEditor.js

@@ -1,5 +1,5 @@
 import { ok } from 'monaco-editor/esm/vs/base/common/assert.js';
-import { readonly, illegalArgument } from 'monaco-editor/esm/vs/base/common/errors.js';
+import { ReadonlyError, illegalArgument } from 'monaco-editor/esm/vs/base/common/errors.js';
 import { IdGenerator } from 'monaco-editor/esm/vs/base/common/idGenerator.js';
 import { DecorationRenderOptions, Position as Position$1, Range as Range$1, isDecorationOptionsArr, fromRangeOrRangeWithMessage, ViewColumn, EndOfLine, TextEditorLineNumbersStyle, Selection as Selection$1 } from './extHostTypeConverters.js';
 import { Selection, Position, Range, TextEditorRevealType, EndOfLine as EndOfLine$1 } from './extHostTypes.js';
@@ -314,7 +314,7 @@ class ExtHostTextEditor {
                 return document.value;
             },
             set document(_value) {
-                throw readonly('document');
+                throw new ReadonlyError('document');
             },
             get selection() {
                 return that._selections && that._selections[0];
@@ -340,7 +340,7 @@ class ExtHostTextEditor {
                 return that._visibleRanges;
             },
             set visibleRanges(_value) {
-                throw readonly('visibleRanges');
+                throw new ReadonlyError('visibleRanges');
             },
             get options() {
                 return that._options.value;
@@ -354,7 +354,7 @@ class ExtHostTextEditor {
                 return that._viewColumn;
             },
             set viewColumn(_value) {
-                throw readonly('viewColumn');
+                throw new ReadonlyError('viewColumn');
             },
             edit(callback, options = { undoStopBefore: true, undoStopAfter: true }) {
                 if (that._disposed) {

package/vscode/src/vs/workbench/api/common/extHostTreeViews.js

@@ -1,11 +1,11 @@
 import { localize } from 'monaco-editor/esm/vs/nls.js';
-import { TreeItemCheckboxState, MarkdownString as MarkdownString$1, TreeItem, TreeItemCollapsibleState, ThemeIcon, DataTransfer as DataTransfer$1, ViewBadge as ViewBadge$1 } from './extHostTypes.js';
 import { basename } from 'monaco-editor/esm/vs/base/common/resources.js';
 import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
 import { Emitter, Event } from 'monaco-editor/esm/vs/base/common/event.js';
 import { Disposable, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { NoTreeViewError } from '../../common/views.js';
 import { asPromise } from 'monaco-editor/esm/vs/base/common/async.js';
+import { TreeItemCheckboxState, MarkdownString as MarkdownString$1, TreeItem, TreeItemCollapsibleState, ThemeIcon, DataTransfer as DataTransfer$1, ViewBadge as ViewBadge$1 } from './extHostTypes.js';
 import { isUndefinedOrNull, isString } from 'monaco-editor/esm/vs/base/common/types.js';
 import { equals, coalesce } from 'monaco-editor/esm/vs/base/common/arrays.js';
 import { MarkdownString, ViewBadge, DataTransfer } from './extHostTypeConverters.js';
@@ -29,8 +29,9 @@ function toTreeItemLabel(label, extension) {
     }
     return undefined;
 }
-class ExtHostTreeViews {
+class ExtHostTreeViews extends Disposable {
     constructor(_proxy, commands, logService) {
+        super();
         this._proxy = _proxy;
         this.commands = commands;
         this.logService = logService;
@@ -131,6 +132,7 @@ class ExtHostTreeViews {
                 treeView.dispose();
             }
         };
+        this._register(view);
         return view;
     }
     $getChildren(treeViewId, treeItemHandle) {
@@ -226,14 +228,14 @@ class ExtHostTreeViews {
         treeView.setCheckboxState(checkboxUpdate);
     }
     createExtHostTreeView(id, options, extension) {
-        const treeView = ( (new ExtHostTreeView(
+        const treeView = this._register(( (new ExtHostTreeView(
             id,
             options,
             this._proxy,
             this.commands.converter,
             this.logService,
             extension
-        )));
+        ))));
         this.treeViews.set(id, treeView);
         return treeView;
     }
@@ -301,7 +303,7 @@ class ExtHostTreeView extends Disposable {
         }
         let refreshingPromise;
         let promiseCallback;
-        this._register(Event.debounce(this._onDidChangeData.event, (result, current) => {
+        const onDidChangeData = Event.debounce(this._onDidChangeData.event, (result, current) => {
             if (!result) {
                 result = { message: false, elements: [] };
             }
@@ -321,7 +323,8 @@ class ExtHostTreeView extends Disposable {
                 result.message = true;
             }
             return result;
-        }, 200, true)(({ message, elements }) => {
+        }, 200, true);
+        this._register(onDidChangeData(({ message, elements }) => {
             if (elements.length) {
                 this.refreshQueue = this.refreshQueue.then(() => {
                     const _promiseCallback = promiseCallback;
@@ -684,7 +687,7 @@ class ExtHostTreeView extends Disposable {
     }
     createTreeNode(element, extensionTreeItem, parent) {
         this.validateTreeItem(extensionTreeItem);
-        const disposableStore = ( (new DisposableStore()));
+        const disposableStore = this._register(( (new DisposableStore())));
         const handle = this.createHandle(element, extensionTreeItem, parent);
         const icon = this.getLightIconPath(extensionTreeItem);
         const item = {
@@ -831,6 +834,7 @@ class ExtHostTreeView extends Disposable {
         this.nodes.clear();
     }
     dispose() {
+        super.dispose();
         this._refreshCancellationSource.dispose();
         this.clearAll();
         this.proxy.$disposeTree(this.viewId);

package/vscode/src/vs/workbench/api/common/extHostTypeConverters.js

@@ -1,7 +1,7 @@
 import { coalesce, asArray, isNonEmptyArray } from 'monaco-editor/esm/vs/base/common/arrays.js';
 import { encodeBase64, VSBuffer } from 'monaco-editor/esm/vs/base/common/buffer.js';
 import { UriList } from 'monaco-editor/esm/vs/base/common/dataTransfer.js';
-import { once } from 'monaco-editor/esm/vs/base/common/functional.js';
+import { createSingleCallFunction } from 'monaco-editor/esm/vs/base/common/functional.js';
 import * as htmlContent from 'monaco-editor/esm/vs/base/common/htmlContent.js';
 import { ResourceSet, ResourceMap } from 'monaco-editor/esm/vs/base/common/map.js';
 import { marked } from 'monaco-editor/esm/vs/base/common/marked/marked.js';
@@ -19,7 +19,7 @@ import { CellKind, NotebookCellExecutionState as NotebookCellExecutionState$1 }
 import { TestId } from '../../contrib/testing/common/testId.js';
 import { namespaceTestTag, denamespaceTestTag } from '../../contrib/testing/common/testTypes.js';
 import { SIDE_GROUP, ACTIVE_GROUP } from '../../services/editor/common/editorService.js';
-import { Position as Position$1, Selection as Selection$1, Range as Range$1, Diagnostic as Diagnostic$1, ViewColumn as ViewColumn$1, MarkdownString as MarkdownString$1, TextEdit as TextEdit$1, WorkspaceEdit as WorkspaceEdit$1, SnippetTextEdit, SnippetString, SymbolKind as SymbolKind$1, SymbolInformation, CallHierarchyItem as CallHierarchyItem$1, CallHierarchyIncomingCall as CallHierarchyIncomingCall$1, CallHierarchyOutgoingCall as CallHierarchyOutgoingCall$1, Location, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, CompletionItemKind as CompletionItemKind$1, InlayHint as InlayHint$1, DocumentLink as DocumentLink$1, ColorPresentation as ColorPresentation$1, Color as Color$1, NotebookRange as NotebookRange$1, NotebookCellData as NotebookCellData$1, NotebookCellOutputItem as NotebookCellOutputItem$1, NotebookCellOutput as NotebookCellOutput$1, TestTag as TestTag$1, CodeActionTriggerKind as CodeActionTriggerKind$1, TypeHierarchyItem as TypeHierarchyItem$1, ChatMessage as ChatMessage$1, DiagnosticRelatedInformation as DiagnosticRelatedInformation$1, DiagnosticSeverity as DiagnosticSeverity$1, SymbolTag as SymbolTag$1, DocumentSymbol as DocumentSymbol$1, Hover as Hover$1, EvaluatableExpression as EvaluatableExpression$1, InlineValueContext as InlineValueContext$1, DocumentHighlight as DocumentHighlight$1, CompletionItemTag as CompletionItemTag$1, CompletionItem as CompletionItem$1, InlayHintLabelPart as InlayHintLabelPart$1, SelectionRange as SelectionRange$1, EndOfLine as EndOfLine$1, FoldingRangeKind as FoldingRangeKind$1, RelativePattern, NotebookData as NotebookData$1, NotebookCellStatusBarAlignment, DataTransfer as DataTransfer$1, ChatMessageRole as ChatMessageRole$1, ChatVariableLevel as ChatVariableLevel$1, DiagnosticTag as DiagnosticTag$1, DecorationRangeBehavior as DecorationRangeBehavior$1, NotebookCellKind as NotebookCellKind$1, StandardTokenType, CompletionTriggerKind as CompletionTriggerKind$1, TextDocumentSaveReason as TextDocumentSaveReason$1, TextEditorLineNumbersStyle as TextEditorLineNumbersStyle$1, ProgressLocation as ProgressLocation$1, NotebookCellExecutionState as NotebookCellExecutionState$2, TestMessage as TestMessage$1, InternalFileDataTransferItem, DataTransferFile, InternalDataTransferItem, NotebookRendererScript as NotebookRendererScript$1 } from './extHostTypes.js';
+import { Position as Position$1, Selection as Selection$1, Range as Range$1, Diagnostic as Diagnostic$1, ViewColumn as ViewColumn$1, MarkdownString as MarkdownString$1, TextEdit as TextEdit$1, WorkspaceEdit as WorkspaceEdit$1, SnippetTextEdit, SnippetString, SymbolKind as SymbolKind$1, SymbolInformation, CallHierarchyItem as CallHierarchyItem$1, CallHierarchyIncomingCall as CallHierarchyIncomingCall$1, CallHierarchyOutgoingCall as CallHierarchyOutgoingCall$1, Location, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, InlineValueContext as InlineValueContext$1, CompletionItemKind as CompletionItemKind$1, InlayHint as InlayHint$1, DocumentLink as DocumentLink$1, ColorPresentation as ColorPresentation$1, Color as Color$1, NotebookRange as NotebookRange$1, NotebookCellData as NotebookCellData$1, NotebookCellOutputItem as NotebookCellOutputItem$1, NotebookCellOutput as NotebookCellOutput$1, TestTag as TestTag$1, CodeActionTriggerKind as CodeActionTriggerKind$1, TypeHierarchyItem as TypeHierarchyItem$1, ChatMessage as ChatMessage$1, InteractiveEditorResponseFeedbackKind as InteractiveEditorResponseFeedbackKind$1, DiagnosticRelatedInformation as DiagnosticRelatedInformation$1, DiagnosticSeverity as DiagnosticSeverity$1, SymbolTag as SymbolTag$1, DocumentSymbol as DocumentSymbol$1, Hover as Hover$1, EvaluatableExpression as EvaluatableExpression$1, DocumentHighlight as DocumentHighlight$1, CompletionItemTag as CompletionItemTag$1, CompletionItem as CompletionItem$1, InlayHintLabelPart as InlayHintLabelPart$1, SelectionRange as SelectionRange$1, EndOfLine as EndOfLine$1, FoldingRangeKind as FoldingRangeKind$1, RelativePattern, NotebookData as NotebookData$1, NotebookCellStatusBarAlignment, DataTransfer as DataTransfer$1, ChatMessageRole as ChatMessageRole$1, ChatVariableLevel as ChatVariableLevel$1, DiagnosticTag as DiagnosticTag$1, DecorationRangeBehavior as DecorationRangeBehavior$1, NotebookCellKind as NotebookCellKind$1, StandardTokenType, CompletionTriggerKind as CompletionTriggerKind$1, TextDocumentSaveReason as TextDocumentSaveReason$1, TextEditorLineNumbersStyle as TextEditorLineNumbersStyle$1, ProgressLocation as ProgressLocation$1, NotebookCellExecutionState as NotebookCellExecutionState$2, TestMessage as TestMessage$1, InternalFileDataTransferItem, DataTransferFile, InternalDataTransferItem, NotebookRendererScript as NotebookRendererScript$1 } from './extHostTypes.js';
 var Selection;
 ( ((function(Selection) {
     function to(selection) {
@@ -1456,23 +1456,23 @@ var LanguageSelector;
 var MappedEditsContext;
 ( ((function(MappedEditsContext) {
     function is(v) {
-        return (!!v &&
-            typeof v === 'object' &&
-            'selections' in v &&
-            Array.isArray(v.selections) &&
-            v.selections.every(s => s instanceof Selection$1) &&
-            'related' in v &&
-            Array.isArray(v.related) &&
-            v.related.every(e => e && typeof e === 'object' && URI.isUri(e.uri) && e.range instanceof Range$1));
+        return (!!v && typeof v === 'object' &&
+            'documents' in v &&
+            Array.isArray(v.documents) &&
+            v.documents.every(subArr => Array.isArray(subArr) &&
+                subArr.every(docRef => docRef && typeof docRef === 'object' &&
+                    'uri' in docRef && URI.isUri(docRef.uri) &&
+                    'version' in docRef && typeof docRef.version === 'number' &&
+                    'ranges' in docRef && Array.isArray(docRef.ranges) && docRef.ranges.every((r) => r instanceof Range$1))));
     }
     MappedEditsContext.is = is;
     function from(extContext) {
         return {
-            selections: ( (extContext.selections.map(s => Selection.from(s)))),
-            related: ( (extContext.related.map(r => ({
+            documents: ( (extContext.documents.map((subArray) => ( (subArray.map((r) => ({
                 uri: ( (URI.from(r.uri))),
-                range: Range.from(r.range)
-            }))))
+                version: r.version,
+                ranges: ( (r.ranges.map((r) => Range.from(r)))),
+            }))))))),
         };
     }
     MappedEditsContext.from = from;
@@ -1938,7 +1938,7 @@ var DataTransferItem;
     function to(mime, item, resolveFileData) {
         const file = item.fileData;
         if (file) {
-            return new InternalFileDataTransferItem(new DataTransferFile(file.name, URI.revive(file.uri), file.id, once(() => resolveFileData(file.id))));
+            return new InternalFileDataTransferItem(new DataTransferFile(file.name, URI.revive(file.uri), file.id, createSingleCallFunction(() => resolveFileData(file.id))));
         }
         if (mime === Mimes.uriList && item.uriListData) {
             return new InternalDataTransferItem(reviveUriList(item.uriListData));
@@ -2136,6 +2136,24 @@ var ChatVariableLevel;
     }
     ChatVariableLevel.from = from;
 })(ChatVariableLevel || (ChatVariableLevel = {}))));
+var InteractiveEditorResponseFeedbackKind;
+( ((function(InteractiveEditorResponseFeedbackKind) {
+    function to(kind) {
+        switch (kind) {
+            case 1 :
+                return InteractiveEditorResponseFeedbackKind$1.Helpful;
+            case 0 :
+                return InteractiveEditorResponseFeedbackKind$1.Unhelpful;
+            case 2 :
+                return InteractiveEditorResponseFeedbackKind$1.Undone;
+            case 3 :
+                return InteractiveEditorResponseFeedbackKind$1.Accepted;
+        }
+    }
+    InteractiveEditorResponseFeedbackKind.to = to;
+})(
+    InteractiveEditorResponseFeedbackKind || (InteractiveEditorResponseFeedbackKind = {})
+)));
 var TerminalQuickFix;
 ( ((function(TerminalQuickFix) {
     function from(quickFix, converter, disposables) {
@@ -2149,4 +2167,4 @@ var TerminalQuickFix;
     }
     TerminalQuickFix.from = from;
 })(TerminalQuickFix || (TerminalQuickFix = {}))));
-export { CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, ChatFollowup, ChatMessage, ChatMessageRole, ChatReplyFollowup, ChatVariable, ChatVariableLevel, CodeActionTriggerKind, Color, ColorPresentation, CompletionContext, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionTriggerKind, DataTransfer, DataTransferItem, DecorationRangeBehavior, DecorationRenderOptions, DefinitionLink, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, DocumentHighlight, DocumentLink, DocumentSelector, DocumentSymbol, EndOfLine, EvaluatableExpression, FoldingRange, FoldingRangeKind, GlobPattern, Hover, InlayHint, InlayHintKind, InlayHintLabelPart, InlineValue, InlineValueContext, LanguageSelector, MappedEditsContext, MarkdownString, NotebookCellData, NotebookCellExecutionState, NotebookCellExecutionSummary, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookData, NotebookDocumentContentOptions, NotebookExclusiveDocumentPattern, NotebookKernelSourceAction, NotebookRange, NotebookRendererScript, NotebookStatusBarItem, ParameterInformation, Position, ProgressLocation, Range, Selection, SelectionRange, SignatureHelp, SignatureInformation, SymbolKind, SymbolTag, TerminalQuickFix, TestCoverage, TestItem, TestMessage, TestResults, TestTag, TextDocumentSaveReason, TextEdit, TextEditorLineNumbersStyle, TextEditorOpenOptions, ThemableDecorationAttachmentRenderOptions, ThemableDecorationRenderOptions, TokenType, TypeHierarchyItem, ViewBadge, ViewColumn, WorkspaceEdit, WorkspaceSymbol, fromRangeOrRangeWithMessage, isDecorationOptionsArr, location, pathOrURIToURI };
+export { CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, ChatFollowup, ChatMessage, ChatMessageRole, ChatReplyFollowup, ChatVariable, ChatVariableLevel, CodeActionTriggerKind, Color, ColorPresentation, CompletionContext, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionTriggerKind, DataTransfer, DataTransferItem, DecorationRangeBehavior, DecorationRenderOptions, DefinitionLink, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, DocumentHighlight, DocumentLink, DocumentSelector, DocumentSymbol, EndOfLine, EvaluatableExpression, FoldingRange, FoldingRangeKind, GlobPattern, Hover, InlayHint, InlayHintKind, InlayHintLabelPart, InlineValue, InlineValueContext, InteractiveEditorResponseFeedbackKind, LanguageSelector, MappedEditsContext, MarkdownString, NotebookCellData, NotebookCellExecutionState, NotebookCellExecutionSummary, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookData, NotebookDocumentContentOptions, NotebookExclusiveDocumentPattern, NotebookKernelSourceAction, NotebookRange, NotebookRendererScript, NotebookStatusBarItem, ParameterInformation, Position, ProgressLocation, Range, Selection, SelectionRange, SignatureHelp, SignatureInformation, SymbolKind, SymbolTag, TerminalQuickFix, TestCoverage, TestItem, TestMessage, TestResults, TestTag, TextDocumentSaveReason, TextEdit, TextEditorLineNumbersStyle, TextEditorOpenOptions, ThemableDecorationAttachmentRenderOptions, ThemableDecorationRenderOptions, TokenType, TypeHierarchyItem, ViewBadge, ViewColumn, WorkspaceEdit, WorkspaceSymbol, fromRangeOrRangeWithMessage, isDecorationOptionsArr, location, pathOrURIToURI };