@codingame/monaco-vscode-api 6.0.2 → 7.0.0

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

@@ -9,19 +9,23 @@ import { Disposable, toDisposable, DisposableStore } from '../../../base/common/
 import { MarshalledId } from '../../../base/common/marshallingIds.js';
 import { isDefined } from '../../../base/common/types.js';
 import { generateUuid } from '../../../base/common/uuid.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../platform/log/common/log.service.js';
 import { MainContext } from './extHost.protocol.js';
+import { IExtHostCommands } from './extHostCommands.js';
+import { IExtHostDocumentsAndEditors } from './extHostDocumentsAndEditors.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
 import { toItemFromContext, ExtHostTestItemCollection, TestItemImpl, TestItemRootImpl } from './extHostTestItem.js';
 import { TestMessage, TestCoverage, TestResults, TestTag, location, TestItem, Range } from './extHostTypeConverters.js';
 import { TestRunProfileKind, TestRunRequest, FileCoverage } from './extHostTypes.js';
 import { TestCommandId } from '../../contrib/testing/common/constants.js';
-import { TestId, TestPosition, TestIdPathParts } from '../../contrib/testing/common/testId.js';
+import { TestId, TestPosition } from '../../contrib/testing/common/testId.js';
 import { InvalidTestItemError } from '../../contrib/testing/common/testItemCollection.js';
 import { TestsDiffOp, isStartControllerTests, TestRunProfileBitset, AbstractIncrementalTestCollection, TestResultState } from '../../contrib/testing/common/testTypes.js';
 import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 let followupCounter = 0;
 const testResultInternalIDs = ( new WeakMap());
+const IExtHostTesting = ( createDecorator('IExtHostTesting'));
 let ExtHostTesting = class ExtHostTesting extends Disposable {
     constructor(rpc, logService, commands, editors) {
         super();
@@ -172,9 +176,9 @@ let ExtHostTesting = class ExtHostTesting extends Disposable {
         }
         await this.proxy.$runTests({
             preserveFocus: req.preserveFocus ?? true,
+            group: profileGroupToBitset[profile.kind],
             targets: [{
                     testIds: req.include?.map(t => ( TestId.fromExtHostTestItem(t, controller.collection.root.id).toString())) ?? [controller.collection.root.id],
-                    profileGroup: profileGroupToBitset[profile.kind],
                     profileId: profile.profileId,
                     controllerId: profile.controllerId,
                 }],
@@ -191,8 +195,8 @@ let ExtHostTesting = class ExtHostTesting extends Disposable {
         }
         return Promise.resolve();
     }
-    async $getCoverageDetails(coverageId, token) {
-        const details = await this.runTracker.getCoverageDetails(coverageId, token);
+    async $getCoverageDetails(coverageId, testId, token) {
+        const details = await this.runTracker.getCoverageDetails(coverageId, testId, token);
         return details?.map(TestCoverage.fromDetails);
     }
     async $disposeRun(runId) {
@@ -301,6 +305,23 @@ let ExtHostTesting = class ExtHostTesting extends Disposable {
         }
         return this.commands.executeCommand(command.command, ...(command.arguments || []));
     }
+    $cancelExtensionTestRun(runId) {
+        if (runId === undefined) {
+            this.runTracker.cancelAllRuns();
+        }
+        else {
+            this.runTracker.cancelRunById(runId);
+        }
+    }
+    getMetadataForRun(run) {
+        for (const tracker of this.runTracker.trackers) {
+            const taskId = tracker.getTaskIdForRun(run);
+            if (taskId) {
+                return { taskId, runId: tracker.id };
+            }
+        }
+        return undefined;
+    }
     async runControllerTestRequest(req, isContinuous, token) {
         const lookup = this.controllers.get(req.controllerId);
         if (!lookup) {
@@ -338,18 +359,12 @@ let ExtHostTesting = class ExtHostTesting extends Disposable {
             }
         }
     }
-    $cancelExtensionTestRun(runId) {
-        if (runId === undefined) {
-            this.runTracker.cancelAllRuns();
-        }
-        else {
-            this.runTracker.cancelRunById(runId);
-        }
-    }
 };
 ExtHostTesting = ( __decorate([
     ( __param(0, IExtHostRpcService)),
-    ( __param(1, ILogService))
+    ( __param(1, ILogService)),
+    ( __param(2, IExtHostCommands)),
+    ( __param(3, IExtHostDocumentsAndEditors))
 ], ExtHostTesting));
 const RUN_CANCEL_DEADLINE = 10_000;
 var TestRunTrackerState;
@@ -389,6 +404,14 @@ class TestRunTracker extends Disposable {
             didDisposeEmitter.dispose();
         }));
     }
