development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 13:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: prevent attaching the same chat context twice (#213266)

Browse source
This commit is contained in:
Joyce Er 2024-05-22 15:13:35 -07:00 committed by GitHub
parent 37e1242f15
commit 637b1f42e7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
View file

@ -38,28 +38,28 @@ export interface IFileQuickPickItem extends IQuickPickItem {
id: string;
name: string;
value: URI;
isDynamic: true;
resource: URI;
isDynamic: true;
}
export interface IDynamicVariableQuickPickItem extends IQuickPickItem {
id: string;
name?: string;
value: unknown;
icon?: ThemeIcon;
command?: Command;
isDynamic: true;
icon?: ThemeIcon;
command?: Command;
}
export interface IStaticVariableQuickPickItem extends IQuickPickItem {
id: string;
name: string;
value: unknown;
icon?: ThemeIcon;
isDynamic?: false;
icon?: ThemeIcon;
}
class AttachContextAction extends Action2 {
@ -92,6 +92,10 @@ class AttachContextAction extends Action2 {
});
}
private _getFileContextId(item: { resource: URI }) {
return item.resource.toString();
}
private async _attachContext(widget: IChatWidget, commandService: ICommandService, ...picks: IChatContextQuickPickItem[]) {
const toAttach: IChatRequestVariableEntry[] = [];
for (const pick of picks) {
@ -114,7 +118,7 @@ class AttachContextAction extends Action2 {
// #file variable
toAttach.push({
...pick,
id: pick.resource.toString(),
id: this._getFileContextId(pick),
value: pick.resource,
name: pick.label,
isDynamic: true
@ -195,10 +199,20 @@ class AttachContextAction extends Action2 {
},
additionPicks: quickPickItems,
includeSymbols: false,
filter: (item) => {
filter: (item: IChatContextQuickPickItem) => {
// Avoid attaching the same context twice
const attachedContext = widget.getContrib<ChatContextAttachments>(ChatContextAttachments.ID)?.getContext() ?? new Set();
if (item && typeof item === 'object' && 'resource' in item && URI.isUri(item.resource)) {
return [Schemas.file, Schemas.vscodeRemote].includes(item.resource.scheme);
return [Schemas.file, Schemas.vscodeRemote].includes(item.resource.scheme)
&& !attachedContext.has(this._getFileContextId({ resource: item.resource })); // Hack because Typescript doesn't narrow this type correctly
}
if (!('command' in item)) {
return !attachedContext.has(item.id);
}
// Don't filter out dynamic variables which show secondary data (temporary)
return true;
}
}

4
src/vs/workbench/contrib/chat/browser/contrib/chatContextAttachments.ts
View file

@ -42,6 +42,10 @@ export class ChatContextAttachments extends Disposable implements IChatWidgetCon
this.widget.setContext(true, ...s);
}
getContext() {
return new Set([...this._attachedContext.values()].map((v) => v.id));
}
setContext(overwrite: boolean, ...attachments: IChatRequestVariableEntry[]) {
if (overwrite) {
this._attachedContext.clear();