Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

make sure to rerender requests after attaching variable data #221482

Merged
merged 1 commit into from
Jul 11, 2024
Merged

make sure to rerender requests after attaching variable data #221482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion src/vs/workbench/contrib/chat/common/chatModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,13 +542,21 @@ export function isSerializableSessionData(obj: unknown): obj is ISerializableCha
);
}

export type IChatChangeEvent = IChatAddRequestEvent | IChatAddResponseEvent | IChatInitEvent | IChatRemoveRequestEvent;
export type IChatChangeEvent =
| IChatInitEvent
| IChatAddRequestEvent | IChatChangedRequestEvent | IChatRemoveRequestEvent
| IChatAddResponseEvent;

export interface IChatAddRequestEvent {
kind: 'addRequest';
request: IChatRequestModel;
}

export interface IChatChangedRequestEvent {
kind: 'changedRequest';
request: IChatRequestModel;
}

export interface IChatAddResponseEvent {
kind: 'addResponse';
response: IChatResponseModel;
Expand Down Expand Up @@ -832,6 +840,11 @@ export class ChatModel extends Disposable implements IChatModel {
return request;
}

updateRequest(request: ChatRequestModel, variableData: IChatRequestVariableData) {
request.variableData = variableData;
this._onDidChange.fire({ kind: 'changedRequest', request });
}

adoptRequest(request: ChatRequestModel): void {

// this doesn't use `removeRequest` because it must not dispose the request object
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ export class ChatService extends Disposable implements IChatService {
request = model.addRequest(parsedRequest, initVariableData, attempt, agent, agentSlashCommandPart?.command);
completeResponseCreated();
const variableData = await this.chatVariablesService.resolveVariables(parsedRequest, options?.attachedContext, model, progressCallback, token);
request.variableData = variableData;
model.updateRequest(request, variableData);

const promptTextResult = getPromptText(request.message);
const updatedVariableData = updateRanges(variableData, promptTextResult.diff); // TODO bit of a hack
Expand Down
3 changes: 2 additions & 1 deletion src/vs/workbench/contrib/chat/common/chatViewModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { IParsedChatRequest } from 'vs/workbench/contrib/chat/common/chatParserT
import { ChatAgentVoteDirection, IChatContentReference, IChatFollowup, IChatProgressMessage, IChatResponseErrorDetails, IChatTask, IChatUsedContext } from 'vs/workbench/contrib/chat/common/chatService';
import { countWords } from 'vs/workbench/contrib/chat/common/chatWordCounter';
import { CodeBlockModelCollection } from './codeBlockModelCollection';
import { hash } from 'vs/base/common/hash';

export function isRequestVM(item: unknown): item is IChatRequestViewModel {
return !!item && typeof item === 'object' && 'message' in item;
Expand Down Expand Up @@ -335,7 +336,7 @@ export class ChatRequestViewModel implements IChatRequestViewModel {
}

get dataId() {
return this.id + `_${ChatModelInitState[this._model.session.initState]}`;
return this.id + `_${ChatModelInitState[this._model.session.initState]}_${hash(this.variables)}`;
}

get sessionId() {
Expand Down
Loading