Add PR icons and support display name

Author: Tyriar

extensions/terminal-suggest/src/completions/gh.ts

@@ -5,6 +5,7 @@
 
 /* eslint-disable local/code-no-unexternalized-strings */
 
+import * as vscode from 'vscode';
 import { filepaths } from '../helpers/filepaths';
 import { keyValue } from '../helpers/keyvalue';
 
@@ -49,7 +50,7 @@ const postProcessRemoteBranches: Fig.Generator["postProcess"] = (out) => {
 		return {
 			name,
 			description: "Branch",
-			icon: "vscode://icon?type=11",
+			icon: `vscode://icon?type=${vscode.TerminalCompletionItemKind.Branch}`,
 			priority: 75,
 		};
 	});
@@ -189,8 +190,7 @@ const ghGenerators: Record<string, Fig.Generator> = {
 					name: number.toString(),
 					displayName: title,
 					description: `#${number} | ${headRefName}`,
-					// allow-any-unicode-next-line
-					icon: state === "OPEN" ? "✅" : "☑️",
+					icon: `vscode://icon?type=${state === "OPEN" ? vscode.TerminalCompletionItemKind.PullRequest : vscode.TerminalCompletionItemKind.PullRequestDone}`,
 				};
 			});
 		},

extensions/terminal-suggest/src/fig/figInterface.ts

@@ -242,7 +242,7 @@ export async function collectCompletionItemResult(
 							terminalContext.cursorPosition,
 							prefix,
 							{ label },
-							undefined,
+							item.displayName,
 							typeof item === 'string' ? item : item.description,
 							convertIconToKind(item.icon) ?? kind
 						));
@@ -377,6 +377,8 @@ function convertIconToKind(icon: string | undefined): vscode.TerminalCompletionI
 		case 'vscode://icon?type=12': return vscode.TerminalCompletionItemKind.Tag;
 		case 'vscode://icon?type=13': return vscode.TerminalCompletionItemKind.Stash;
 		case 'vscode://icon?type=14': return vscode.TerminalCompletionItemKind.Remote;
+		case 'vscode://icon?type=15': return vscode.TerminalCompletionItemKind.PullRequest;
+		case 'vscode://icon?type=16': return vscode.TerminalCompletionItemKind.PullRequestDone;
 		default: return undefined;
 	}
 }

src/vs/workbench/api/common/extHostTypes.ts

