Skip to content

Sort @workspace /explain above @terminal /explain #213482

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

Merged
roblourens merged 1 commit into from
May 26, 2024
Merged

Sort @workspace /explain above @terminal /explain #213482

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
16 changes: 13 additions & 3 deletions src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,16 @@ class AgentCompletions extends Disposable {
const agents = this.chatAgentService.getAgents()
.filter(a => a.locations.includes(widget.location));

// When the input is only `/`, items are sorted by sortText.
// When typing, filterText is used to score and sort.
// The same list is refiltered/ranked while typing.
const getFilterText = (agent: IChatAgentData, command: string) => {
// This is hacking the filter algorithm to make @terminal /explain match worse than @workspace /explain by making its match index later in the string.
// When I type `/exp`, the workspace one should be sorted over the terminal one.
const dummyPrefix = agent.id === 'github.copilot.terminal' ? `0000` : ``;
return `${chatSubcommandLeader}${dummyPrefix}${agent.name}.${command}`;
};

const justAgents: CompletionItem[] = agents
.filter(a => !a.isDefault)
.map(agent => {
Expand All @@ -218,7 +228,7 @@ class AgentCompletions extends Disposable {
insertText: `${agentLabel} `,
range: new Range(1, 1, 1, 1),
kind: CompletionItemKind.Text,
sortText: `${chatSubcommandLeader}${agent.id}`,
sortText: `${chatSubcommandLeader}${agent.name}`,
command: { id: AssignSelectedAgentAction.ID, title: AssignSelectedAgentAction.ID, arguments: [{ agent, widget } satisfies AssignSelectedAgentActionArgs] },
};
});
Expand All @@ -230,13 +240,13 @@ class AgentCompletions extends Disposable {
const withSlash = `${chatSubcommandLeader}${c.name}`;
return {
label: { label: withSlash, description: agentLabel, detail: isDupe ? ` (${agent.publisherDisplayName})` : undefined },
filterText: `${chatSubcommandLeader}${agent.name}${c.name}`,
filterText: getFilterText(agent, c.name),
commitCharacters: [' '],
insertText: `${agentLabel} ${withSlash} `,
detail: `(${agentLabel}) ${c.description ?? ''}`,
range: new Range(1, 1, 1, 1),
kind: CompletionItemKind.Text, // The icons are disabled here anyway
sortText: `${chatSubcommandLeader}${agent.id}${c.name}`,
sortText: `${chatSubcommandLeader}${agent.name}${c.name}`,
command: { id: AssignSelectedAgentAction.ID, title: AssignSelectedAgentAction.ID, arguments: [{ agent, widget } satisfies AssignSelectedAgentActionArgs] },
} satisfies CompletionItem;
})))
Expand Down