Don't show fig information for aliases

Fixes #239425

Author: Tyriar

extensions/terminal-suggest/src/shell/bash.ts

@@ -37,6 +37,7 @@ async function getAliases(options: ExecOptionsWithStringEncoding): Promise<IComp
 			label: match.groups.alias,
 			detail: match.groups.resolved,
 			kind: vscode.TerminalCompletionItemKind.Alias,
+			definition: match.groups.resolved.substring(0, match.groups.resolved.indexOf(' ')),
 		});
 	}
 	return result;

extensions/terminal-suggest/src/shell/fish.ts

@@ -27,7 +27,6 @@ async function getAliases(options: ExecOptionsWithStringEncoding): Promise<IComp
 	// session, for the same reason this would not include aliases that are created
 	// by simply running `alias ...` in the terminal.
 	const aliasOutput = await spawnHelper('fish', ['-ic', 'alias'], options);
-
 	const result: ICompletionResource[] = [];
 	for (const line of aliasOutput.split('\n')) {
 		const match = line.match(/^alias (?<alias>[a-zA-Z0-9\.:-]+) (?<resolved>.+)$/);
@@ -38,6 +37,7 @@ async function getAliases(options: ExecOptionsWithStringEncoding): Promise<IComp
 			label: match.groups.alias,
 			detail: match.groups.resolved,
 			kind: vscode.TerminalCompletionItemKind.Alias,
+			definition: match.groups.resolved.substring(0, match.groups.resolved.indexOf(' ')),
 		});
 	}
 	return result;

extensions/terminal-suggest/src/shell/pwsh.ts

@@ -82,6 +82,7 @@ async function getAliases(options: ExecOptionsWithStringEncoding, existingComman
 			kind: (isAlias
 				? vscode.TerminalCompletionItemKind.Alias
 				: vscode.TerminalCompletionItemKind.Method),
+			definition: (isAlias && e.Definition ? e.Definition : undefined)
 		};
 	});
 }

extensions/terminal-suggest/src/shell/zsh.ts

@@ -37,6 +37,7 @@ async function getAliases(options: ExecOptionsWithStringEncoding): Promise<IComp
 			label: match.groups.alias,
 			detail: match.groups.resolved,
 			kind: vscode.TerminalCompletionItemKind.Alias,
+			definition: match.groups.resolved.substring(0, match.groups.resolved.indexOf(' ')),
 		});
 	}
 	return result;

extensions/terminal-suggest/src/terminalSuggestMain.ts

@@ -249,14 +249,16 @@ export async function getCompletionItemsFromSpecs(
 		}
 
 		for (const specLabel of specLabels) {
-			const availableCommand = availableCommands.find(command => command.label === specLabel);
+			const availableCommand = availableCommands.find(command => specLabel === (command.definition ?? command.label));
 			if (!availableCommand || (token && token.isCancellationRequested)) {
 				continue;
 			}
 
 			// push it to the completion items
 			if (tokenType === TokenType.Command) {
-				items.push(createCompletionItem(terminalContext.cursorPosition, prefix, { label: specLabel }, getDescription(spec), availableCommand.detail));
+				if (availableCommand.kind !== vscode.TerminalCompletionItemKind.Alias) {
+					items.push(createCompletionItem(terminalContext.cursorPosition, prefix, { label: specLabel }, getDescription(spec), availableCommand.detail));
+				}
 				continue;
 			}
 

extensions/terminal-suggest/src/types.ts

@@ -7,6 +7,11 @@ import * as vscode from 'vscode';
 
 export interface ICompletionResource {
 	label: string;
+	/**
+	 * The definition of the completion, this will be the resolved value of an
+	 * alias completion.
+	 */
+	definition?: string;
 	detail?: string;
 	kind?: vscode.TerminalCompletionItemKind;
 }