+    getTaskIdForRun(run) {
+        for (const [taskId, { run: r }] of this.tasks) {
+            if (r === run) {
+                return taskId;
+            }
+        }
+        return undefined;
+    }
     cancel() {
         if (this.state === TestRunTrackerState.Running) {
             this.cts.cancel();
@@ -398,17 +421,29 @@ class TestRunTracker extends Disposable {
             this.forciblyEndTasks();
         }
     }
-    getCoverageDetails(id, token) {
+    async getCoverageDetails(id, testId, token) {
         const [, taskId] = TestId.fromString(id).path;
         const coverage = this.publishedCoverage.get(id);
         if (!coverage) {
             return [];
         }
+        const { report, extIds } = coverage;
         const task = this.tasks.get(taskId);
         if (!task) {
             throw ( new Error('unreachable: run task was not found'));
         }
-        return this.profile?.loadDetailedCoverage?.(task.run, coverage, token) ?? [];
+        let testItem;
+        if (testId && report instanceof FileCoverage) {
+            const index = extIds.indexOf(testId);
+            if (index === -1) {
+                return [];
+            }
+            testItem = report.fromTests[index];
+        }
+        const details = testItem
+            ? this.profile?.loadDetailedCoverageForTest?.(task.run, report, testItem, token)
+            : this.profile?.loadDetailedCoverage?.(task.run, report, token);
+        return (await details) ?? [];
     }
     createRun(name) {
         const runId = this.dto.id;
@@ -419,9 +454,6 @@ class TestRunTracker extends Disposable {
                 this.logService.warn(`Setting the state of test "${test.id}" is a no-op after the run ends.`);
                 return;
             }
-            if (!this.dto.isIncluded(test)) {
-                return;
-            }
             this.ensureTestIsKnown(test);
             fn(test, ...args);
         };
@@ -438,7 +470,6 @@ class TestRunTracker extends Disposable {
             this.proxy.$appendTestMessagesInRun(runId, taskId, ( TestId.fromExtHostTestItem(test, ctrlId).toString()), converted);
         };
         let ended = false;
-        const testItemCoverageId = ( new Map());
         const run = {
             isPersisted: this.dto.isPersisted,
             token: this.cts.token,
@@ -448,25 +479,16 @@ class TestRunTracker extends Disposable {
                 if (ended) {
                     return;
                 }
-                const testItem = coverage instanceof FileCoverage ? coverage.testItem : undefined;
-                let testItemIdPart;
-                if (testItem) {
+                const fromTests = coverage instanceof FileCoverage ? coverage.fromTests : [];
+                if (fromTests.length) {
                     checkProposedApiEnabled(this.extension, 'attributableCoverage');
-                    if (!this.dto.isIncluded(testItem)) {
-                        throw ( new Error('Attempted to `addCoverage` for a test item not included in the run'));
-                    }
-                    this.ensureTestIsKnown(testItem);
-                    testItemIdPart = testItemCoverageId.get(testItem);
-                    if (testItemIdPart === undefined) {
-                        testItemIdPart = testItemCoverageId.size;
-                        testItemCoverageId.set(testItem, testItemIdPart);
+                    for (const test of fromTests) {
+                        this.ensureTestIsKnown(test);
                     }
                 }
                 const uriStr = ( coverage.uri.toString());
-                const id = ( ( new TestId(testItemIdPart !== undefined
-                    ? [runId, taskId, uriStr, String(testItemIdPart)]
-                    : [runId, taskId, uriStr])).toString());
-                this.publishedCoverage.set(id, coverage);
+                const id = ( ( new TestId([runId, taskId, uriStr])).toString());
+                this.publishedCoverage.set(id, { report: coverage, extIds: ( fromTests.map(t => ( TestId.fromExtHostTestItem(t, ctrlId).toString()))) });
                 this.proxy.$appendCoverage(runId, taskId, TestCoverage.fromFile(ctrlId, id, coverage));
             },
             enqueued: guardTestMutation(test => {
@@ -494,12 +516,7 @@ class TestRunTracker extends Disposable {
                     return;
                 }
                 if (test) {
-                    if (this.dto.isIncluded(test)) {
-                        this.ensureTestIsKnown(test);
-                    }
-                    else {
-                        test = undefined;
-                    }
+                    this.ensureTestIsKnown(test);
                 }
                 this.proxy.$appendOutputToRun(runId, taskId, VSBuffer.fromString(output), location$1 && location.from(location$1), test && ( TestId.fromExtHostTestItem(test, ctrlId).toString()));
             },
@@ -508,7 +525,6 @@ class TestRunTracker extends Disposable {
                     return;
                 }
                 ended = true;
-                testItemCoverageId.clear();
                 this.proxy.$finishedTestRunTask(runId, taskId);
                 if (!--this.running) {
                     this.markEnded();
@@ -569,9 +585,9 @@ class TestRunCoordinator {
         this.tracked = ( new Map());
         this.trackedById = ( new Map());
     }
-    getCoverageDetails(id, token) {
+    getCoverageDetails(id, testId, token) {
         const runId = TestId.root(id);
-        return this.trackedById.get(runId)?.getCoverageDetails(id, token) || [];
+        return this.trackedById.get(runId)?.getCoverageDetails(id, testId, token) || [];
     }
     disposeTestRun(runId) {
         this.trackedById.get(runId)?.dispose();
@@ -636,39 +652,16 @@ const tryGetProfileFromTestRunReq = (request) => {
 };
 class TestRunDto {
     static fromPublic(controllerId, collection, request, persist) {
-        return ( new TestRunDto(controllerId, generateUuid(), request.include?.map(t => ( TestId.fromExtHostTestItem(t, controllerId).toString())) ?? [controllerId], request.exclude?.map(t => ( TestId.fromExtHostTestItem(t, controllerId).toString())) ?? [], persist, collection));
+        return ( new TestRunDto(controllerId, generateUuid(), persist, collection));
     }
     static fromInternal(request, collection) {
-        return ( new TestRunDto(
-            request.controllerId,
-            request.runId,
-            request.testIds,
-            request.excludeExtIds,
-            true,
-            collection
-        ));
+        return ( new TestRunDto(request.controllerId, request.runId, true, collection));
     }
-    constructor(controllerId, id, include, exclude, isPersisted, colllection) {
+    constructor(controllerId, id, isPersisted, colllection) {
         this.controllerId = controllerId;
         this.id = id;
         this.isPersisted = isPersisted;
         this.colllection = colllection;
-        this.includePrefix = ( include.map(id => id + TestIdPathParts.Delimiter));
-        this.excludePrefix = ( exclude.map(id => id + TestIdPathParts.Delimiter));
-    }
-    isIncluded(test) {
-        const id = ( TestId.fromExtHostTestItem(test, this.controllerId).toString()) + TestIdPathParts.Delimiter;
-        for (const prefix of this.excludePrefix) {
-            if (id === prefix || id.startsWith(prefix)) {
-                return false;
-            }
-        }
-        for (const prefix of this.includePrefix) {
-            if (id === prefix || id.startsWith(prefix)) {
-                return true;
-            }
-        }
-        return false;
     }
 }
 class MirroredChangeCollector {
@@ -912,4 +905,4 @@ function findTestInResultSnapshot(extId, snapshot) {
     }
     return undefined;
 }
-export { ExtHostTesting, TestRunCoordinator, TestRunDto, TestRunProfileImpl };
+export { ExtHostTesting, IExtHostTesting, TestRunCoordinator, TestRunDto, TestRunProfileImpl };

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

@@ -1,11 +1,13 @@
 import { coalesce } from '../../../base/common/arrays.js';
 import { Emitter } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
 import { MainContext } from './extHost.protocol.js';
 import { TextEditorDecorationType } from './extHostTextEditor.js';
 import { ViewColumn, Range, TextEditorLineNumbersStyle, Selection } from './extHostTypeConverters.js';
 import { TextEditorSelectionChangeKind } from './extHostTypes.js';
-class ExtHostEditors {
+class ExtHostEditors extends Disposable {
     constructor(mainContext, _extHostDocumentsAndEditors) {
+        super();
         this._extHostDocumentsAndEditors = _extHostDocumentsAndEditors;
         this._onDidChangeTextEditorSelection = ( new Emitter());
         this._onDidChangeTextEditorOptions = ( new Emitter());
@@ -20,8 +22,8 @@ class ExtHostEditors {
         this.onDidChangeActiveTextEditor = this._onDidChangeActiveTextEditor.event;
         this.onDidChangeVisibleTextEditors = this._onDidChangeVisibleTextEditors.event;
         this._proxy = ( mainContext.getProxy(MainContext.MainThreadTextEditors));
-        this._extHostDocumentsAndEditors.onDidChangeVisibleTextEditors(e => this._onDidChangeVisibleTextEditors.fire(e));
-        this._extHostDocumentsAndEditors.onDidChangeActiveTextEditor(e => this._onDidChangeActiveTextEditor.fire(e));
+        this._register(this._extHostDocumentsAndEditors.onDidChangeVisibleTextEditors(e => this._onDidChangeVisibleTextEditors.fire(e)));
+        this._register(this._extHostDocumentsAndEditors.onDidChangeActiveTextEditor(e => this._onDidChangeActiveTextEditor.fire(e)));
     }
     getActiveTextEditor() {
         return this._extHostDocumentsAndEditors.activeEditor();

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

@@ -11,12 +11,12 @@ import { cloneAndChange } from '../../../base/common/objects.js';
 import { WellDefinedPrefixTree } from '../../../base/common/prefixTree.js';
 import { basename } from '../../../base/common/resources.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
-import { isString, isNumber, isUndefinedOrNull, isEmptyObject, isDefined } from '../../../base/common/types.js';
+import { isEmptyObject, isUndefinedOrNull, isString, isNumber, isDefined } from '../../../base/common/types.js';
 import { URI, isUriComponents } from '../../../base/common/uri.js';
 import { RenderLineNumbersType } from '../../../editor/common/config/editorOptions.js';
 import { Range as Range$2 } from '../../../editor/common/core/range.js';
 import { StandardTokenType } from '../../../editor/common/encodedTokenAttributes.js';
-import { SymbolKind as SymbolKind$2, CompletionItemInsertTextRule, CodeActionTriggerType, SymbolTag as SymbolTag$2, CompletionItemTag as CompletionItemTag$2, CompletionItemKind as CompletionItemKind$1, Command, FoldingRangeKind as FoldingRangeKind$2, CompletionTriggerKind as CompletionTriggerKind$2, PartialAcceptTriggerKind as PartialAcceptTriggerKind$2 } from '../../../editor/common/languages.js';
+import { SymbolKind as SymbolKind$2, CompletionItemInsertTextRule, SymbolTag as SymbolTag$2, CompletionItemTag as CompletionItemTag$2, CompletionItemKind as CompletionItemKind$1, Command, FoldingRangeKind as FoldingRangeKind$2, CodeActionTriggerType, CompletionTriggerKind as CompletionTriggerKind$2, PartialAcceptTriggerKind as PartialAcceptTriggerKind$2 } from '../../../editor/common/languages.js';
 import { EndOfLineSequence, TrackedRangeStickiness } from '../../../editor/common/model.js';
 import { MarkerSeverity, MarkerTag } from '../../../platform/markers/common/markers.js';
 import { ProgressLocation as ProgressLocation$2 } from '../../../platform/progress/common/progress.js';
@@ -25,11 +25,11 @@ import { DEFAULT_EDITOR_ASSOCIATION, SaveReason } from '../../common/editor.js';
 import { ChatAgentLocation } from '../../contrib/chat/common/chatAgents.js';
 import { ChatMessageRole } from '../../contrib/chat/common/languageModels.js';
 import { DebugTreeItemCollapsibleState } from '../../contrib/debug/common/debug.js';
-import { CellEditType, CellKind, NotebookCellExecutionState as NotebookCellExecutionState$1, CellStatusbarAlignment } from '../../contrib/notebook/common/notebookCommon.js';
+import { CellEditType, CellStatusbarAlignment, CellKind, NotebookCellExecutionState as NotebookCellExecutionState$1 } from '../../contrib/notebook/common/notebookCommon.js';
 import { TestId } from '../../contrib/testing/common/testId.js';
 import { namespaceTestTag, denamespaceTestTag, TestMessageType, DetailType } 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, Location as Location$1, Diagnostic as Diagnostic$1, ViewColumn as ViewColumn$1, MarkdownString as MarkdownString$1, WorkspaceEdit as WorkspaceEdit$1, FileEditType, SnippetTextEdit, SnippetString, TextEdit as TextEdit$1, SymbolKind as SymbolKind$1, SymbolInformation, CallHierarchyItem as CallHierarchyItem$1, CallHierarchyIncomingCall as CallHierarchyIncomingCall$1, CallHierarchyOutgoingCall as CallHierarchyOutgoingCall$1, VerboseHover, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, InlineValueContext as InlineValueContext$1, CompletionItem as CompletionItem$1, InlayHint as InlayHint$1, DocumentLink as DocumentLink$1, ColorPresentation as ColorPresentation$1, Color as Color$1, NotebookRange as NotebookRange$1, NotebookCellOutputItem as NotebookCellOutputItem$1, NotebookCellOutput as NotebookCellOutput$1, TestTag as TestTag$1, CodeActionTriggerKind as CodeActionTriggerKind$1, TypeHierarchyItem as TypeHierarchyItem$1, LanguageModelChatMessage as LanguageModelChatMessage$1, LanguageModelChatMessageRole, ChatLocation as ChatLocation$1, DiagnosticRelatedInformation as DiagnosticRelatedInformation$1, DiagnosticSeverity as DiagnosticSeverity$1, SymbolTag as SymbolTag$1, DocumentSymbol as DocumentSymbol$1, EvaluatableExpression as EvaluatableExpression$1, DocumentHighlight as DocumentHighlight$1, MultiDocumentHighlight as MultiDocumentHighlight$1, CompletionItemTag as CompletionItemTag$1, CompletionItemKind as CompletionItemKind$2, InlayHintLabelPart as InlayHintLabelPart$1, SelectionRange as SelectionRange$1, FoldingRangeKind as FoldingRangeKind$1, RelativePattern, NotebookCellData as NotebookCellData$1, DataTransfer as DataTransfer$1, ChatResponseProgressPart as ChatResponseProgressPart$1, ChatResponseReferencePart as ChatResponseReferencePart$1, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponseFileTreePart, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, ChatResponseTextEditPart as ChatResponseTextEditPart$1, ChatResponseMarkdownWithVulnerabilitiesPart as ChatResponseMarkdownWithVulnerabilitiesPart$1, ChatResponseDetectedParticipantPart as ChatResponseDetectedParticipantPart$1, ChatResponseWarningPart as ChatResponseWarningPart$1, DiagnosticTag as DiagnosticTag$1, EndOfLine as EndOfLine$1, CompletionTriggerKind as CompletionTriggerKind$1, NotebookCellKind as NotebookCellKind$1, InternalFileDataTransferItem, DataTransferFile, InternalDataTransferItem, PartialAcceptTriggerKind as PartialAcceptTriggerKind$1, StandardTokenType as StandardTokenType$1, TextDocumentSaveReason as TextDocumentSaveReason$1, TextEditorLineNumbersStyle as TextEditorLineNumbersStyle$1, ProgressLocation as ProgressLocation$1, NotebookCellExecutionState as NotebookCellExecutionState$2, TestMessage as TestMessage$1, validateTestCoverageCount, FileCoverage, NotebookData as NotebookData$1, NotebookCellStatusBarAlignment, NotebookRendererScript as NotebookRendererScript$1, DecorationRangeBehavior as DecorationRangeBehavior$1 } from './extHostTypes.js';
+import { Position as Position$1, Selection as Selection$1, Range as Range$1, ViewColumn as ViewColumn$1, MarkdownString as MarkdownString$1, WorkspaceEdit as WorkspaceEdit$1, FileEditType, SnippetTextEdit, SnippetString, TextEdit as TextEdit$1, SymbolKind as SymbolKind$1, SymbolInformation, CallHierarchyItem as CallHierarchyItem$1, CallHierarchyIncomingCall as CallHierarchyIncomingCall$1, CallHierarchyOutgoingCall as CallHierarchyOutgoingCall$1, Location as Location$1, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, InlineValueContext as InlineValueContext$1, CompletionItem as CompletionItem$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, TypeHierarchyItem as TypeHierarchyItem$1, ChatLocation as ChatLocation$1, Diagnostic as Diagnostic$1, SymbolTag as SymbolTag$1, DocumentSymbol as DocumentSymbol$1, VerboseHover, EvaluatableExpression as EvaluatableExpression$1, DocumentHighlight as DocumentHighlight$1, MultiDocumentHighlight as MultiDocumentHighlight$1, CompletionItemTag as CompletionItemTag$1, CompletionItemKind as CompletionItemKind$2, InlayHintLabelPart as InlayHintLabelPart$1, SelectionRange as SelectionRange$1, FoldingRangeKind as FoldingRangeKind$1, RelativePattern, NotebookData as NotebookData$1, NotebookCellStatusBarAlignment, CodeActionTriggerKind as CodeActionTriggerKind$1, DataTransfer as DataTransfer$1, LanguageModelFunctionResultPart, LanguageModelChatMessage as LanguageModelChatMessage$1, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponseReferencePart as ChatResponseReferencePart$1, ChatResponseProgressPart as ChatResponseProgressPart$1, ChatResponseFileTreePart, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, ChatResponseTextEditPart as ChatResponseTextEditPart$1, ChatResponseMarkdownWithVulnerabilitiesPart as ChatResponseMarkdownWithVulnerabilitiesPart$1, ChatResponseDetectedParticipantPart as ChatResponseDetectedParticipantPart$1, ChatResponseWarningPart as ChatResponseWarningPart$1, DiagnosticRelatedInformation as DiagnosticRelatedInformation$1, DiagnosticSeverity as DiagnosticSeverity$1, EndOfLine as EndOfLine$1, NotebookCellKind as NotebookCellKind$1, LanguageModelChatMessageRole as LanguageModelChatMessageRole$1, DiagnosticTag as DiagnosticTag$1, CompletionTriggerKind as CompletionTriggerKind$1, TestMessage as TestMessage$1, validateTestCoverageCount, FileCoverage, InternalFileDataTransferItem, DataTransferFile, InternalDataTransferItem, PartialAcceptTriggerKind as PartialAcceptTriggerKind$1, StandardTokenType as StandardTokenType$1, TextDocumentSaveReason as TextDocumentSaveReason$1, TextEditorLineNumbersStyle as TextEditorLineNumbersStyle$1, ProgressLocation as ProgressLocation$1, NotebookCellExecutionState as NotebookCellExecutionState$2, NotebookRendererScript as NotebookRendererScript$1, DecorationRangeBehavior as DecorationRangeBehavior$1 } from './extHostTypes.js';
 var Selection;
 ( (function(Selection) {
     function to(selection) {
@@ -1234,7 +1234,9 @@ var DocumentLink;
             catch (err) {
             }
         }
-        return new DocumentLink$1(Range.to(link.range), target);
+        const result = new DocumentLink$1(Range.to(link.range), target);
+        result.tooltip = link.tooltip;
+        return result;
     }
     DocumentLink.to = to;
 })(DocumentLink || (DocumentLink = {})));
@@ -1930,8 +1932,8 @@ var TestCoverage;
             statement: fromCoverageCount(coverage.statementCoverage),
             branch: coverage.branchCoverage && fromCoverageCount(coverage.branchCoverage),
             declaration: coverage.declarationCoverage && fromCoverageCount(coverage.declarationCoverage),
-            testId: coverage instanceof FileCoverage && coverage.testItem ?
-                ( TestId.fromExtHostTestItem(coverage.testItem, controllerId).toString()) : undefined,
+            testIds: coverage instanceof FileCoverage && coverage.fromTests.length ?
+                ( coverage.fromTests.map(t => ( TestId.fromExtHostTestItem(t, controllerId).toString()))) : undefined,
         };
     }
     TestCoverage.fromFile = fromFile;
@@ -2086,22 +2088,68 @@ var ChatFollowup;
     }
     ChatFollowup.to = to;
 })(ChatFollowup || (ChatFollowup = {})));
+var LanguageModelChatMessageRole;
+( (function(LanguageModelChatMessageRole) {
+    function to(role) {
+        switch (role) {
+            case ChatMessageRole.System: return LanguageModelChatMessageRole$1.System;
+            case ChatMessageRole.User: return LanguageModelChatMessageRole$1.User;
+            case ChatMessageRole.Assistant: return LanguageModelChatMessageRole$1.Assistant;
+        }
+    }
+    LanguageModelChatMessageRole.to = to;
+    function from(role) {
+        switch (role) {
+            case LanguageModelChatMessageRole$1.System: return ChatMessageRole.System;
+            case LanguageModelChatMessageRole$1.User: return ChatMessageRole.User;
+            case LanguageModelChatMessageRole$1.Assistant: return ChatMessageRole.Assistant;
+        }
+        return ChatMessageRole.User;
+    }
+    LanguageModelChatMessageRole.from = from;
+})(LanguageModelChatMessageRole || (LanguageModelChatMessageRole = {})));
 var LanguageModelChatMessage;
 ( (function(LanguageModelChatMessage) {
     function to(message) {
-        switch (message.role) {
-            case ChatMessageRole.System: return new LanguageModelChatMessage$1(LanguageModelChatMessageRole.System, message.content);
-            case ChatMessageRole.User: return new LanguageModelChatMessage$1(LanguageModelChatMessageRole.User, message.content);
-            case ChatMessageRole.Assistant: return new LanguageModelChatMessage$1(LanguageModelChatMessageRole.Assistant, message.content);
+        let content = '';
+        let content2;
+        if (message.content.type === 'text') {
+            content = message.content.value;
+        }
+        else {
+            content2 = new LanguageModelFunctionResultPart(message.content.name, message.content.value, message.content.isError);
         }
+        const role = LanguageModelChatMessageRole.to(message.role);
+        const result = new LanguageModelChatMessage$1(role, content, message.name);
+        if (content2 !== undefined) {
+            result.content2 = content2;
+        }
+        return result;
     }
     LanguageModelChatMessage.to = to;
     function from(message) {
-        switch (message.role) {
-            case LanguageModelChatMessageRole.System: return { role: ChatMessageRole.System, content: message.content };
-            case LanguageModelChatMessageRole.User: return { role: ChatMessageRole.User, content: message.content };
-            case LanguageModelChatMessageRole.Assistant: return { role: ChatMessageRole.Assistant, content: message.content };
+        const role = LanguageModelChatMessageRole.from(message.role);
+        const name = message.name;
+        let content;
+        if (message.content2 instanceof LanguageModelFunctionResultPart) {
+            content = {
+                type: 'function_result',
+                name: message.content2.name,
+                value: message.content2.content,
+                isError: message.content2.isError
+            };
+        }
+        else {
+            content = {
+                type: 'text',
+                value: message.content
+            };
         }
+        return {
+            role,
+            name,
+            content
+        };
     }
     LanguageModelChatMessage.from = from;
 })(LanguageModelChatMessage || (LanguageModelChatMessage = {})));
@@ -2568,4 +2616,15 @@ var DebugTreeItem;
     }
     DebugTreeItem.from = from;
 })(DebugTreeItem || (DebugTreeItem = {})));
-export { CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, ChatAgentCompletionItem, ChatAgentRequest, ChatAgentResult, ChatAgentUserActionEvent, ChatAgentValueReference, ChatFollowup, ChatLocation, ChatResponseAnchorPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseDetectedParticipantPart, ChatResponseFilesPart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponsePart, ChatResponseProgressPart, ChatResponseReferencePart, ChatResponseTextEditPart, ChatResponseWarningPart, ChatTask, ChatTaskResult, CodeActionTriggerKind, Color, ColorPresentation, CompletionContext, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionTriggerKind, DataTransfer, DataTransferItem, DebugTreeItem, DecorationRangeBehavior, DecorationRenderOptions, DefinitionLink, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, DocumentHighlight, DocumentLink, DocumentSelector, DocumentSymbol, EndOfLine, EvaluatableExpression, FoldingRange, FoldingRangeKind, GlobPattern, Hover, InlayHint, InlayHintKind, InlayHintLabelPart, InlineValue, InlineValueContext, LanguageModelChatMessage, LanguageSelector, Location, MappedEditsContext, MarkdownString, MultiDocumentHighlight, NotebookCellData, NotebookCellExecutionState, NotebookCellExecutionSummary, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookData, NotebookDocumentContentOptions, NotebookExclusiveDocumentPattern, NotebookKernelSourceAction, NotebookRange, NotebookRendererScript, NotebookStatusBarItem, ParameterInformation, PartialAcceptInfo, PartialAcceptTriggerKind, 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 };
+var LanguageModelToolDescription;
+( (function(LanguageModelToolDescription) {
+    function to(item) {
+        return {
+            name: item.name,
+            description: item.description,
+            parametersSchema: item.parametersSchema,
+        };
+    }
+    LanguageModelToolDescription.to = to;
+})(LanguageModelToolDescription || (LanguageModelToolDescription = {})));
+export { CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, ChatAgentCompletionItem, ChatAgentRequest, ChatAgentResult, ChatAgentUserActionEvent, ChatAgentValueReference, ChatFollowup, ChatLocation, ChatResponseAnchorPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseDetectedParticipantPart, ChatResponseFilesPart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponsePart, ChatResponseProgressPart, ChatResponseReferencePart, ChatResponseTextEditPart, ChatResponseWarningPart, ChatTask, ChatTaskResult, CodeActionTriggerKind, Color, ColorPresentation, CompletionContext, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionTriggerKind, DataTransfer, DataTransferItem, DebugTreeItem, DecorationRangeBehavior, DecorationRenderOptions, DefinitionLink, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, DocumentHighlight, DocumentLink, DocumentSelector, DocumentSymbol, EndOfLine, EvaluatableExpression, FoldingRange, FoldingRangeKind, GlobPattern, Hover, InlayHint, InlayHintKind, InlayHintLabelPart, InlineValue, InlineValueContext, LanguageModelChatMessage, LanguageModelChatMessageRole, LanguageModelToolDescription, LanguageSelector, Location, MappedEditsContext, MarkdownString, MultiDocumentHighlight, NotebookCellData, NotebookCellExecutionState, NotebookCellExecutionSummary, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookData, NotebookDocumentContentOptions, NotebookExclusiveDocumentPattern, NotebookKernelSourceAction, NotebookRange, NotebookRendererScript, NotebookStatusBarItem, ParameterInformation, PartialAcceptInfo, PartialAcceptTriggerKind, 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 };

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

@@ -3214,12 +3214,12 @@ class FileCoverage {
         coverage.detailedCoverage = details;
         return coverage;
     }
-    constructor(uri, statementCoverage, branchCoverage, declarationCoverage, testItem) {
+    constructor(uri, statementCoverage, branchCoverage, declarationCoverage, fromTests = []) {
         this.uri = uri;
         this.statementCoverage = statementCoverage;
         this.branchCoverage = branchCoverage;
         this.declarationCoverage = declarationCoverage;
-        this.testItem = testItem;
+        this.fromTests = fromTests;
     }
 }
 class StatementCoverage {
@@ -3492,9 +3492,22 @@ var LanguageModelChatMessageRole;
     LanguageModelChatMessageRole[LanguageModelChatMessageRole["Assistant"] = 2] = "Assistant";
     LanguageModelChatMessageRole[LanguageModelChatMessageRole["System"] = 3] = "System";
 })(LanguageModelChatMessageRole || (LanguageModelChatMessageRole = {})));
+class LanguageModelFunctionResultPart {
+    constructor(name, content, isError) {
+        this.name = name;
+        this.content = content;
+        this.isError = isError ?? false;
+    }
+}
 class LanguageModelChatMessage {
     static User(content, name) {
-        return ( new LanguageModelChatMessage(LanguageModelChatMessageRole.User, content, name));
+        const value = ( new LanguageModelChatMessage(
+            LanguageModelChatMessageRole.User,
+            typeof content === 'string' ? content : '',
+            name
+        ));
+        value.content2 = content;
+        return value;
     }
     static Assistant(content, name) {
         return ( new LanguageModelChatMessage(LanguageModelChatMessageRole.Assistant, content, name));
@@ -3502,7 +3515,19 @@ class LanguageModelChatMessage {
     constructor(role, content, name) {
         this.role = role;
         this.content = content;
+        this.content2 = content;
+        this.name = name;
+    }
+}
+class LanguageModelFunctionUsePart {
+    constructor(name, parameters) {
         this.name = name;
+        this.parameters = parameters;
+    }
+}
+class LanguageModelTextPart {
+    constructor(value) {
+        this.value = value;
     }
 }
 class LanguageModelChatSystemMessage {
@@ -3575,4 +3600,4 @@ var InlineEditTriggerKind;
     InlineEditTriggerKind[InlineEditTriggerKind["Invoke"] = 0] = "Invoke";
     InlineEditTriggerKind[InlineEditTriggerKind["Automatic"] = 1] = "Automatic";
 })(InlineEditTriggerKind || (InlineEditTriggerKind = {})));
-export { BranchCoverage, Breakpoint, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, ChatCompletionItem, ChatCopyKind, ChatEditorTabInput, ChatLocation, ChatRequestTurn, ChatResponseAnchorPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseDetectedParticipantPart, ChatResponseFileTreePart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseProgressPart, ChatResponseProgressPart2, ChatResponseReferencePart, ChatResponseTextEditPart, ChatResponseTurn, ChatResponseWarningPart, ChatResultFeedbackKind, ChatVariableLevel, CodeAction, CodeActionKind, CodeActionTriggerKind, CodeLens, Color, ColorInformation, ColorPresentation, ColorTheme, ColorThemeKind, CommentMode, CommentState, CommentThreadApplicability, CommentThreadCollapsibleState, CommentThreadState, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionList, CompletionTriggerKind, ConfigurationTarget, CustomEditorTabInput, CustomExecution, DataBreakpoint, DataTransfer, DataTransferFile, DataTransferItem, DebugAdapterExecutable, DebugAdapterInlineImplementation, DebugAdapterNamedPipeServer, DebugAdapterServer, DebugConsoleMode, DebugStackFrame, DebugThread, DebugVisualization, DeclarationCoverage, DecorationRangeBehavior, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, Disposable, DocumentDropEdit, DocumentDropOrPasteEditKind, DocumentHighlight, DocumentHighlightKind, DocumentLink, DocumentPasteEdit, DocumentPasteTriggerKind, DocumentSymbol, EndOfLine, EnvironmentVariableMutatorType, EvaluatableExpression, ExtensionKind, ExtensionMode, ExtensionRuntime, ExternalUriOpenerPriority, FileChangeType, FileCoverage, FileDecoration, FileEditType, FileSystemError, FoldingRange, FoldingRangeKind, FunctionBreakpoint, Hover, HoverVerbosityAction, InlayHint, InlayHintKind, InlayHintLabelPart, InlineCompletionTriggerKind, InlineEdit, InlineEditTriggerKind, InlineSuggestion, InlineSuggestionList, InlineValueContext, InlineValueEvaluatableExpression, InlineValueText, InlineValueVariableLookup, InputBoxValidationSeverity, InteractiveEditorResponseFeedbackKind, InteractiveSessionVoteDirection, InteractiveWindowInput, InternalDataTransferItem, InternalFileDataTransferItem, KeywordRecognitionStatus, LanguageModelChatAssistantMessage, LanguageModelChatMessage, LanguageModelChatMessageRole, LanguageModelChatSystemMessage, LanguageModelChatUserMessage, LanguageModelError, LanguageStatusSeverity, LinkedEditingRanges, Location, ManagedResolvedAuthority, MarkdownString, MultiDocumentHighlight, NewSymbolName, NewSymbolNameTag, NewSymbolNameTriggerKind, NotebookCellData, NotebookCellExecutionState, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookCellStatusBarAlignment, NotebookCellStatusBarItem, NotebookControllerAffinity, NotebookControllerAffinity2, NotebookData, NotebookDiffEditorTabInput, NotebookEdit, NotebookEditorRevealType, NotebookEditorTabInput, NotebookKernelSourceAction, NotebookRange, NotebookRendererScript, NotebookVariablesRequestKind, ParameterInformation, PartialAcceptTriggerKind, PortAttributes, PortAutoForwardAction, Position, ProcessExecution, ProgressLocation, QuickInputButtons, QuickPickItemKind, Range, RelatedInformationType, RelativePattern, RemoteAuthorityResolverError, ResolvedAuthority, Selection, SelectionRange, SemanticTokens, SemanticTokensBuilder, SemanticTokensEdit, SemanticTokensEdits, SemanticTokensLegend, ShellExecution, ShellQuoting, SignatureHelp, SignatureHelpTriggerKind, SignatureInformation, SnippetString, SnippetTextEdit, SourceBreakpoint, SourceControlInputBoxValidationType, SpeechToTextStatus, StandardTokenType, StatementCoverage, StatusBarAlignment, SymbolInformation, SymbolKind, SymbolTag, SyntaxTokenType, Task, TaskGroup, TaskPanelKind, TaskRevealKind, TaskScope, TerminalEditorTabInput, TerminalExitReason, TerminalLink, TerminalLocation, TerminalOutputAnchor, TerminalProfile, TerminalQuickFixCommand, TerminalQuickFixOpener, TerminalShellExecutionCommandLineConfidence, TestCoverageCount, TestMessage, TestResultState, TestRunProfileKind, TestRunRequest, TestTag, TextDiffTabInput, TextDocumentChangeReason, TextDocumentSaveReason, TextEdit, TextEditorLineNumbersStyle, TextEditorRevealType, TextEditorSelectionChangeKind, TextMergeTabInput, TextMultiDiffTabInput, TextTabInput, TextToSpeechStatus, ThemeColor, ThemeIcon, TimelineItem, TreeItem, TreeItemCheckboxState, TreeItemCollapsibleState, TypeHierarchyItem, VerboseHover, ViewBadge, ViewColumn, WebviewEditorTabInput, WorkspaceEdit, WorkspaceTrustState, asStatusBarItemIdentifier, setBreakpointId, validateTestCoverageCount };
+export { BranchCoverage, Breakpoint, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, ChatCompletionItem, ChatCopyKind, ChatEditorTabInput, ChatLocation, ChatRequestTurn, ChatResponseAnchorPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseDetectedParticipantPart, ChatResponseFileTreePart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseProgressPart, ChatResponseProgressPart2, ChatResponseReferencePart, ChatResponseTextEditPart, ChatResponseTurn, ChatResponseWarningPart, ChatResultFeedbackKind, ChatVariableLevel, CodeAction, CodeActionKind, CodeActionTriggerKind, CodeLens, Color, ColorInformation, ColorPresentation, ColorTheme, ColorThemeKind, CommentMode, CommentState, CommentThreadApplicability, CommentThreadCollapsibleState, CommentThreadState, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionList, CompletionTriggerKind, ConfigurationTarget, CustomEditorTabInput, CustomExecution, DataBreakpoint, DataTransfer, DataTransferFile, DataTransferItem, DebugAdapterExecutable, DebugAdapterInlineImplementation, DebugAdapterNamedPipeServer, DebugAdapterServer, DebugConsoleMode, DebugStackFrame, DebugThread, DebugVisualization, DeclarationCoverage, DecorationRangeBehavior, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, Disposable, DocumentDropEdit, DocumentDropOrPasteEditKind, DocumentHighlight, DocumentHighlightKind, DocumentLink, DocumentPasteEdit, DocumentPasteTriggerKind, DocumentSymbol, EndOfLine, EnvironmentVariableMutatorType, EvaluatableExpression, ExtensionKind, ExtensionMode, ExtensionRuntime, ExternalUriOpenerPriority, FileChangeType, FileCoverage, FileDecoration, FileEditType, FileSystemError, FoldingRange, FoldingRangeKind, FunctionBreakpoint, Hover, HoverVerbosityAction, InlayHint, InlayHintKind, InlayHintLabelPart, InlineCompletionTriggerKind, InlineEdit, InlineEditTriggerKind, InlineSuggestion, InlineSuggestionList, InlineValueContext, InlineValueEvaluatableExpression, InlineValueText, InlineValueVariableLookup, InputBoxValidationSeverity, InteractiveEditorResponseFeedbackKind, InteractiveSessionVoteDirection, InteractiveWindowInput, InternalDataTransferItem, InternalFileDataTransferItem, KeywordRecognitionStatus, LanguageModelChatAssistantMessage, LanguageModelChatMessage, LanguageModelChatMessageRole, LanguageModelChatSystemMessage, LanguageModelChatUserMessage, LanguageModelError, LanguageModelFunctionResultPart, LanguageModelFunctionUsePart, LanguageModelTextPart, LanguageStatusSeverity, LinkedEditingRanges, Location, ManagedResolvedAuthority, MarkdownString, MultiDocumentHighlight, NewSymbolName, NewSymbolNameTag, NewSymbolNameTriggerKind, NotebookCellData, NotebookCellExecutionState, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookCellStatusBarAlignment, NotebookCellStatusBarItem, NotebookControllerAffinity, NotebookControllerAffinity2, NotebookData, NotebookDiffEditorTabInput, NotebookEdit, NotebookEditorRevealType, NotebookEditorTabInput, NotebookKernelSourceAction, NotebookRange, NotebookRendererScript, NotebookVariablesRequestKind, ParameterInformation, PartialAcceptTriggerKind, PortAttributes, PortAutoForwardAction, Position, ProcessExecution, ProgressLocation, QuickInputButtons, QuickPickItemKind, Range, RelatedInformationType, RelativePattern, RemoteAuthorityResolverError, ResolvedAuthority, Selection, SelectionRange, SemanticTokens, SemanticTokensBuilder, SemanticTokensEdit, SemanticTokensEdits, SemanticTokensLegend, ShellExecution, ShellQuoting, SignatureHelp, SignatureHelpTriggerKind, SignatureInformation, SnippetString, SnippetTextEdit, SourceBreakpoint, SourceControlInputBoxValidationType, SpeechToTextStatus, StandardTokenType, StatementCoverage, StatusBarAlignment, SymbolInformation, SymbolKind, SymbolTag, SyntaxTokenType, Task, TaskGroup, TaskPanelKind, TaskRevealKind, TaskScope, TerminalEditorTabInput, TerminalExitReason, TerminalLink, TerminalLocation, TerminalOutputAnchor, TerminalProfile, TerminalQuickFixCommand, TerminalQuickFixOpener, TerminalShellExecutionCommandLineConfidence, TestCoverageCount, TestMessage, TestResultState, TestRunProfileKind, TestRunRequest, TestTag, TextDiffTabInput, TextDocumentChangeReason, TextDocumentSaveReason, TextEdit, TextEditorLineNumbersStyle, TextEditorRevealType, TextEditorSelectionChangeKind, TextMergeTabInput, TextMultiDiffTabInput, TextTabInput, TextToSpeechStatus, ThemeColor, ThemeIcon, TimelineItem, TreeItem, TreeItemCheckboxState, TreeItemCollapsibleState, TypeHierarchyItem, VerboseHover, ViewBadge, ViewColumn, WebviewEditorTabInput, WorkspaceEdit, WorkspaceTrustState, asStatusBarItemIdentifier, setBreakpointId, validateTestCoverageCount };

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

@@ -100,7 +100,7 @@ class ExtHostWorkspaceImpl extends Workspace$1 {
         this._name = _name;
         this._isUntitled = _isUntitled;
         this._workspaceFolders = [];
-        this._structure = TernarySearchTree.forUris(ignorePathCasing);
+        this._structure = TernarySearchTree.forUris(ignorePathCasing, () => true);
         folders.forEach(folder => {
             this._workspaceFolders.push(folder);
             this._structure.set(folder.uri, folder);

package/vscode/src/vs/workbench/browser/actions/developerActions.js

@@ -52,7 +52,7 @@ class InspectContextKeysAction extends Action2 {
         const hoverFeedback = document.createElement('div');
         const activeDocument = getActiveDocument();
         activeDocument.body.appendChild(hoverFeedback);
-        disposables.add(toDisposable(() => activeDocument.body.removeChild(hoverFeedback)));
+        disposables.add(toDisposable(() => hoverFeedback.remove()));
         hoverFeedback.style.position = 'absolute';
         hoverFeedback.style.pointerEvents = 'none';
         hoverFeedback.style.backgroundColor = 'rgba(255, 0, 0, 0.5)';