fixup ChatRequestNotebookData (#219331)

re https://github.com/microsoft/vscode/issues/218363
This commit is contained in:
Johannes Rieken
2024-07-01 10:29:54 +02:00
committed by GitHub
parent d3035ba351
commit ea03089bee
4 changed files with 9 additions and 11 deletions
@@ -210,7 +210,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
const extHostUriOpeners = rpcProtocol.set(ExtHostContext.ExtHostUriOpeners, new ExtHostUriOpeners(rpcProtocol)); const extHostUriOpeners = rpcProtocol.set(ExtHostContext.ExtHostUriOpeners, new ExtHostUriOpeners(rpcProtocol));
const extHostProfileContentHandlers = rpcProtocol.set(ExtHostContext.ExtHostProfileContentHandlers, new ExtHostProfileContentHandlers(rpcProtocol)); const extHostProfileContentHandlers = rpcProtocol.set(ExtHostContext.ExtHostProfileContentHandlers, new ExtHostProfileContentHandlers(rpcProtocol));
rpcProtocol.set(ExtHostContext.ExtHostInteractive, new ExtHostInteractive(rpcProtocol, extHostNotebook, extHostDocumentsAndEditors, extHostCommands, extHostLogService)); rpcProtocol.set(ExtHostContext.ExtHostInteractive, new ExtHostInteractive(rpcProtocol, extHostNotebook, extHostDocumentsAndEditors, extHostCommands, extHostLogService));
const extHostChatAgents2 = rpcProtocol.set(ExtHostContext.ExtHostChatAgents2, new ExtHostChatAgents2(rpcProtocol, extHostLogService, extHostCommands, extHostDocuments, extHostNotebook)); const extHostChatAgents2 = rpcProtocol.set(ExtHostContext.ExtHostChatAgents2, new ExtHostChatAgents2(rpcProtocol, extHostLogService, extHostCommands, extHostDocuments));
const extHostChatVariables = rpcProtocol.set(ExtHostContext.ExtHostChatVariables, new ExtHostChatVariables(rpcProtocol)); const extHostChatVariables = rpcProtocol.set(ExtHostContext.ExtHostChatVariables, new ExtHostChatVariables(rpcProtocol));
const extHostLanguageModelTools = rpcProtocol.set(ExtHostContext.ExtHostLanguageModelTools, new ExtHostLanguageModelTools(rpcProtocol)); const extHostLanguageModelTools = rpcProtocol.set(ExtHostContext.ExtHostLanguageModelTools, new ExtHostLanguageModelTools(rpcProtocol));
const extHostAiRelatedInformation = rpcProtocol.set(ExtHostContext.ExtHostAiRelatedInformation, new ExtHostRelatedInformation(rpcProtocol)); const extHostAiRelatedInformation = rpcProtocol.set(ExtHostContext.ExtHostAiRelatedInformation, new ExtHostRelatedInformation(rpcProtocol));
@@ -21,7 +21,6 @@ import { ILogService } from 'vs/platform/log/common/log';
import { ExtHostChatAgentsShape2, IChatAgentCompletionItem, IChatAgentHistoryEntryDto, IChatProgressDto, IExtensionChatAgentMetadata, IMainContext, MainContext, MainThreadChatAgentsShape2 } from 'vs/workbench/api/common/extHost.protocol'; import { ExtHostChatAgentsShape2, IChatAgentCompletionItem, IChatAgentHistoryEntryDto, IChatProgressDto, IExtensionChatAgentMetadata, IMainContext, MainContext, MainThreadChatAgentsShape2 } from 'vs/workbench/api/common/extHost.protocol';
import { CommandsConverter, ExtHostCommands } from 'vs/workbench/api/common/extHostCommands'; import { CommandsConverter, ExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
import { ExtHostDocuments } from 'vs/workbench/api/common/extHostDocuments'; import { ExtHostDocuments } from 'vs/workbench/api/common/extHostDocuments';
import { ExtHostNotebookController } from 'vs/workbench/api/common/extHostNotebook';
import * as typeConvert from 'vs/workbench/api/common/extHostTypeConverters'; import * as typeConvert from 'vs/workbench/api/common/extHostTypeConverters';
import * as extHostTypes from 'vs/workbench/api/common/extHostTypes'; import * as extHostTypes from 'vs/workbench/api/common/extHostTypes';
import { ChatAgentLocation, IChatAgentRequest, IChatAgentResult } from 'vs/workbench/contrib/chat/common/chatAgents'; import { ChatAgentLocation, IChatAgentRequest, IChatAgentResult } from 'vs/workbench/contrib/chat/common/chatAgents';
@@ -266,8 +265,7 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
mainContext: IMainContext, mainContext: IMainContext,
private readonly _logService: ILogService, private readonly _logService: ILogService,
private readonly _commands: ExtHostCommands, private readonly _commands: ExtHostCommands,
private readonly _documents: ExtHostDocuments, private readonly _documents: ExtHostDocuments
private readonly _notebooks: ExtHostNotebookController
) { ) {
super(); super();
this._proxy = mainContext.getProxy(MainContext.MainThreadChatAgents2); this._proxy = mainContext.getProxy(MainContext.MainThreadChatAgents2);
@@ -323,8 +321,8 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
} else if (request.locationData?.type === ChatAgentLocation.Notebook) { } else if (request.locationData?.type === ChatAgentLocation.Notebook) {
// notebook data // notebook data
const notebook = this._notebooks.getNotebookDocument(request.locationData.sessionInputUri); const cell = this._documents.getDocument(request.locationData.sessionInputUri);
location2 = new extHostTypes.ChatRequestNotebookData(notebook.apiNotebook); location2 = new extHostTypes.ChatRequestNotebookData(cell);
} else if (request.locationData?.type === ChatAgentLocation.Terminal) { } else if (request.locationData?.type === ChatAgentLocation.Terminal) {
// TBD // TBD
+3 -3
View File
@@ -4449,7 +4449,7 @@ export enum ChatLocation {
Editor = 4, Editor = 4,
} }
export class ChatRequestEditorData { export class ChatRequestEditorData implements vscode.ChatRequestEditorData {
constructor( constructor(
readonly document: vscode.TextDocument, readonly document: vscode.TextDocument,
readonly selection: vscode.Selection, readonly selection: vscode.Selection,
@@ -4457,9 +4457,9 @@ export class ChatRequestEditorData {
) { } ) { }
} }
export class ChatRequestNotebookData { export class ChatRequestNotebookData implements vscode.ChatRequestNotebookData {
constructor( constructor(
readonly notebook: vscode.NotebookDocument readonly cell: vscode.TextDocument
) { } ) { }
} }
+2 -2
View File
@@ -40,9 +40,9 @@ declare module 'vscode' {
export class ChatRequestNotebookData { export class ChatRequestNotebookData {
//TODO@API should be the editor //TODO@API should be the editor
notebook: NotebookDocument; readonly cell: TextDocument;
constructor(notebook: NotebookDocument); constructor(cell: TextDocument);
} }
export interface ChatRequest { export interface ChatRequest {