@@ -2166,6 +2166,8 @@ export enum TerminalCompletionItemKind {
 	Tag = 12,
 	Stash = 13,
 	Remote = 14,
+	PullRequest = 15,
+	PullRequestDone = 16,
 }
 
 export class TerminalCompletionItem implements vscode.TerminalCompletionItem {

src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionItem.ts

@@ -26,6 +26,8 @@ export enum TerminalCompletionItemKind {
 	Tag = 12,
 	Stash = 13,
 	Remote = 14,
+	PullRequest = 15,
+	PullRequestDone = 16,
 
 	// Core-only kinds
 	InlineSuggestion = 100,

src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts

@@ -34,7 +34,7 @@ import { TerminalCompletionModel } from './terminalCompletionModel.js';
 import { TerminalCompletionItem, TerminalCompletionItemKind, type ITerminalCompletion } from './terminalCompletionItem.js';
 import { localize } from '../../../../../nls.js';
 import { TerminalSuggestTelemetry } from './terminalSuggestTelemetry.js';
-import { terminalSymbolAliasIcon, terminalSymbolArgumentIcon, terminalSymbolEnumMember, terminalSymbolFileIcon, terminalSymbolFlagIcon, terminalSymbolInlineSuggestionIcon, terminalSymbolMethodIcon, terminalSymbolOptionIcon, terminalSymbolFolderIcon, terminalSymbolSymbolicLinkFileIcon, terminalSymbolSymbolicLinkFolderIcon, terminalSymbolCommitIcon, terminalSymbolBranchIcon, terminalSymbolTagIcon, terminalSymbolStashIcon, terminalSymbolRemoteIcon } from './terminalSymbolIcons.js';
+import { terminalSymbolAliasIcon, terminalSymbolArgumentIcon, terminalSymbolEnumMember, terminalSymbolFileIcon, terminalSymbolFlagIcon, terminalSymbolInlineSuggestionIcon, terminalSymbolMethodIcon, terminalSymbolOptionIcon, terminalSymbolFolderIcon, terminalSymbolSymbolicLinkFileIcon, terminalSymbolSymbolicLinkFolderIcon, terminalSymbolCommitIcon, terminalSymbolBranchIcon, terminalSymbolTagIcon, terminalSymbolStashIcon, terminalSymbolRemoteIcon, terminalSymbolPullRequestIcon, terminalSymbolPullRequestDoneIcon } from './terminalSymbolIcons.js';
 import { TerminalSuggestShownTracker } from './terminalSuggestShownTracker.js';
 
 export interface ISuggestController {
@@ -123,6 +123,8 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		[TerminalCompletionItemKind.Tag, terminalSymbolTagIcon],
 		[TerminalCompletionItemKind.Stash, terminalSymbolStashIcon],
 		[TerminalCompletionItemKind.Remote, terminalSymbolRemoteIcon],
+		[TerminalCompletionItemKind.PullRequest, terminalSymbolPullRequestIcon],
+		[TerminalCompletionItemKind.PullRequestDone, terminalSymbolPullRequestDoneIcon],
 		[TerminalCompletionItemKind.InlineSuggestion, terminalSymbolInlineSuggestionIcon],
 		[TerminalCompletionItemKind.InlineSuggestionAlwaysOnTop, terminalSymbolInlineSuggestionIcon],
 	]);
@@ -143,6 +145,8 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		[TerminalCompletionItemKind.Tag, localize('tag', 'Tag')],
 		[TerminalCompletionItemKind.Stash, localize('stash', 'Stash')],
 		[TerminalCompletionItemKind.Remote, localize('remote', 'Remote')],
+		[TerminalCompletionItemKind.PullRequest, localize('pullRequest', 'Pull Request')],
+		[TerminalCompletionItemKind.PullRequestDone, localize('pullRequestDone', 'Pull Request (Done)')],
 		[TerminalCompletionItemKind.InlineSuggestion, localize('inlineSuggestion', 'Inline Suggestion')],
 		[TerminalCompletionItemKind.InlineSuggestionAlwaysOnTop, localize('inlineSuggestionAlwaysOnTop', 'Inline Suggestion')],
 	]);

src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSymbolIcons.ts

