@codingame/monaco-vscode-api 7.1.0 → 8.0.0

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

@@ -3,7 +3,7 @@ import { Emitter } from '../../../base/common/event.js';
 import { dispose } from '../../../base/common/lifecycle.js';
 import { MainContext } from './extHost.protocol.js';
 import { URI } from '../../../base/common/uri.js';
-import { QuickInputButtons, QuickPickItemKind, ThemeIcon as ThemeIcon$1, InputBoxValidationSeverity } from './extHostTypes.js';
+import { QuickPickItemKind, InputBoxValidationSeverity, QuickInputButtons, ThemeIcon as ThemeIcon$1 } from './extHostTypes.js';
 import { isCancellationError } from '../../../base/common/errors.js';
 import { coalesce } from '../../../base/common/arrays.js';
 import Severity$1 from '../../../base/common/severity.js';
@@ -189,8 +189,8 @@ function createExtHostQuickOpen(mainContext, workspace, commands) {
     }
     class ExtHostQuickInput {
         static { this._nextId = 1; }
-        constructor(_extensionId, _onDidDispose) {
-            this._extensionId = _extensionId;
+        constructor(_extension, _onDidDispose) {
+            this._extension = _extension;
             this._onDidDispose = _onDidDispose;
             this._id = ExtHostQuickPick._nextId++;
             this._visible = false;
@@ -278,6 +278,10 @@ function createExtHostQuickOpen(mainContext, workspace, commands) {
             return this._buttons;
         }
         set buttons(buttons) {
+            const allowedButtonLocation = isProposedApiEnabled(this._extension, 'quickInputButtonLocation');
+            if (!allowedButtonLocation && ( buttons.some(button => button.location))) {
+                console.warn(`Extension '${this._extension.identifier.value}' uses a button location which is proposed API that is only available when running out of dev or with the following command line switch: --enable-proposed-api ${this._extension.identifier.value}`);
+            }
             this._buttons = buttons.slice();
             this._handlesToButtons.clear();
             buttons.forEach((button, i) => {
@@ -290,6 +294,7 @@ function createExtHostQuickOpen(mainContext, workspace, commands) {
                         ...getIconPathOrClass(button.iconPath),
                         tooltip: button.tooltip,
                         handle: button === QuickInputButtons.Back ? -1 : i,
+                        location: allowedButtonLocation ? button.location : undefined
                     };
                 }))
             });
@@ -397,8 +402,7 @@ function createExtHostQuickOpen(mainContext, workspace, commands) {
     }
     class ExtHostQuickPick extends ExtHostQuickInput {
         constructor(extension, onDispose) {
-            super(extension.identifier, onDispose);
-            this.extension = extension;
+            super(extension, onDispose);
             this._items = [];
             this._handlesToItems = ( new Map());
             this._itemsToHandles = ( new Map());
@@ -429,7 +433,7 @@ function createExtHostQuickOpen(mainContext, workspace, commands) {
                 this._handlesToItems.set(i, item);
                 this._itemsToHandles.set(item, i);
             });
-            const allowedTooltips = isProposedApiEnabled(this.extension, 'quickPickItemTooltip');
+            const allowedTooltips = isProposedApiEnabled(this._extension, 'quickPickItemTooltip');
             const pickItems = [];
             for (let handle = 0; handle < items.length; handle++) {
                 const item = items[handle];
@@ -438,7 +442,7 @@ function createExtHostQuickOpen(mainContext, workspace, commands) {
                 }
                 else {
                     if (item.tooltip && !allowedTooltips) {
-                        console.warn(`Extension '${this.extension.identifier.value}' uses a tooltip which is proposed API that is only available when running out of dev or with the following command line switch: --enable-proposed-api ${this.extension.identifier.value}`);
+                        console.warn(`Extension '${this._extension.identifier.value}' uses a tooltip which is proposed API that is only available when running out of dev or with the following command line switch: --enable-proposed-api ${this._extension.identifier.value}`);
                     }
                     const icon = (item.iconPath) ? getIconPathOrClass(item.iconPath) : undefined;
                     pickItems.push({
@@ -540,7 +544,7 @@ function createExtHostQuickOpen(mainContext, workspace, commands) {
     }
     class ExtHostInputBox extends ExtHostQuickInput {
         constructor(extension, onDispose) {
-            super(extension.identifier, onDispose);
+            super(extension, onDispose);
             this._password = false;
             this.update({ type: 'inputBox' });
         }

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

@@ -512,9 +512,7 @@ class ExtHostSourceControl {
         return this._statusBarCommands;
     }
     set statusBarCommands(statusBarCommands) {
-        this.logService.trace('ExtHostSourceControl#statusBarCommands', ( (statusBarCommands ?? []).map(c => c.command)).join(', '));
         if (this._statusBarCommands && statusBarCommands && commandListEquals(this._statusBarCommands, statusBarCommands)) {
-            this.logService.trace('ExtHostSourceControl#statusBarCommands are equal');
             return;
         }
         this._statusBarDisposables.value = ( new DisposableStore());
@@ -527,10 +525,9 @@ class ExtHostSourceControl {
     get selected() {
         return this._selected;
     }
-    constructor(_extension, _extHostDocuments, proxy, _commands, logService, _id, _label, _rootUri) {
+    constructor(_extension, _extHostDocuments, proxy, _commands, _id, _label, _rootUri) {
         this._extension = _extension;
         this._commands = _commands;
-        this.logService = logService;
         this._id = _id;
         this._label = _label;
         this._rootUri = _rootUri;
@@ -696,7 +693,6 @@ let ExtHostSCM = class ExtHostSCM {
             this._extHostDocuments,
             this._proxy,
             this._commands,
-            this.logService,
             id,
             label,
             rootUri
@@ -779,6 +775,10 @@ let ExtHostSCM = class ExtHostSCM {
         const historyProvider = this._sourceControls.get(sourceControlHandle)?.historyProvider;
         return (await historyProvider?.resolveHistoryItemGroupCommonAncestor(historyItemGroupId1, historyItemGroupId2, token)) ?? undefined;
     }
+    async $resolveHistoryItemGroupCommonAncestor2(sourceControlHandle, historyItemGroupIds, token) {
+        const historyProvider = this._sourceControls.get(sourceControlHandle)?.historyProvider;
+        return (await historyProvider?.resolveHistoryItemGroupCommonAncestor2(historyItemGroupIds, token)) ?? undefined;
+    }
     async $provideHistoryItems(sourceControlHandle, historyItemGroupId, options, token) {
         const historyProvider = this._sourceControls.get(sourceControlHandle)?.historyProvider;
         const historyItems = await historyProvider?.provideHistoryItems(historyItemGroupId, options, token);

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

@@ -1,10 +1,9 @@
 import { Disposable, ThemeColor, asStatusBarItemIdentifier, StatusBarAlignment } from './extHostTypes.js';
 import { MainContext } from './extHost.protocol.js';
-import { localizeWithPath } from '../../../nls.js';
+import { localize } from '../../../nls.js';
 import { DisposableStore } from '../../../base/common/lifecycle.js';
 import { MarkdownString } from './extHostTypeConverters.js';
 import { isNumber } from '../../../base/common/types.js';
-const _moduleId = "vs/workbench/api/common/extHostStatusBar";
 class ExtHostStatusBarEntry {
     static { this.ID_GEN = 0; }
     static { this.ALLOWED_BACKGROUND_COLORS = ( (new Map([
@@ -168,9 +167,8 @@ class ExtHostStatusBarEntry {
                 name = this._name;
             }
             else {
-                name = ( localizeWithPath(
-                    _moduleId,
-                    0,
+                name = ( localize(
+                    5247,
                     "{0} (Extension)",
                     this._extension.displayName || this._extension.name
                 ));
@@ -193,7 +191,7 @@ class StatusBarMessage {
     constructor(statusBar) {
         this._messages = [];
         this._item = statusBar.createStatusBarEntry(undefined, 'status.extensionMessage', StatusBarAlignment.Left, Number.MIN_VALUE);
-        this._item.name = ( localizeWithPath(_moduleId, 1, "Extension Status"));
+        this._item.name = ( localize(5248, "Extension Status"));
     }
     dispose() {
         this._messages.length = 0;

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

@@ -11,8 +11,7 @@ import { extensionTelemetryLogChannelId, cleanRemoteAuthority, cleanData } from
 import { mixin } from '../../../base/common/objects.js';
 import { URI } from '../../../base/common/uri.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
-import { localizeWithPath } from '../../../nls.js';
-const _moduleId = "vs/workbench/api/common/extHostTelemetry";
+import { localize } from '../../../nls.js';
 let ExtHostTelemetry = class ExtHostTelemetry extends Disposable {
     constructor(initData, loggerService) {
         super();
@@ -29,9 +28,8 @@ let ExtHostTelemetry = class ExtHostTelemetry extends Disposable {
         this._telemetryLoggers = ( (new Map()));
         this.extHostTelemetryLogFile = URI.revive(this.initData.environment.extensionTelemetryLogResource);
         this._inLoggingOnlyMode = this.initData.environment.isExtensionTelemetryLoggingOnly;
-        this._outputLogger = loggerService.createLogger(this.extHostTelemetryLogFile, { id: extensionTelemetryLogChannelId, name: ( localizeWithPath(
-            _moduleId,
-            0,
+        this._outputLogger = loggerService.createLogger(this.extHostTelemetryLogFile, { id: extensionTelemetryLogChannelId, name: ( localize(
+            1602,
             "Extension Telemetry{0}",
             this._inLoggingOnlyMode ? ' (Not Sent)' : ''
         )), hidden: true });

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

@@ -6,7 +6,7 @@ import { URI } from '../../../base/common/uri.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
 import { Disposable, MutableDisposable, DisposableStore } from '../../../base/common/lifecycle.js';
 import { Disposable as Disposable$1, EnvironmentVariableMutatorType } from './extHostTypes.js';
-import { localizeWithPath } from '../../../nls.js';
+import { localize } from '../../../nls.js';
 import { NotSupportedError } from '../../../base/common/errors.js';
 import { serializeEnvironmentVariableCollection, serializeEnvironmentDescriptionMap } from '../../../platform/terminal/common/environmentVariableShared.js';
 import { CancellationTokenSource } from '../../../base/common/cancellation.js';
@@ -18,7 +18,6 @@ import { Promises } from '../../../base/common/async.js';
 import { TerminalQuickFix, ViewColumn } from './extHostTypeConverters.js';
 import { IExtHostCommands } from './extHostCommands.js';
 import { MarshalledId } from '../../../base/common/marshallingIds.js';
-const _moduleId = "vs/workbench/api/common/extHostTerminalService";
 const IExtHostTerminalService = ( (createDecorator('IExtHostTerminalService')));
 class ExtHostTerminal extends Disposable {
     constructor(_proxy, _id, _creationOptions, _name) {
@@ -469,12 +468,7 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
     async $startExtensionTerminal(id, initialDimensions) {
         const terminal = this.getTerminalById(id);
         if (!terminal) {
-            return { message: ( localizeWithPath(
-                _moduleId,
-                0,
-                "Could not find the terminal with id {0} on the extension host",
-                id
-            )) };
+            return { message: ( localize(1607, "Could not find the terminal with id {0} on the extension host", id)) };
         }
         if (!terminal.isOpen) {
             await ( (new Promise(r => {

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

@@ -6,7 +6,7 @@ import { MainContext } from './extHost.protocol.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
 import { IExtHostTerminalService } from './extHostTerminalService.js';
 import { Emitter } from '../../../base/common/event.js';
-import { isUriComponents, URI } from '../../../base/common/uri.js';
+import { URI } from '../../../base/common/uri.js';
 import { AsyncIterableObject, Barrier } from '../../../base/common/async.js';
 const IExtHostTerminalShellIntegration = ( createDecorator('IExtHostTerminalShellIntegration'));
 let ExtHostTerminalShellIntegration = class ExtHostTerminalShellIntegration extends Disposable {
@@ -58,7 +58,7 @@ let ExtHostTerminalShellIntegration = class ExtHostTerminalShellIntegration exte
             confidence: commandLineConfidence,
             isTrusted
         };
-        this._activeShellIntegrations.get(instanceId)?.startShellExecution(commandLine, cwd);
+        this._activeShellIntegrations.get(instanceId)?.startShellExecution(commandLine, URI.revive(cwd));
     }
     $shellExecutionEnd(instanceId, commandLineValue, commandLineConfidence, isTrusted, exitCode) {
         const commandLine = {
@@ -72,7 +72,7 @@ let ExtHostTerminalShellIntegration = class ExtHostTerminalShellIntegration exte
         this._activeShellIntegrations.get(instanceId)?.emitData(data);
     }
     $cwdChange(instanceId, cwd) {
-        this._activeShellIntegrations.get(instanceId)?.setCwd(isUriComponents(cwd) ? URI.revive(cwd) : cwd);
+        this._activeShellIntegrations.get(instanceId)?.setCwd(URI.revive(cwd));
     }
     $closeTerminal(instanceId) {
         this._activeShellIntegrations.get(instanceId)?.dispose();
@@ -128,7 +128,7 @@ class InternalTerminalShellIntegration extends Disposable {
                 this._currentExecution.endExecution(undefined);
                 this._onDidRequestEndExecution.fire({ terminal: this._terminal, shellIntegration: this.value, execution: this._currentExecution.value, exitCode: undefined });
             }
-            const currentExecution = this._currentExecution = ( new InternalTerminalShellExecution(commandLine, cwd));
+            const currentExecution = this._currentExecution = ( new InternalTerminalShellExecution(commandLine, cwd ?? this._cwd));
             if (fireEventInMicrotask) {
                 queueMicrotask(() => this._onDidStartTerminalShellExecution.fire({ terminal: this._terminal, shellIntegration: this.value, execution: currentExecution.value }));
             }

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

@@ -8,6 +8,7 @@ import { hash } from '../../../base/common/hash.js';
 import { Disposable, toDisposable, DisposableStore } from '../../../base/common/lifecycle.js';
 import { MarshalledId } from '../../../base/common/marshallingIds.js';
 import { isDefined } from '../../../base/common/types.js';
+import { URI } from '../../../base/common/uri.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';
@@ -16,12 +17,12 @@ 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 { TestMessage, Position, location, TestCoverage, TestResults, TestTag, TestItem, Range } from './extHostTypeConverters.js';
 import { TestRunProfileKind, TestRunRequest, FileCoverage } from './extHostTypes.js';
 import { TestCommandId } from '../../contrib/testing/common/constants.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 { TestsDiffOp, isStartControllerTests, TestRunProfileBitset, TestControllerCapability, AbstractIncrementalTestCollection, TestResultState } from '../../contrib/testing/common/testTypes.js';
 import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 let followupCounter = 0;
 const testResultInternalIDs = ( new WeakMap());
@@ -89,6 +90,22 @@ let ExtHostTesting = class ExtHostTesting extends Disposable {
         const profiles = ( new Map());
         const activeProfiles = ( new Set());
         const proxy = this.proxy;
+        const getCapability = () => {
+            let cap = 0;
+            if (refreshHandler) {
+                cap |= TestControllerCapability.Refresh;
+            }
+            const rcp = info.relatedCodeProvider;
+            if (rcp) {
+                if (rcp?.provideRelatedTests) {
+                    cap |= TestControllerCapability.TestRelatedToCode;
+                }
+                if (rcp?.provideRelatedCode) {
+                    cap |= TestControllerCapability.CodeRelatedToTest;
+                }
+            }
+            return cap;
+        };
         const controller = {
             items: collection.root.children,
             get label() {
@@ -104,11 +121,19 @@ let ExtHostTesting = class ExtHostTesting extends Disposable {
             },
             set refreshHandler(value) {
                 refreshHandler = value;
-                proxy.$updateController(controllerId, { canRefresh: !!value });
+                proxy.$updateController(controllerId, { capabilities: getCapability() });
             },
             get id() {
                 return controllerId;
             },
+            get relatedCodeProvider() {
+                return info.relatedCodeProvider;
+            },
+            set relatedCodeProvider(value) {
+                checkProposedApiEnabled(extension, 'testRelatedCode');
+                info.relatedCodeProvider = value;
+                proxy.$updateController(controllerId, { capabilities: getCapability() });
+            },
             createRunProfile: (label, group, runHandler, isDefault, tag, supportsContinuousRun) => {
                 let profileId = hash(label);
                 while (( profiles.has(profileId))) {
@@ -154,9 +179,9 @@ let ExtHostTesting = class ExtHostTesting extends Disposable {
                 disposable.dispose();
             },
         };
-        proxy.$registerTestController(controllerId, label, !!refreshHandler);
-        disposable.add(toDisposable(() => proxy.$unregisterTestController(controllerId)));
         const info = { controller, collection, profiles, extension, activeProfiles };
+        proxy.$registerTestController(controllerId, label, getCapability());
+        disposable.add(toDisposable(() => proxy.$unregisterTestController(controllerId)));
         this.controllers.set(controllerId, info);
         disposable.add(toDisposable(() => this.controllers.delete(controllerId)));
         disposable.add(collection.onDidGenerateDiff(diff => proxy.$publishDiff(controllerId, ( diff.map(TestsDiffOp.serialize)))));
@@ -189,6 +214,44 @@ let ExtHostTesting = class ExtHostTesting extends Disposable {
         this.followupProviders.add(provider);
         return { dispose: () => { this.followupProviders.delete(provider); } };
     }
+    async $getTestsRelatedToCode(uri, _position, token) {
+        const doc = this.editors.getDocument(URI.revive(uri));
+        if (!doc) {
+            return [];
+        }
+        const position = Position.to(_position);
+        const related = [];
+        await Promise.all(( [...( this.controllers.values())].map(async (c) => {
+            let tests;
+            try {
+                tests = await c.relatedCodeProvider?.provideRelatedTests?.(doc.document, position, token);
+            }
+            catch (e) {
+                if (!token.isCancellationRequested) {
+                    this.logService.warn(`Error thrown while providing related tests for ${c.controller.label}`, e);
+                }
+            }
+            if (tests) {
+                for (const test of tests) {
+                    related.push(( TestId.fromExtHostTestItem(test, c.controller.id).toString()));
+                }
+                c.collection.flushDiff();
+            }
+        })));
+        return related;
+    }
+    async $getCodeRelatedToTest(testId, token) {
+        const controller = this.controllers.get(TestId.root(testId));
+        if (!controller) {
+            return [];
+        }
+        const test = controller.collection.tree.get(testId);
+        if (!test) {
+            return [];
+        }
+        const locations = await controller.relatedCodeProvider?.provideRelatedCode?.(test.actual, token);
+        return locations?.map(location.from) ?? [];
+    }
     $syncTests() {
         for (const { collection } of ( this.controllers.values())) {
             collection.flushDiff();
@@ -533,7 +596,7 @@ class TestRunTracker extends Disposable {
         };
         this.running++;
         this.tasks.set(taskId, { run });
-        this.proxy.$startedTestRunTask(runId, { id: taskId, name, running: true });
+        this.proxy.$startedTestRunTask(runId, { id: taskId, ctrlId: this.dto.controllerId, name, running: true });
         return run;
     }
     forciblyEndTasks() {

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

@@ -1,7 +1,7 @@
 import { ok } from '../../../base/common/assert.js';
 import { ReadonlyError, illegalArgument } from '../../../base/common/errors.js';
 import { IdGenerator } from '../../../base/common/idGenerator.js';
-import { Position as Position$1, Range as Range$1, isDecorationOptionsArr, fromRangeOrRangeWithMessage, ViewColumn, EndOfLine, TextEditorLineNumbersStyle, Selection as Selection$1, DecorationRenderOptions } from './extHostTypeConverters.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';
 class TextEditorDecorationType {
     static { this._Keys = ( new IdGenerator('TextEditorDecorationType')); }
@@ -432,6 +432,9 @@ class ExtHostTextEditor {
             },
             hide() {
                 _proxy.$tryHideEditor(id);
+            },
+            [Symbol.for('debug.description')]() {
+                return `TextEditor(${( this.document.uri.toString())})`;
             }
         }));
     }

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

@@ -1,4 +1,4 @@
-import { localizeWithPath } from '../../../nls.js';
+import { localize } from '../../../nls.js';
 import { basename } from '../../../base/common/resources.js';
 import { URI } from '../../../base/common/uri.js';
 import { Emitter, Event } from '../../../base/common/event.js';
@@ -13,7 +13,6 @@ import { isMarkdownString } from '../../../base/common/htmlContent.js';
 import { CancellationTokenSource } from '../../../base/common/cancellation.js';
 import { TreeViewsDnDService } from '../../../editor/common/services/treeViewsDnd.js';
 import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
-const _moduleId = "vs/workbench/api/common/extHostTreeViews";
 function toTreeItemLabel(label, extension) {
     if (isString(label)) {
         return { label };
@@ -658,7 +657,7 @@ class ExtHostTreeView extends Disposable {
         const node = this.createTreeNode(element, extTreeItem, parentNode);
         if (extTreeItem.id && ( this.elements.has(node.item.handle))) {
             throw ( new Error(
-                localizeWithPath(_moduleId, 0, 'Element with id {0} is already registered', extTreeItem.id)
+                localize(5249, 'Element with id {0} is already registered', extTreeItem.id)
             ));
         }
         this.addNodeToCache(element, node);

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

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { Emitter } from '../../../base/common/event.js';
 import { Disposable, toDisposable } from '../../../base/common/lifecycle.js';
-import { localizeWithPath } from '../../../nls.js';
+import { localize } from '../../../nls.js';
 import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../platform/log/common/log.service.js';
 import { TunnelPrivacyId, DisposableTunnel } from '../../../platform/tunnel/common/tunnel.js';
@@ -10,7 +10,6 @@ import { MainContext } from './extHost.protocol.js';
 import { IExtHostInitDataService } from './extHostInitDataService.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
 import { Disposable as Disposable$1 } from './extHostTypes.js';
-const _moduleId = "vs/workbench/api/common/extHostTunnelService";
 class ExtensionTunnel extends DisposableTunnel {
 }
 var TunnelDtoConverter;
@@ -147,12 +146,12 @@ let ExtHostTunnelService = class ExtHostTunnelService extends Disposable {
                     privacyOptions = [
                         {
                             id: 'private',
-                            label: ( localizeWithPath(_moduleId, 0, "Private")),
+                            label: ( localize(1608, "Private")),
                             themeIcon: 'lock'
                         },
                         {
                             id: 'public',
-                            label: ( localizeWithPath(_moduleId, 1, "Public")),
+                            label: ( localize(1609, "Public")),
                             themeIcon: 'eye'
                         }
                     ];

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

@@ -11,13 +11,13 @@ 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 { isEmptyObject, isUndefinedOrNull, isString, isNumber, isDefined } from '../../../base/common/types.js';
+import { isString, isEmptyObject, isUndefinedOrNull, 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, 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 { 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 { TrackedRangeStickiness, EndOfLineSequence } 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';
 import { getPrivateApiFor } from './extHostTestingPrivateApi.js';
@@ -29,7 +29,7 @@ import { CellEditType, CellStatusbarAlignment, CellKind, NotebookCellExecutionSt
 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, 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';
+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, 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, 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, NotebookCellData as NotebookCellData$1, NotebookCellOutputItem as NotebookCellOutputItem$1, NotebookCellOutput as NotebookCellOutput$1, TestTag as TestTag$1, CodeActionTriggerKind as CodeActionTriggerKind$1, TypeHierarchyItem as TypeHierarchyItem$1, ChatResponseProgressPart as ChatResponseProgressPart$1, ChatResponseReferencePart as ChatResponseReferencePart$1, 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, NotebookData as NotebookData$1, NotebookCellStatusBarAlignment, DataTransfer as DataTransfer$1, LanguageModelFunctionResultPart, LanguageModelChatMessage as LanguageModelChatMessage$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, ChatResponseConfirmationPart as ChatResponseConfirmationPart$1, ChatResponseCodeCitationPart as ChatResponseCodeCitationPart$1, DiagnosticTag as DiagnosticTag$1, DecorationRangeBehavior as DecorationRangeBehavior$1, EndOfLine as EndOfLine$1, NotebookCellKind as NotebookCellKind$1, LanguageModelChatMessageRole as LanguageModelChatMessageRole$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 } from './extHostTypes.js';
 var Selection;
 ( (function(Selection) {
     function to(selection) {
@@ -1761,6 +1761,11 @@ var TestMessage;
             actual: message.actualOutput,
             contextValue: message.contextValue,
             location: message.location && ({ range: Range.from(message.location.range), uri: message.location.uri }),
+            stackTrace: message.stackTrace?.map(s => ({
+                label: s.label,
+                position: s.position && Position.from(s.position),
+                uri: s.file && URI.revive(s.file).toJSON(),
+            })),
         };
     }
     TestMessage.from = from;
@@ -2208,7 +2213,8 @@ var ChatResponseConfirmationPart;
             kind: 'confirmation',
             title: part.title,
             message: part.message,
-            data: part.data
+            data: part.data,
+            buttons: part.buttons
         };
     }
     ChatResponseConfirmationPart.from = from;
@@ -2364,7 +2370,8 @@ var ChatResponseReferencePart;
                         part.value.value :
                         Location.from(part.value.value)
                 },
-                iconPath
+                iconPath,
+                options: part.options
             };
         }
         return {
@@ -2372,7 +2379,8 @@ var ChatResponseReferencePart;
             reference: URI.isUri(part.value) ?
                 part.value :
                 Location.from(part.value),
-            iconPath
+            iconPath,
+            options: part.options
         };
     }
     ChatResponseReferencePart.from = from;
@@ -2389,6 +2397,18 @@ var ChatResponseReferencePart;
     }
     ChatResponseReferencePart.to = to;
 })(ChatResponseReferencePart || (ChatResponseReferencePart = {})));
+var ChatResponseCodeCitationPart;
+( (function(ChatResponseCodeCitationPart) {
+    function from(part) {
+        return {
+            kind: 'codeCitation',
+            value: part.value,
+            license: part.license,
+            snippet: part.snippet
+        };
+    }
+    ChatResponseCodeCitationPart.from = from;
+})(ChatResponseCodeCitationPart || (ChatResponseCodeCitationPart = {})));
 var ChatResponsePart;
 ( (function(ChatResponsePart) {
     function from(part, commandsConverter, commandDisposables) {
@@ -2422,6 +2442,12 @@ var ChatResponsePart;
         else if (part instanceof ChatResponseWarningPart$1) {
             return ChatResponseWarningPart.from(part);
         }
+        else if (part instanceof ChatResponseConfirmationPart$1) {
+            return ChatResponseConfirmationPart.from(part);
+        }
+        else if (part instanceof ChatResponseCodeCitationPart$1) {
+            return ChatResponseCodeCitationPart.from(part);
+        }
         return {
             kind: 'markdownContent',
             content: MarkdownString.from('')
@@ -2455,16 +2481,20 @@ var ChatResponsePart;
 })(ChatResponsePart || (ChatResponsePart = {})));
 var ChatAgentRequest;
 ( (function(ChatAgentRequest) {
-    function to(request) {
+    function to(request, location2) {
+        const requestedTools = ( request.variables.variables.filter(v => v.isTool).map(tool => tool.id));
+        const variablesWithoutTools = request.variables.variables.filter(v => !v.isTool);
         return {
             prompt: request.message,
             command: request.command,
             attempt: request.attempt ?? 0,
             enableCommandDetection: request.enableCommandDetection ?? true,
-            references: ( request.variables.variables.map(ChatAgentValueReference.to)),
+            references: ( variablesWithoutTools.map(ChatAgentValueReference.to)),
             location: ChatLocation.to(request.location),
             acceptedConfirmationData: request.acceptedConfirmationData,
-            rejectedConfirmationData: request.rejectedConfirmationData
+            rejectedConfirmationData: request.rejectedConfirmationData,
+            location2,
+            requestedTools
         };
     }
     ChatAgentRequest.to = to;
@@ -2627,4 +2657,4 @@ var LanguageModelToolDescription;
     }
     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 };
+export { CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, ChatAgentCompletionItem, ChatAgentRequest, ChatAgentResult, ChatAgentUserActionEvent, ChatAgentValueReference, ChatFollowup, ChatLocation, ChatResponseAnchorPart, ChatResponseCodeCitationPart, 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 };