@codingame/monaco-vscode-api 26.2.2 → 28.0.0

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

@@ -483,6 +483,8 @@ class ExtHostSourceControlResourceGroup {
     dispose() {
         this._disposed = true;
         this._onDidDispose.fire();
+        this._onDidUpdateResourceStates.dispose();
+        this._onDidDispose.dispose();
     }
 }
 class ExtHostSourceControl {
@@ -839,6 +841,7 @@ class ExtHostSourceControl {
         this._artifactCommandsDisposables.dispose();
         this._groups.forEach(group => group.dispose());
         this.#proxy.$unregisterSourceControl(this.handle);
+        this._onDidChangeSelection.dispose();
         this._onDidDispose.fire();
         this._onDidDispose.dispose();
     }

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

@@ -195,7 +195,7 @@ class ExtHostStatusBarEntry {
                 name = this._name;
             } else {
                 name = ( localize(
-                    2703,
+                    2749,
                     "{0} (Extension)",
                     this._extension.displayName || this._extension.name
                 ));
@@ -233,6 +233,8 @@ class ExtHostStatusBarEntry {
     }
     dispose() {
         this.hide();
+        this._staleCommandRegistrations.dispose();
+        this._latestCommandRegistration?.dispose();
         this._onDispose?.();
         this._disposed = true;
     }
@@ -246,7 +248,7 @@ class StatusBarMessage {
             StatusBarAlignment.Left,
             Number.MIN_VALUE
         );
-        this._item.name = ( localize(2704, "Extension Status"));
+        this._item.name = ( localize(2750, "Extension Status"));
     }
     dispose() {
         this._messages.length = 0;

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

@@ -30,7 +30,7 @@ let ExtHostTelemetry = class ExtHostTelemetry extends Disposable {
         const id = initData.remote.isRemote ? "remoteExtHostTelemetry" : isWorker ? "workerExtHostTelemetry" : "extHostTelemetry";
         this._outputLogger = this._register(loggerService.createLogger(id, {
             name: ( localize(
-                2705,
+                2751,
                 "Extension Telemetry{0}",
                 this._inLoggingOnlyMode ? " (Not Sent)" : ""
             )),
@@ -284,6 +284,7 @@ class ExtHostTelemetryLogger {
         } else {
             this._sender = undefined;
         }
+        this._onDidChangeEnableStates.dispose();
     }
 }
 function isNewAppInstall(firstSessionDate) {

package/vscode/src/vs/workbench/api/common/extHostTerminalService.d.ts

@@ -78,7 +78,7 @@ export declare class ExtHostTerminal extends Disposable {
     constructor(_proxy: MainThreadTerminalServiceShape, _id: ExtHostTerminalIdentifier, _creationOptions: vscode.TerminalOptions | vscode.ExtensionTerminalOptions, _name?: string | undefined);
     dispose(): void;
     create(options: vscode.TerminalOptions, internalOptions?: ITerminalInternalOptions): Promise<void>;
-    createExtensionTerminal(location?: TerminalLocation | vscode.TerminalEditorLocationOptions | vscode.TerminalSplitLocationOptions, internalOptions?: ITerminalInternalOptions, parentTerminal?: ExtHostTerminalIdentifier, iconPath?: TerminalIcon, color?: ThemeColor, shellIntegrationNonce?: string): Promise<number>;
+    createExtensionTerminal(location?: TerminalLocation | vscode.TerminalEditorLocationOptions | vscode.TerminalSplitLocationOptions, internalOptions?: ITerminalInternalOptions, parentTerminal?: ExtHostTerminalIdentifier, iconPath?: TerminalIcon, color?: ThemeColor, shellIntegrationNonce?: string, titleTemplate?: string): Promise<number>;
     private _serializeParentTerminal;
     private _checkDisposed;
     set name(name: string);

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

@@ -21,6 +21,7 @@ import { IExtHostCommands } from './extHostCommands.js';
 import { MarshalledId } from '../../../base/common/marshallingIds.js';
 import { isWindows } from '../../../base/common/platform.js';
 import { hasKey } from '../../../base/common/types.js';
+import { isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 
 const IExtHostTerminalService = ( createDecorator("IExtHostTerminalService"));
 class ExtHostTerminal extends Disposable {
@@ -117,7 +118,8 @@ class ExtHostTerminal extends Disposable {
             useShellEnvironment: internalOptions?.useShellEnvironment ?? undefined,
             location: internalOptions?.location || this._serializeParentTerminal(options.location, internalOptions?.resolvedExtHostIdentifier),
             isTransient: options.isTransient ?? undefined,
-            shellIntegrationNonce: options.shellIntegrationNonce ?? undefined
+            shellIntegrationNonce: options.shellIntegrationNonce ?? undefined,
+            titleTemplate: options.titleTemplate ?? undefined
         });
     }
     async createExtensionTerminal(
@@ -126,7 +128,8 @@ class ExtHostTerminal extends Disposable {
         parentTerminal,
         iconPath,
         color,
-        shellIntegrationNonce
+        shellIntegrationNonce,
+        titleTemplate
     ) {
         if (typeof this._id !== "string") {
             throw ( new Error("Terminal has already been created"));
@@ -138,7 +141,8 @@ class ExtHostTerminal extends Disposable {
             color: ThemeColor.isThemeColor(color) ? color.id : undefined,
             location: internalOptions?.location || this._serializeParentTerminal(location, parentTerminal),
             isTransient: true,
-            shellIntegrationNonce: shellIntegrationNonce ?? undefined
+            shellIntegrationNonce: shellIntegrationNonce ?? undefined,
+            titleTemplate: titleTemplate ?? undefined
         });
         if (typeof this._id === "string") {
             throw ( new Error("Terminal creation failed"));
@@ -410,7 +414,8 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
             this._serializeParentTerminal(options, internalOptions).resolvedExtHostIdentifier,
             asTerminalIcon(options.iconPath),
             asTerminalColor(options.color),
-            options.shellIntegrationNonce
+            options.shellIntegrationNonce,
+            options.titleTemplate
         ).then(id => {
             const disposable = this._setupExtHostProcessListeners(id, p);
             this._terminalProcessDisposables[id] = disposable;
@@ -529,7 +534,8 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
             shellArgs: shellLaunchConfigDto.args,
             cwd: typeof shellLaunchConfigDto.cwd === "string" ? shellLaunchConfigDto.cwd : URI.revive(shellLaunchConfigDto.cwd),
             env: shellLaunchConfigDto.env,
-            hideFromUser: shellLaunchConfigDto.hideFromUser
+            hideFromUser: shellLaunchConfigDto.hideFromUser,
+            titleTemplate: shellLaunchConfigDto.titleTemplate
         };
         const terminal = ( new ExtHostTerminal(this._proxy, id, creationOptions, name));
         this._terminals.push(terminal);
@@ -544,7 +550,7 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
         const terminal = this.getTerminalById(id);
         if (!terminal) {
             return {
-                message: ( localize(2706, "Could not find the terminal with id {0} on the extension host", id))
+                message: ( localize(2752, "Could not find the terminal with id {0} on the extension host", id))
             };
         }
         if (!terminal.isOpen) {
@@ -631,7 +637,10 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
         if (( this._profileProviders.has(id))) {
             throw ( new Error(`Terminal profile provider "${id}" already registered`));
         }
-        this._profileProviders.set(id, provider);
+        this._profileProviders.set(id, {
+            provider,
+            extension
+        });
         this._proxy.$registerProfileProvider(id, extension.identifier.value);
         return ( new Disposable$1(() => {
             this._profileProviders.delete(id);
@@ -717,7 +726,11 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
     }
     async $createContributedProfileTerminal(id, options) {
         const token = ( new CancellationTokenSource()).token;
-        let profile = await this._profileProviders.get(id)?.provideTerminalProfile(token);
+        const profileProviderData = this._profileProviders.get(id);
+        if (!profileProviderData) {
+            throw ( new Error(`No terminal profile provider registered for id "${id}"`));
+        }
+        let profile = await profileProviderData.provider.provideTerminalProfile(token);
         if (token.isCancellationRequested) {
             return;
         }
@@ -733,13 +746,34 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
         })) {
             throw ( new Error(`No terminal profile options provided for id "${id}"`));
         }
-        if (hasKey(profile.options, {
+        const hasTerminalTitleProposal = isProposedApiEnabled(profileProviderData.extension, "terminalTitle");
+        if (!hasTerminalTitleProposal && profile.options.titleTemplate !== undefined) {
+            console.error(
+                `[${profileProviderData.extension.identifier.value}] \`titleTemplate\` returned from TerminalProfileProvider is ignored because the \`terminalTitle\` proposed API is not enabled.`
+            );
+            profile = {
+                options: {
+                    ...profile.options,
+                    titleTemplate: undefined
+                }
+            };
+        }
+        if (!hasTerminalTitleProposal && options.titleTemplate !== undefined) {
+            console.error(
+                `[${profileProviderData.extension.identifier.value}] \`titleTemplate\` passed to createContributedTerminalProfile is ignored because the \`terminalTitle\` proposed API is not enabled.`
+            );
+        }
+        const profileOptions = hasTerminalTitleProposal && options.titleTemplate && !profile.options.titleTemplate ? {
+            ...profile.options,
+            titleTemplate: options.titleTemplate
+        } : profile.options;
+        if (hasKey(profileOptions, {
             pty: true
         })) {
-            this.createExtensionTerminal(profile.options, options);
+            this.createExtensionTerminal(profileOptions, options);
             return;
         }
-        this.createTerminalFromOptions(profile.options, options);
+        this.createTerminalFromOptions(profileOptions, options);
     }
     registerLinkProvider(provider) {
         this._linkProviders.add(provider);
@@ -904,7 +938,7 @@ class UnifiedEnvironmentVariableCollection extends Disposable {
         this.scopedCollections = ( new Map());
         this.descriptionMap = ( new Map());
         this._persistent = true;
-        this._onDidChangeCollection = ( new Emitter());
+        this._onDidChangeCollection = this._register(( new Emitter()));
         this.map = ( new Map(serialized));
     }
     getScopedEnvironmentVariableCollection(scope) {

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

@@ -16,11 +16,11 @@ let ExtHostTerminalShellIntegration = class ExtHostTerminalShellIntegration exte
         super();
         this._extHostTerminalService = _extHostTerminalService;
         this._activeShellIntegrations = ( new Map());
-        this._onDidChangeTerminalShellIntegration = ( new Emitter());
+        this._onDidChangeTerminalShellIntegration = this._register(( new Emitter()));
         this.onDidChangeTerminalShellIntegration = this._onDidChangeTerminalShellIntegration.event;
-        this._onDidStartTerminalShellExecution = ( new Emitter());
+        this._onDidStartTerminalShellExecution = this._register(( new Emitter()));
         this.onDidStartTerminalShellExecution = this._onDidStartTerminalShellExecution.event;
-        this._onDidEndTerminalShellExecution = ( new Emitter());
+        this._onDidEndTerminalShellExecution = this._register(( new Emitter()));
         this.onDidEndTerminalShellExecution = this._onDidEndTerminalShellExecution.event;
         this._proxy = ( extHostRpc.getProxy(MainContext.MainThreadTerminalShellIntegration));
         this._register(toDisposable(() => {

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

@@ -12,13 +12,13 @@ class ExtHostEditors extends Disposable {
     constructor(mainContext, _extHostDocumentsAndEditors) {
         super();
         this._extHostDocumentsAndEditors = _extHostDocumentsAndEditors;
-        this._onDidChangeTextEditorSelection = ( new Emitter());
-        this._onDidChangeTextEditorOptions = ( new Emitter());
-        this._onDidChangeTextEditorVisibleRanges = ( new Emitter());
-        this._onDidChangeTextEditorViewColumn = ( new Emitter());
-        this._onDidChangeTextEditorDiffInformation = ( new Emitter());
-        this._onDidChangeActiveTextEditor = ( new Emitter());
-        this._onDidChangeVisibleTextEditors = ( new Emitter());
+        this._onDidChangeTextEditorSelection = this._register(( new Emitter()));
+        this._onDidChangeTextEditorOptions = this._register(( new Emitter()));
+        this._onDidChangeTextEditorVisibleRanges = this._register(( new Emitter()));
+        this._onDidChangeTextEditorViewColumn = this._register(( new Emitter()));
+        this._onDidChangeTextEditorDiffInformation = this._register(( new Emitter()));
+        this._onDidChangeActiveTextEditor = this._register(( new Emitter()));
+        this._onDidChangeVisibleTextEditors = this._register(( new Emitter()));
         this.onDidChangeTextEditorSelection = this._onDidChangeTextEditorSelection.event;
         this.onDidChangeTextEditorOptions = this._onDidChangeTextEditorOptions.event;
         this.onDidChangeTextEditorVisibleRanges = this._onDidChangeTextEditorVisibleRanges.event;

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

@@ -1,5 +1,4 @@
 
-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';
@@ -169,7 +168,10 @@ class ExtHostTreeViews extends Disposable {
             },
             dispose: async () => {
                 await registerPromise;
-                this._treeViews.delete(viewId);
+                if (this._treeViews.get(viewId) === treeView) {
+                    this._treeViews.delete(viewId);
+                    this._proxy.$disposeTree(viewId);
+                }
                 treeView.dispose();
             }
         };
@@ -705,25 +707,7 @@ class ExtHostTreeView extends Disposable {
         }
         const extTreeItem = await asPromise(() => this._dataProvider.getTreeItem(element));
         const handle = this._createHandle(element, extTreeItem, parent, true);
-        const children = await this.getChildren(parent ? parent.item.handle : undefined);
-        if (children === undefined) {
-            this._logService.warn(
-                `[${this._viewId}] Concurrent refresh detected in _resolveTreeNode for element ${handle} from extension ${this._extension.identifier.value}, waiting for refresh to complete`
-            );
-            this._proxy.$logResolveTreeNodeRetry(this._extension.identifier.value, 1, false);
-            await this._refreshPromise;
-            const cachedElement = this.getExtensionElement(handle);
-            if (cachedElement) {
-                const node = this._nodes.get(cachedElement);
-                if (node) {
-                    return node;
-                }
-            }
-            this._proxy.$logResolveTreeNodeRetry(this._extension.identifier.value, 1, true);
-            throw ( new Error(
-                `Cannot resolve tree item for element ${handle} from extension ${this._extension.identifier.value}`
-            ));
-        }
+        await this.getChildren(parent ? parent.item.handle : undefined);
         const cachedElement = this.getExtensionElement(handle);
         if (cachedElement) {
             const node = this._nodes.get(cachedElement);
@@ -731,6 +715,10 @@ class ExtHostTreeView extends Disposable {
                 return node;
             }
         }
+        this._logService.error(
+            `[TreeView:${this._viewId}] Failed to resolve tree node for element ${handle}`
+        );
+        this._proxy.$logResolveTreeNodeFailure(this._extension.identifier.value);
         throw ( new Error(
             `Cannot resolve tree item for element ${handle} from extension ${this._extension.identifier.value}`
         ));
@@ -863,10 +851,10 @@ class ExtHostTreeView extends Disposable {
         if (duplicateHandle) {
             const existingElement = this._elements.get(duplicateHandle);
             if (existingElement) {
+                const existingNode = this._nodes.get(existingElement);
                 if (existingElement !== element) {
-                    throw ( new Error(( localize(2707, "Element with id {0} is already registered", extTreeItem.id))));
+                    this._nodes.delete(existingElement);
                 }
-                const existingNode = this._nodes.get(existingElement);
                 if (existingNode) {
                     const newNode = this._createTreeNode(element, extTreeItem, parentNode);
                     this._updateNodeCache(element, newNode, existingNode, parentNode);
@@ -1089,7 +1077,6 @@ class ExtHostTreeView extends Disposable {
         super.dispose();
         this._refreshCancellationSource.dispose();
         this._clearAll();
-        this._proxy.$disposeTree(this._viewId);
     }
 }
 

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

@@ -48,7 +48,7 @@ let ExtHostTunnelService = class ExtHostTunnelService extends Disposable {
             return Promise.resolve(true);
         };
         this._extensionTunnels = ( new Map());
-        this._onDidChangeTunnels = ( new Emitter());
+        this._onDidChangeTunnels = this._register(( new Emitter()));
         this.onDidChangeTunnels = this._onDidChangeTunnels.event;
         this._providerHandleCounter = 0;
         this._portAttributesProviders = ( new Map());
@@ -164,11 +164,11 @@ let ExtHostTunnelService = class ExtHostTunnelService extends Disposable {
                 if (provider.tunnelFeatures?.public && (privacyOptions.length === 0)) {
                     privacyOptions = [{
                         id: "private",
-                        label: ( localize(2708, "Private")),
+                        label: ( localize(2753, "Private")),
                         themeIcon: "lock"
                     }, {
                         id: "public",
-                        label: ( localize(2709, "Public")),
+                        label: ( localize(2754, "Public")),
                         themeIcon: "eye"
                     }];
                 }

package/vscode/src/vs/workbench/api/common/extHostTypeConverters.d.ts

@@ -22,10 +22,11 @@ import { SaveReason } from "../../common/editor.js";
 import { IViewBadge } from "../../common/views.js";
 import { IChatAgentRequest, IChatAgentResult } from "../../contrib/chat/common/participants/chatAgents.js";
 import { IChatRequestModeInstructions } from "../../contrib/chat/common/model/chatModel.js";
-import { IChatAgentMarkdownContentWithVulnerability, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatExtensionsContent, IChatFollowup, IChatHookPart, IChatMarkdownContent, IChatMoveMessage, IChatMultiDiffDataSerialized, IChatProgressMessage, IChatPullRequestContent, IChatQuestionCarousel, IChatResponseCodeblockUriPart, IChatTaskDto, IChatTaskResult, IChatTextEdit, IChatThinkingPart, IChatToolInvocationSerialized, IChatTreeData, IChatUserActionEvent, IChatWarningMessage, IChatWorkspaceEdit } from "../../contrib/chat/common/chatService/chatService.js";
+import { IChatAgentMarkdownContentWithVulnerability, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatExtensionsContent, IChatExternalToolInvocationUpdate, IChatFollowup, IChatHookPart, IChatMarkdownContent, IChatMoveMessage, IChatMultiDiffDataSerialized, IChatProgressMessage, IChatPullRequestContent, IChatQuestionCarousel, IChatResponseCodeblockUriPart, IChatTaskDto, IChatTaskResult, IChatTextEdit, IChatThinkingPart, IChatToolInvocationSerialized, IChatTreeData, IChatUserActionEvent, IChatWarningMessage, IChatWorkspaceEdit } from "../../contrib/chat/common/chatService/chatService.js";
 import { IChatRequestVariableEntry } from "../../contrib/chat/common/attachments/chatVariableEntries.js";
+import { IChatSessionItem } from "../../contrib/chat/common/chatSessionsService.js";
 import { ChatAgentLocation } from "../../contrib/chat/common/constants.js";
-import { IChatRequestHooks, IHookCommand } from "../../contrib/chat/common/promptSyntax/hookSchema.js";
+import { ChatRequestHooks, IHookCommand } from "../../contrib/chat/common/promptSyntax/hookSchema.js";
 import { IToolResult, ToolDataSource } from "../../contrib/chat/common/tools/languageModelToolsService.js";
 import * as chatProvider from "../../contrib/chat/common/languageModels.js";
 import { IDebugVisualizationTreeItem } from "../../contrib/debug/common/debug.js";
@@ -508,14 +509,16 @@ export declare namespace ChatResponseExtensionsPart {
     function from(part: vscode.ChatResponseExtensionsPart): Dto<IChatExtensionsContent>;
 }
 export declare namespace ChatResponsePullRequestPart {
-    function from(part: vscode.ChatResponsePullRequestPart): Dto<IChatPullRequestContent>;
+    function from(part: Omit<vscode.ChatResponsePullRequestPart, "command"> & {
+        command?: vscode.Command;
+    }, commandsConverter: CommandsConverter, commandDisposables: DisposableStore): Dto<IChatPullRequestContent>;
 }
 export declare namespace ChatResponseMovePart {
     function from(part: vscode.ChatResponseMovePart): Dto<IChatMoveMessage>;
     function to(part: Dto<IChatMoveMessage>): vscode.ChatResponseMovePart;
 }
 export declare namespace ChatToolInvocationPart {
-    function from(part: vscode.ChatToolInvocationPart): IChatToolInvocationSerialized;
+    function from(part: vscode.ChatToolInvocationPart): IChatToolInvocationSerialized | IChatExternalToolInvocationUpdate;
     function to(part: any): vscode.ChatToolInvocationPart;
 }
 export declare namespace ChatTask {
@@ -651,8 +654,11 @@ export declare namespace SourceControlInputBoxValidationType {
     function from(type: number): InputValidationType;
 }
 export declare namespace ChatRequestHooksConverter {
-    function to(hooks: IChatRequestHooks): vscode.ChatRequestHooks;
+    function to(hooks: ChatRequestHooks): vscode.ChatRequestHooks;
 }
 export declare namespace ChatHookCommand {
     function to(hook: IHookCommand): vscode.ChatHookCommand | undefined;
 }
+export declare namespace ChatSessionItem {
+    function from(sessionContent: vscode.ChatSessionItem): Dto<IChatSessionItem>;
+}