@@ -25,6 +25,8 @@ export const TERMINAL_SYMBOL_ICON_BRANCH_FOREGROUND = registerColor('terminalSym
 export const TERMINAL_SYMBOL_ICON_TAG_FOREGROUND = registerColor('terminalSymbolIcon.tagForeground', SYMBOL_ICON_FILE_FOREGROUND, localize('terminalSymbolIcon.tagForeground', 'The foreground color for a tag icon. These icons will appear in the terminal suggest widget.'));
 export const TERMINAL_SYMBOL_ICON_STASH_FOREGROUND = registerColor('terminalSymbolIcon.stashForeground', SYMBOL_ICON_FILE_FOREGROUND, localize('terminalSymbolIcon.stashForeground', 'The foreground color for a stash icon. These icons will appear in the terminal suggest widget.'));
 export const TERMINAL_SYMBOL_ICON_REMOTE_FOREGROUND = registerColor('terminalSymbolIcon.remoteForeground', SYMBOL_ICON_FILE_FOREGROUND, localize('terminalSymbolIcon.remoteForeground', 'The foreground color for a remote icon. These icons will appear in the terminal suggest widget.'));
+export const TERMINAL_SYMBOL_ICON_PULL_REQUEST_FOREGROUND = registerColor('terminalSymbolIcon.pullRequestForeground', SYMBOL_ICON_FILE_FOREGROUND, localize('terminalSymbolIcon.pullRequestForeground', 'The foreground color for a pull request icon. These icons will appear in the terminal suggest widget.'));
+export const TERMINAL_SYMBOL_ICON_PULL_REQUEST_DONE_FOREGROUND = registerColor('terminalSymbolIcon.pullRequestDoneForeground', SYMBOL_ICON_FILE_FOREGROUND, localize('terminalSymbolIcon.pullRequestDoneForeground', 'The foreground color for a completed pull request icon. These icons will appear in the terminal suggest widget.'));
 
 export const TERMINAL_SYMBOL_ICON_SYMBOLIC_LINK_FILE_FOREGROUND = registerColor('terminalSymbolIcon.symbolicLinkFileForeground', SYMBOL_ICON_FILE_FOREGROUND, localize('terminalSymbolIcon.symbolicLinkFileForeground', 'The foreground color for a symbolic link file icon. These icons will appear in the terminal suggest widget.'));
 export const TERMINAL_SYMBOL_ICON_SYMBOLIC_LINK_FOLDER_FOREGROUND = registerColor('terminalSymbolIcon.symbolicLinkFolderForeground', SYMBOL_ICON_FOLDER_FOREGROUND, localize('terminalSymbolIcon.symbolicLinkFolderForeground', 'The foreground color for a symbolic link folder icon. These icons will appear in the terminal suggest widget.'));
@@ -44,6 +46,8 @@ export const terminalSymbolBranchIcon = registerIcon('terminal-symbol-branch', C
 export const terminalSymbolTagIcon = registerIcon('terminal-symbol-tag', Codicon.tag, localize('terminalSymbolTagIcon', 'Icon for tags in the terminal suggest widget.'), TERMINAL_SYMBOL_ICON_TAG_FOREGROUND);
 export const terminalSymbolStashIcon = registerIcon('terminal-symbol-stash', Codicon.gitStash, localize('terminalSymbolStashIcon', 'Icon for stashes in the terminal suggest widget.'), TERMINAL_SYMBOL_ICON_STASH_FOREGROUND);
 export const terminalSymbolRemoteIcon = registerIcon('terminal-symbol-remote', Codicon.remote, localize('terminalSymbolRemoteIcon', 'Icon for remotes in the terminal suggest widget.'), TERMINAL_SYMBOL_ICON_REMOTE_FOREGROUND);
+export const terminalSymbolPullRequestIcon = registerIcon('terminal-symbol-pull-request', Codicon.gitPullRequest, localize('terminalSymbolPullRequestIcon', 'Icon for pull requests in the terminal suggest widget.'), TERMINAL_SYMBOL_ICON_PULL_REQUEST_FOREGROUND);
+export const terminalSymbolPullRequestDoneIcon = registerIcon('terminal-symbol-pull-request-done', Codicon.gitPullRequestDone, localize('terminalSymbolPullRequestDoneIcon', 'Icon for completed pull requests in the terminal suggest widget.'), TERMINAL_SYMBOL_ICON_PULL_REQUEST_DONE_FOREGROUND);
 
 export const terminalSymbolSymbolicLinkFileIcon = registerIcon('terminal-symbol-symbolic-link-file', Codicon.fileSymlinkFile, localize('terminalSymbolSymbolicLinkFileIcon', 'Icon for symbolic link files in the terminal suggest widget.'), TERMINAL_SYMBOL_ICON_SYMBOLIC_LINK_FILE_FOREGROUND);
 export const terminalSymbolSymbolicLinkFolderIcon = registerIcon('terminal-symbol-symbolic-link-folder', Codicon.fileSymlinkDirectory, localize('terminalSymbolSymbolicLinkFolderIcon', 'Icon for symbolic link folders in the terminal suggest widget.'), TERMINAL_SYMBOL_ICON_SYMBOLIC_LINK_FOLDER_FOREGROUND);

src/vscode-dts/vscode.proposed.terminalCompletionProvider.d.ts

@@ -73,6 +73,8 @@ declare module 'vscode' {
 		Tag = 12,
 		Stash = 13,
 		Remote = 14,
+		PullRequest = 15,
+		PullRequestDone = 16,
 	}
 
 	export interface TerminalCompletionContext {