@codingame/monaco-vscode-api 3.2.3 → 4.1.0

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

@@ -11,7 +11,7 @@ import { localizeWithPath } from '../../../nls.js';
 import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
 import { MainContext } from './extHost.protocol.js';
 import { ChatAgentRequest, ChatAgentResult, ChatAgentResolvedVariable, ChatResponsePart, ChatFollowup, ChatAgentUserActionEvent, ChatAgentCompletionItem, MarkdownString, ChatResponseMarkdownPart, ChatResponseFilesPart, ChatResponseAnchorPart, ChatResponseCommandButtonPart, ChatResponseProgressPart, ChatResponseReferencePart, ChatResponseProgress } from './extHostTypeConverters.js';
-import { ChatRequestTurn, ChatResponseTurn, ChatResultFeedbackKind, ThemeIcon, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatResponseFileTreePart, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, ChatResponseProgressPart as ChatResponseProgressPart$1, ChatResponseReferencePart as ChatResponseReferencePart$1 } from './extHostTypes.js';
+import { ChatRequestTurn, ChatResponseTurn, ChatResultFeedbackKind, ChatResponseReferencePart as ChatResponseReferencePart$1, ThemeIcon, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatResponseFileTreePart, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, ChatResponseProgressPart as ChatResponseProgressPart$1 } from './extHostTypes.js';
 import { InteractiveSessionVoteDirection } from '../../contrib/chat/common/chatService.js';
 import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 class ChatAgentResponseStream {
@@ -89,15 +89,41 @@ class ChatAgentResponseStream {
                 },
                 reference(value) {
                     throwIfDone(this.reference);
-                    const part = new ChatResponseReferencePart$1(value);
-                    const dto = ChatResponseReferencePart.to(part);
-                    _report(dto);
+                    if ('variableName' in value && !value.value) {
+                        const matchingVarData = that._request.variables.variables.find(v => v.name === value.variableName);
+                        if (matchingVarData) {
+                            let references;
+                            if (matchingVarData.references?.length) {
+                                references = ( matchingVarData.references.map(r => ({
+                                    kind: 'reference',
+                                    reference: { variableName: value.variableName, value: r.reference }
+                                })));
+                            }
+                            else {
+                                const part = new ChatResponseReferencePart$1(value);
+                                const dto = ChatResponseReferencePart.to(part);
+                                references = [dto];
+                            }
+                            references.forEach(r => _report(r));
+                            return this;
+                        }
+                    }
+                    else {
+                        const part = new ChatResponseReferencePart$1(value);
+                        const dto = ChatResponseReferencePart.to(part);
+                        _report(dto);
+                    }
                     return this;
                 },
                 push(part) {
                     throwIfDone(this.push);
-                    const dto = ChatResponsePart.to(part);
-                    _report(dto);
+                    if (part instanceof ChatResponseReferencePart$1) {
+                        this.reference(part.value);
+                    }
+                    else {
+                        const dto = ChatResponsePart.to(part, that._commandsConverter, that._sessionDisposables);
+                        _report(dto);
+                    }
                     return this;
                 },
                 report(progress) {
@@ -127,11 +153,18 @@ class ExtHostChatAgents2 {
         this._sessionDisposables = ( new DisposableMap());
         this._proxy = ( mainContext.getProxy(MainContext.MainThreadChatAgents2));
     }
-    createChatAgent(extension, name, handler) {
+    createChatAgent(extension, id, handler) {
+        const handle = ExtHostChatAgents2._idPool++;
+        const agent = ( new ExtHostChatAgent(extension, id, this._proxy, handle, handler));
+        this._agents.set(handle, agent);
+        this._proxy.$registerAgent(handle, extension.identifier, id, {}, undefined);
+        return agent.apiAgent;
+    }
+    createDynamicChatAgent(extension, id, name, description, handler) {
         const handle = ExtHostChatAgents2._idPool++;
-        const agent = ( new ExtHostChatAgent(extension, name, this._proxy, handle, handler));
+        const agent = ( new ExtHostChatAgent(extension, id, this._proxy, handle, handler));
         this._agents.set(handle, agent);
-        this._proxy.$registerAgent(handle, extension.identifier, name, {});
+        this._proxy.$registerAgent(handle, extension.identifier, id, {}, { name, description });
         return agent.apiAgent;
     }
     async $invokeAgent(handle, request, context, token) {
@@ -174,7 +207,7 @@ class ExtHostChatAgents2 {
             return { errorDetails: { message: ( localizeWithPath(
                 'vs/workbench/api/common/extHostChatAgents2',
                 'errorResponse',
-                "Error from provider: {0}",
+                "Error from participant: {0}",
                 toErrorMessage(e)
             )), responseIsIncomplete: true } };
         }
@@ -189,41 +222,27 @@ class ExtHostChatAgents2 {
             const result = agentId === h.request.agentId ?
                 ehResult :
                 { ...ehResult, metadata: undefined };
-            res.push(new ChatRequestTurn(h.request.message, h.request.command, ( h.request.variables.variables.map(ChatAgentResolvedVariable.to)), { extensionId: '', name: h.request.agentId }));
+            res.push(new ChatRequestTurn(h.request.message, h.request.command, ( h.request.variables.variables.map(ChatAgentResolvedVariable.to)), h.request.agentId));
             const parts = coalesce(( h.response.map(r => ChatResponsePart.fromContent(r, this.commands.converter))));
-            res.push(new ChatResponseTurn(parts, result, { extensionId: '', name: h.request.agentId }, h.request.command));
+            res.push(new ChatResponseTurn(parts, result, h.request.agentId, h.request.command));
         }
         return res;
     }
     $releaseSession(sessionId) {
         this._sessionDisposables.deleteAndDispose(sessionId);
     }
-    async $provideSlashCommands(handle, context, token) {
-        const agent = this._agents.get(handle);
-        if (!agent) {
-            return [];
-        }
-        const convertedHistory = await this.prepareHistoryTurns(agent.id, context);
-        try {
-            return await agent.provideSlashCommands({ history: convertedHistory }, token);
-        }
-        catch (err) {
-            const msg = toErrorMessage(err);
-            this._logService.error(`[${agent.extension.identifier.value}] [@${agent.id}] Error while providing slash commands: ${msg}`);
-            return [];
-        }
-    }
-    async $provideFollowups(request, handle, result, token) {
+    async $provideFollowups(request, handle, result, context, token) {
         const agent = this._agents.get(handle);
         if (!agent) {
             return Promise.resolve([]);
         }
+        const convertedHistory = await this.prepareHistoryTurns(agent.id, context);
         const ehResult = ChatAgentResult.to(result);
-        return ( (await agent.provideFollowups(ehResult, token))
+        return ( (await agent.provideFollowups(ehResult, { history: convertedHistory }, token))
             .filter(f => {
             const isValid = !f.participant || ( Iterable.some(( this._agents.values()), a => a.id === f.participant && ExtensionIdentifier.equals(a.extension.identifier, agent.extension.identifier)));
             if (!isValid) {
-                this._logService.warn(`[@${agent.id}] ChatFollowup refers to an invalid participant: ${f.participant}`);
+                this._logService.warn(`[@${agent.id}] ChatFollowup refers to an unknown participant: ${f.participant}`);
             }
             return isValid;
         })
@@ -307,33 +326,11 @@ class ExtHostChatAgent {
         }
         return (await this._agentVariableProvider.provider.provideCompletionItems(query, token)) ?? [];
     }
-    async provideSlashCommands(context, token) {
-        if (!this._commandProvider) {
-            return [];
-        }
-        const result = await this._commandProvider.provideCommands(context, token);
-        if (!result) {
-            return [];
-        }
-        return ( result
-            .map(c => {
-            if ('isSticky2' in c) {
-                checkProposedApiEnabled(this.extension, 'chatParticipantAdditions');
-            }
-            return {
-                name: c.name,
-                description: c.description ?? '',
-                followupPlaceholder: c.isSticky2?.placeholder,
-                isSticky: c.isSticky2?.isSticky ?? c.isSticky,
-                sampleRequest: c.sampleRequest
-            };
-        }));
-    }
-    async provideFollowups(result, token) {
+    async provideFollowups(result, context, token) {
         if (!this._followupProvider) {
             return [];
         }
-        const followups = await this._followupProvider.provideFollowups(result, token);
+        const followups = await this._followupProvider.provideFollowups(result, context, token);
         if (!followups) {
             return [];
         }
@@ -381,7 +378,6 @@ class ExtHostChatAgent {
             updateScheduled = true;
             queueMicrotask(() => {
                 this._proxy.$updateAgent(this._handle, {
-                    description: this._description ?? '',
                     fullName: this._fullName,
                     icon: !this._iconPath ? undefined :
                         this._iconPath instanceof URI ? this._iconPath :
@@ -391,32 +387,23 @@ class ExtHostChatAgent {
                         'dark' in this._iconPath ? this._iconPath.dark :
                             undefined,
                     themeIcon: this._iconPath instanceof ThemeIcon ? this._iconPath : undefined,
-                    hasSlashCommands: this._commandProvider !== undefined,
                     hasFollowups: this._followupProvider !== undefined,
-                    isDefault: this._isDefault,
                     isSecondary: this._isSecondary,
                     helpTextPrefix: (!this._helpTextPrefix || typeof this._helpTextPrefix === 'string') ? this._helpTextPrefix : MarkdownString.from(this._helpTextPrefix),
                     helpTextVariablesPrefix: (!this._helpTextVariablesPrefix || typeof this._helpTextVariablesPrefix === 'string') ? this._helpTextVariablesPrefix : MarkdownString.from(this._helpTextVariablesPrefix),
                     helpTextPostfix: (!this._helpTextPostfix || typeof this._helpTextPostfix === 'string') ? this._helpTextPostfix : MarkdownString.from(this._helpTextPostfix),
                     sampleRequest: this._sampleRequest,
                     supportIssueReporting: this._supportIssueReporting,
-                    isSticky: this._isSticky,
+                    requester: this._requester
                 });
                 updateScheduled = false;
             });
         };
         const that = this;
         return {
-            get name() {
+            get id() {
                 return that.id;
             },
-            get description() {
-                return that._description ?? '';
-            },
-            set description(v) {
-                that._description = v;
-                updateMetadataSoon();
-            },
             get fullName() {
                 checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
                 return that._fullName ?? that.extension.displayName ?? that.extension.name;
@@ -440,13 +427,6 @@ class ExtHostChatAgent {
                 assertType(typeof v === 'function', 'Invalid request handler');
                 that._requestHandler = v;
             },
-            get commandProvider() {
-                return that._commandProvider;
-            },
-            set commandProvider(v) {
-                that._commandProvider = v;
-                updateMetadataSoon();
-            },
             get followupProvider() {
                 return that._followupProvider;
             },
@@ -469,9 +449,6 @@ class ExtHostChatAgent {
             },
             set helpTextPrefix(v) {
                 checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
-                if (!that._isDefault) {
-                    throw new Error('helpTextPrefix is only available on the default chat agent');
-                }
                 that._helpTextPrefix = v;
                 updateMetadataSoon();
             },
@@ -481,9 +458,6 @@ class ExtHostChatAgent {
             },
             set helpTextVariablesPrefix(v) {
                 checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
-                if (!that._isDefault) {
-                    throw new Error('helpTextVariablesPrefix is only available on the default chat agent');
-                }
                 that._helpTextVariablesPrefix = v;
                 updateMetadataSoon();
             },
@@ -493,9 +467,6 @@ class ExtHostChatAgent {
             },
             set helpTextPostfix(v) {
                 checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
-                if (!that._isDefault) {
-                    throw new Error('helpTextPostfix is only available on the default chat agent');
-                }
                 that._helpTextPostfix = v;
                 updateMetadataSoon();
             },
@@ -556,16 +527,15 @@ class ExtHostChatAgent {
             onDidPerformAction: !isProposedApiEnabled(this.extension, 'chatParticipantAdditions')
                 ? undefined
                 : this._onDidPerformAction.event,
-            get isSticky() {
-                return that._isSticky;
-            },
-            set isSticky(v) {
-                that._isSticky = v;
+            set requester(v) {
+                that._requester = v;
                 updateMetadataSoon();
             },
+            get requester() {
+                return that._requester;
+            },
             dispose() {
                 disposed = true;
-                that._commandProvider = undefined;
                 that._followupProvider = undefined;
                 that._onDidReceiveFeedback.dispose();
                 that._proxy.$unregisterAgent(that._handle);

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

@@ -1,8 +1,8 @@
 import { onUnexpectedExternalError } from '../../../base/common/errors.js';
 import { toDisposable } from '../../../base/common/lifecycle.js';
 import { MainContext } from './extHost.protocol.js';
-import { ChatVariable, ChatResponseProgressPart, ChatResponseReferencePart, ChatResponsePart } from './extHostTypeConverters.js';
-import { ChatResponseProgressPart as ChatResponseProgressPart$1, ChatResponseReferencePart as ChatResponseReferencePart$1 } from './extHostTypes.js';
+import { ChatVariable, ChatResponseProgressPart, ChatResponseReferencePart } from './extHostTypeConverters.js';
+import { ChatResponseReferencePart as ChatResponseReferencePart$1, ChatResponseProgressPart as ChatResponseProgressPart$1 } from './extHostTypes.js';
 import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 class ExtHostChatVariables {
     static { this._idPool = 0; }
@@ -85,8 +85,12 @@ class ChatVariableResolverResponseStream {
                 },
                 push(part) {
                     throwIfDone(this.push);
-                    const dto = ChatResponsePart.to(part);
-                    _report(dto);
+                    if (part instanceof ChatResponseReferencePart$1) {
+                        _report(ChatResponseReferencePart.to(part));
+                    }
+                    else if (part instanceof ChatResponseProgressPart$1) {
+                        _report(ChatResponseProgressPart.to(part));
+                    }
                     return this;
                 }
             };

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

@@ -2,10 +2,10 @@ import { asPromise } from '../../../base/common/async.js';
 import { Emitter } from '../../../base/common/event.js';
 import { MutableDisposable, DisposableStore } from '../../../base/common/lifecycle.js';
 import { URI } from '../../../base/common/uri.js';
-import { CommentThreadCollapsibleState, CommentThreadState as CommentThreadState$1 } from '../../../editor/common/languages.js';
+import { CommentThreadCollapsibleState, CommentThreadState as CommentThreadState$1, CommentThreadApplicability as CommentThreadApplicability$1 } from '../../../editor/common/languages.js';
 import { ExtensionIdentifierMap } from '../../../platform/extensions/common/extensions.js';
 import { Range, MarkdownString as MarkdownString$1, pathOrURIToURI } from './extHostTypeConverters.js';
-import { MarkdownString, CommentThreadCollapsibleState as CommentThreadCollapsibleState$1, CommentThreadState } from './extHostTypes.js';
+import { MarkdownString, CommentThreadCollapsibleState as CommentThreadCollapsibleState$1, CommentThreadState, CommentThreadApplicability } from './extHostTypes.js';
 import { MainContext } from './extHost.protocol.js';
 import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 function createExtHostComments(mainContext, commands, documents) {
@@ -25,13 +25,14 @@ function createExtHostComments(mainContext, commands, documents) {
                         return commentController.value;
                     }
                     else if (arg && arg.$mid === 7 ) {
-                        const commentController = this._commentControllers.get(arg.commentControlHandle);
+                        const marshalledCommentThread = arg;
+                        const commentController = this._commentControllers.get(marshalledCommentThread.commentControlHandle);
                         if (!commentController) {
-                            return arg;
+                            return marshalledCommentThread;
                         }
-                        const commentThread = commentController.getCommentThread(arg.commentThreadHandle);
+                        const commentThread = commentController.getCommentThread(marshalledCommentThread.commentThreadHandle);
                         if (!commentThread) {
-                            return arg;
+                            return marshalledCommentThread;
                         }
                         return commentThread.value;
                     }
@@ -129,14 +130,14 @@ function createExtHostComments(mainContext, commands, documents) {
             const commentController = this._commentControllers.get(commentControllerHandle);
             commentController?.$deleteCommentThread(commentThreadHandle);
         }
-        $provideCommentingRanges(commentControllerHandle, uriComponents, token) {
+        async $provideCommentingRanges(commentControllerHandle, uriComponents, token) {
             const commentController = this._commentControllers.get(commentControllerHandle);
             if (!commentController || !commentController.commentingRangeProvider) {
                 return Promise.resolve(undefined);
             }
-            const document = documents.getDocument(URI.revive(uriComponents));
+            const document = await documents.ensureDocumentData(URI.revive(uriComponents));
             return asPromise(async () => {
-                const rangesResult = await commentController.commentingRangeProvider.provideCommentingRanges(document, token);
+                const rangesResult = await commentController.commentingRangeProvider.provideCommentingRanges(document.document, token);
                 let ranges;
                 if (Array.isArray(rangesResult)) {
                     ranges = {
@@ -258,7 +259,14 @@ function createExtHostComments(mainContext, commands, documents) {
         }
         set state(newState) {
             this._state = newState;
-            this.modifications.state = newState;
+            if (typeof newState === 'object') {
+                checkProposedApiEnabled(this.extensionDescription, 'commentThreadApplicability');
+                this.modifications.state = newState.resolved;
+                this.modifications.applicability = newState.applicability;
+            }
+            else {
+                this.modifications.state = newState;
+            }
             this._onDidUpdateCommentThread.fire();
         }
         get isDisposed() {
@@ -358,6 +366,9 @@ function createExtHostComments(mainContext, commands, documents) {
             if (modified('state')) {
                 formattedModifications.state = convertToState(this._state);
             }
+            if (modified('applicability')) {
+                formattedModifications.applicability = convertToRelevance(this._state);
+            }
             if (modified('isTemplate')) {
                 formattedModifications.isTemplate = this._isTemplate;
             }
@@ -395,7 +406,10 @@ function createExtHostComments(mainContext, commands, documents) {
         }
         set commentingRangeProvider(provider) {
             this._commentingRangeProvider = provider;
-            proxy.$updateCommentingRanges(this.handle);
+            if (provider?.resourceHints) {
+                checkProposedApiEnabled(this._extension, 'commentingRangeHint');
+            }
+            proxy.$updateCommentingRanges(this.handle, provider?.resourceHints);
         }
         get reactionHandler() {
             return this._reactionHandler;
@@ -569,8 +583,15 @@ function createExtHostComments(mainContext, commands, documents) {
         return CommentThreadCollapsibleState.Collapsed;
     }
     function convertToState(kind) {
-        if (kind !== undefined) {
-            switch (kind) {
+        let resolvedKind;
+        if (typeof kind === 'object') {
+            resolvedKind = kind.resolved;
+        }
+        else {
+            resolvedKind = kind;
+        }
+        if (resolvedKind !== undefined) {
+            switch (resolvedKind) {
                 case CommentThreadState.Unresolved:
                     return CommentThreadState$1.Unresolved;
                 case CommentThreadState.Resolved:
@@ -579,6 +600,21 @@ function createExtHostComments(mainContext, commands, documents) {
         }
         return CommentThreadState$1.Unresolved;
     }
+    function convertToRelevance(kind) {
+        let applicabilityKind = undefined;
+        if (typeof kind === 'object') {
+            applicabilityKind = kind.applicability;
+        }
+        if (applicabilityKind !== undefined) {
+            switch (applicabilityKind) {
+                case CommentThreadApplicability.Current:
+                    return CommentThreadApplicability$1.Current;
+                case CommentThreadApplicability.Outdated:
+                    return CommentThreadApplicability$1.Outdated;
+            }
+        }
+        return CommentThreadApplicability$1.Current;
+    }
     return ( new ExtHostCommentsImpl());
 }
 export { createExtHostComments };

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

@@ -8,7 +8,7 @@ import { MainContext } from './extHost.protocol.js';
 import { IExtHostEditorTabs } from './extHostEditorTabs.js';
 import { IExtHostExtensionService } from './extHostExtensionService.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
-import { SourceBreakpoint, DebugConsoleMode, Disposable, setBreakpointId, FunctionBreakpoint, Location, Position, DebugAdapterExecutable, DebugAdapterServer, DebugAdapterNamedPipeServer, DebugAdapterInlineImplementation, ThemeIcon as ThemeIcon$1, DataBreakpoint, ThreadFocus, StackFrameFocus } from './extHostTypes.js';
+import { SourceBreakpoint, DebugConsoleMode, Disposable, setBreakpointId, FunctionBreakpoint, Location, Position, DebugAdapterExecutable, DebugAdapterServer, DebugAdapterNamedPipeServer, DebugAdapterInlineImplementation, ThemeIcon as ThemeIcon$1, DataBreakpoint, Thread, StackFrame } from './extHostTypes.js';
 import { IExtHostWorkspace } from './extHostWorkspace.js';
 import { AbstractDebugAdapter } from '../../contrib/debug/common/abstractDebugAdapter.js';
 import { convertToVSCPaths, convertToDAPaths, isDebuggerMainContribution } from '../../contrib/debug/common/debugUtils.js';
@@ -55,7 +55,7 @@ let ExtHostDebugServiceBase = class ExtHostDebugServiceBase {
         this._onDidReceiveDebugSessionCustomEvent = ( new Emitter());
         this._debugServiceProxy = ( extHostRpcService.getProxy(MainContext.MainThreadDebugService));
         this._onDidChangeBreakpoints = ( new Emitter());
-        this._onDidChangeStackFrameFocus = ( new Emitter());
+        this._onDidChangeActiveStackItem = ( new Emitter());
         this._activeDebugConsole = ( new ExtHostDebugConsole(this._debugServiceProxy));
         this._breakpoints = ( new Map());
         this._extensionService.getExtensionRegistry().then((extensionRegistry) => {
@@ -161,11 +161,11 @@ let ExtHostDebugServiceBase = class ExtHostDebugServiceBase {
         }
         this._debugServiceProxy.$registerDebugTypes(debugTypes);
     }
-    get stackFrameFocus() {
-        return this._stackFrameFocus;
+    get activeStackItem() {
+        return this._activeStackItem;
     }
-    get onDidChangeStackFrameFocus() {
-        return this._onDidChangeStackFrameFocus.event;
+    get onDidChangeActiveStackItem() {
+        return this._onDidChangeActiveStackItem.event;
     }
     get onDidChangeBreakpoints() {
         return this._onDidChangeBreakpoints.event;
@@ -577,18 +577,17 @@ let ExtHostDebugServiceBase = class ExtHostDebugServiceBase {
     }
     async $acceptStackFrameFocus(focusDto) {
         let focus;
-        const session = focusDto.sessionId ? await this.getSession(focusDto.sessionId) : undefined;
-        if (!session) {
-            throw new Error('no DebugSession found for debug focus context');
-        }
-        if (focusDto.kind === 'thread') {
-            focus = ( new ThreadFocus(session.api, focusDto.threadId));
-        }
-        else {
-            focus = ( new StackFrameFocus(session.api, focusDto.threadId, focusDto.frameId));
+        if (focusDto) {
+            const session = await this.getSession(focusDto.sessionId);
+            if (focusDto.kind === 'thread') {
+                focus = ( new Thread(session.api, focusDto.threadId));
+            }
+            else {
+                focus = ( new StackFrame(session.api, focusDto.threadId, focusDto.frameId));
+            }
         }
-        this._stackFrameFocus = focus;
-        this._onDidChangeStackFrameFocus.fire(this._stackFrameFocus);
+        this._activeStackItem = focus;
+        this._onDidChangeActiveStackItem.fire(this._activeStackItem);
     }
     $provideDebugConfigurations(configProviderHandle, folderUri, token) {
         return asPromise(async () => {

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

@@ -7,7 +7,7 @@ import { createDecorator } from '../../../platform/instantiation/common/instanti
 import { MainContext } from './extHost.protocol.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
 import { ViewColumn } from './extHostTypeConverters.js';
-import { ChatEditorTabInput, InteractiveWindowInput, TerminalEditorTabInput, NotebookDiffEditorTabInput, NotebookEditorTabInput, WebviewEditorTabInput, CustomEditorTabInput, TextMergeTabInput, TextDiffTabInput, TextTabInput } from './extHostTypes.js';
+import { TextMultiDiffTabInput, TextDiffTabInput, ChatEditorTabInput, InteractiveWindowInput, TerminalEditorTabInput, NotebookDiffEditorTabInput, NotebookEditorTabInput, WebviewEditorTabInput, CustomEditorTabInput, TextMergeTabInput, TextTabInput } from './extHostTypes.js';
 const IExtHostEditorTabs = ( createDecorator('IExtHostEditorTabs'));
 class ExtHostEditorTab {
     constructor(dto, parentGroup, activeTabIdGetter) {
@@ -83,6 +83,8 @@ class ExtHostEditorTab {
                 return ( new InteractiveWindowInput(URI.revive(this._dto.input.uri), URI.revive(this._dto.input.inputBoxUri)));
             case 10 :
                 return ( new ChatEditorTabInput(this._dto.input.providerId));
+            case 11 :
+                return ( new TextMultiDiffTabInput(( this._dto.input.diffEditors.map(diff => ( new TextDiffTabInput(URI.revive(diff.original), URI.revive(diff.modified)))))));
             default:
                 return undefined;
         }

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

@@ -128,7 +128,7 @@ let ExtensionsActivator = class ExtensionsActivator {
     activateById(extensionId, reason) {
         const desc = this._registry.getExtensionDescription(extensionId);
         if (!desc) {
-            throw new Error(`Extension '${extensionId}' is not known`);
+            throw new Error(`Extension '${extensionId.value}' is not known`);
         }
         return this._activateExtensions([{ id: desc.identifier, reason }]);
     }

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

@@ -28,6 +28,7 @@ import { IExtHostRpcService } from './extHostRpcService.js';
 import { ServiceCollection } from '../../../platform/instantiation/common/serviceCollection.js';
 import { IExtHostTunnelService } from './extHostTunnelService.js';
 import { IExtHostTerminalService } from './extHostTerminalService.js';
+import { IExtHostLanguageModels } from './extHostLanguageModels.js';
 import { Emitter, Event } from '../../../base/common/event.js';
 import { checkActivateWorkspaceContainsExtension } from '../../services/extensions/common/workspaceContains.js';
 import { ExtHostSecretState, IExtHostSecretState } from './extHostSecretState.js';
@@ -40,11 +41,13 @@ import { IExtHostManagedSockets } from './extHostManagedSockets.js';
 var AbstractExtHostExtensionService_1;
 const IHostUtils = ( createDecorator('IHostUtils'));
 let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class AbstractExtHostExtensionService extends Disposable {
-    constructor(instaService, hostUtils, extHostContext, extHostWorkspace, extHostConfiguration, logService, initData, storagePath, extHostTunnelService, extHostTerminalService, extHostLocalizationService, _extHostManagedSockets) {
+    constructor(instaService, hostUtils, extHostContext, extHostWorkspace, extHostConfiguration, logService, initData, storagePath, extHostTunnelService, extHostTerminalService, extHostLocalizationService, _extHostManagedSockets, _extHostLanguageModels) {
         super();
         this._extHostManagedSockets = _extHostManagedSockets;
+        this._extHostLanguageModels = _extHostLanguageModels;
         this._onDidChangeRemoteConnectionData = this._register(( new Emitter()));
         this.onDidChangeRemoteConnectionData = this._onDidChangeRemoteConnectionData.event;
+        this._realPathCache = ( new Map());
         this._isTerminating = false;
         this._hostUtils = hostUtils;
         this._extHostContext = extHostContext;
@@ -203,7 +206,11 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
     }
     async _realPathExtensionUri(uri) {
         if (uri.scheme === Schemas.file && this._hostUtils.fsRealpath) {
-            const realpathValue = await this._hostUtils.fsRealpath(uri.fsPath);
+            const fsPath = uri.fsPath;
+            if (!( this._realPathCache.has(fsPath))) {
+                this._realPathCache.set(fsPath, this._hostUtils.fsRealpath(fsPath));
+            }
+            const realpathValue = await this._realPathCache.get(fsPath);
             return URI.file(realpathValue);
         }
         return uri;
@@ -308,6 +315,7 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
         });
     }
     _loadExtensionContext(extensionDescription) {
+        const lanuageModelAccessInformation = this._extHostLanguageModels.createLanguageModelAccessInformation(extensionDescription);
         const globalState = ( new ExtensionGlobalMemento(extensionDescription, this._storage));
         const workspaceState = ( new ExtensionMemento(extensionDescription.identifier.value, false, this._storage));
         const secrets = ( new ExtensionSecrets(extensionDescription, this._secretState));
@@ -332,6 +340,7 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
                 workspaceState,
                 secrets,
                 subscriptions: [],
+                get languageModelAccessInformation() { return lanuageModelAccessInformation; },
                 get extensionUri() { return extensionDescription.extensionLocation; },
                 get extensionPath() { return extensionDescription.extensionLocation.fsPath; },
                 asAbsolutePath(relativePath) { return join(extensionDescription.extensionLocation.fsPath, relativePath); },
@@ -735,9 +744,12 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
         }
         return result;
     }
-    $startExtensionHost(extensionsDelta) {
+    async $startExtensionHost(extensionsDelta) {
         extensionsDelta.toAdd.forEach((extension) => extension.extensionLocation = URI.revive(extension.extensionLocation));
         const { globalRegistry, myExtensions } = applyExtensionsDelta(this._activationEventsReader, this._globalRegistry, this._myRegistry, extensionsDelta);
+        const newSearchTree = await this._createExtensionPathIndex(myExtensions);
+        const extensionsPaths = await this.getExtensionPathIndex();
+        extensionsPaths.setSearchTree(newSearchTree);
         this._globalRegistry.set(globalRegistry.getAllExtensionDescriptions());
         this._myRegistry.set(myExtensions);
         if (isCI) {
@@ -807,7 +819,8 @@ AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = ( __decora
     ( __param(8, IExtHostTunnelService)),
     ( __param(9, IExtHostTerminalService)),
     ( __param(10, IExtHostLocalizationService)),
-    ( __param(11, IExtHostManagedSockets))
+    ( __param(11, IExtHostManagedSockets)),
+    ( __param(12, IExtHostLanguageModels))
 ], AbstractExtHostExtensionService));
 function applyExtensionsDelta(activationEventsReader, oldGlobalRegistry, oldMyRegistry, extensionsDelta) {
     activationEventsReader.addActivationEvents(extensionsDelta.addActivationEvents);

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

@@ -49,7 +49,7 @@ class ExtHostInteractiveEditor {
     registerProvider(extension, provider, metadata) {
         const wrapper = ( new ProviderWrapper(extension, provider));
         this._inputProvider.set(wrapper.handle, wrapper);
-        this._proxy.$registerInteractiveEditorProvider(wrapper.handle, metadata?.label ?? extension.displayName ?? extension.name, extension.identifier.value, typeof provider.handleInteractiveEditorResponseFeedback === 'function', typeof provider.provideFollowups === 'function', metadata?.supportReportIssue ?? false);
+        this._proxy.$registerInteractiveEditorProvider(wrapper.handle, metadata?.label ?? extension.displayName ?? extension.name, extension.identifier, typeof provider.handleInteractiveEditorResponseFeedback === 'function', typeof provider.provideFollowups === 'function', metadata?.supportReportIssue ?? false);
         return toDisposable(() => {
             this._proxy.$unregisterInteractiveEditorProvider(wrapper.handle);
             this._inputProvider.delete(wrapper.handle);