get aliases to work for pwsh

Author: meganrogge

src/vs/platform/terminal/common/capabilities/capabilities.ts

@@ -252,6 +252,7 @@ export interface ISerializedCommand {
 	commandStartLineContent: string | undefined;
 	timestamp: number;
 	markProperties: IMarkProperties | undefined;
+	aliases: string[][] | undefined;
 }
 export interface IMarkProperties {
 	hoverMessage?: string;

src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts

@@ -565,7 +565,8 @@ export class CommandDetectionCapability implements ICommandDetectionCapability {
 				exitCode: e.exitCode,
 				commandStartLineContent: e.commandStartLineContent,
 				timestamp: e.timestamp,
-				markProperties: e.markProperties
+				markProperties: e.markProperties,
+				aliases: e.aliases
 			};
 		});
 		if (this._currentCommand.commandStartMarker) {
@@ -579,7 +580,8 @@ export class CommandDetectionCapability implements ICommandDetectionCapability {
 				exitCode: undefined,
 				commandStartLineContent: undefined,
 				timestamp: 0,
-				markProperties: undefined
+				markProperties: undefined,
+				aliases: this._aliases
 			});
 		}
 		return {
@@ -784,12 +786,14 @@ function countNewLines(regex: RegExp): number {
 
 function parseAliases(aliasString: string, isWindows?: boolean): string[][] {
 	const aliases: string[][] = [];
-	const rows = aliasString.split('\n');
 	let shellType;
+	const rows = aliasString.split('\n');
 	if (isWindows || aliasString.includes('Definition')) {
 		shellType = 'pwsh';
 		// Remove the column headers
 		rows.shift();
+		rows.shift();
+		rows.shift();
 	} else if (rows.length > 1 && rows[1].startsWith('alias')) {
 		shellType = 'bash';
 	} else {
@@ -802,7 +806,7 @@ function parseAliases(aliasString: string, isWindows?: boolean): string[][] {
 		} else if (shellType === 'bash') {
 			aliases.push(row.substring(6).split('='));
 		} else {
-			aliases.push(row.split(''));
+			aliases.push(row.split('\s+'));
 		}
 	}
 	console.log(aliases);

src/vs/workbench/api/browser/mainThreadTerminalService.ts

@@ -25,6 +25,7 @@ import { Promises } from 'vs/base/common/async';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { ITerminalCommand } from 'vs/platform/terminal/common/capabilities/capabilities';
 import { ITerminalOutputMatch, ITerminalOutputMatcher, ITerminalQuickFixOptions } from 'vs/platform/terminal/common/xterm/terminalQuickFix';
+import { resolveAliases } from 'vs/workbench/contrib/terminal/browser/xterm/quickFixAddon';
 
 @extHostNamedCustomer(MainContext.MainThreadTerminalService)
 export class MainThreadTerminalService implements MainThreadTerminalServiceShape {
@@ -259,8 +260,15 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 						option.outputMatcher.length = 40;
 						this._logService.warn('Cannot exceed output matcher length of 40');
 					}
-					const commandLineMatch = terminalCommand.command.match(option.commandLineMatcher);
+					let commandLineMatch = terminalCommand.command.match(option.commandLineMatcher);
 					if (!commandLineMatch) {
+						if (terminalCommand.aliases) {
+							const resolvedCommand = resolveAliases(terminalCommand.command, terminalCommand.aliases);
+							commandLineMatch = resolvedCommand.match(option.commandLineMatcher);
+							if (!commandLineMatch) {
+								return;
+							}
+						}
 						return;
 					}
 					const outputMatcher = option.outputMatcher;

src/vs/workbench/contrib/terminal/browser/media/shellIntegration.ps1

@@ -92,4 +92,7 @@ function Set-MappedKeyHandlers {
 	Set-MappedKeyHandler -Chord Shift+End -Sequence 'F12,d'
 }
 Set-MappedKeyHandlers
-[Console]::Write("`e]633;P;UserAliases=$(Get-Alias | Select-Object Name, Definition)`a")
+$result = $(Get-Alias | Select-Object Name, Definition)
+$resultStr = Out-String -InputObject $result
+$resultStr = $resultStr.Replace("\", "\\").Replace("`n", "\x0a").Replace(";", "\x3b")
+[Console]::Write("`e]633;P;UserAliases=$resultStr`a")

src/vs/workbench/contrib/terminal/browser/xterm/quickFixAddon.ts

@@ -328,9 +328,13 @@ export async function getQuickFixesForCommand(
 				}
 				quickFixes = await getResolvedFixes(option, option.outputMatcher ? getLinesForCommand(terminal.buffer.active, terminalCommand, terminal.cols, option.outputMatcher) : undefined);
 			} else if (option.type === 'internal') {
-				const commandLineMatch = newCommand.match(option.commandLineMatcher);
+				let commandLineMatch = newCommand.match(option.commandLineMatcher);
 				if (!commandLineMatch) {
-					continue;
+					const resolvedAliasesCommand = resolveAliases(newCommand, terminalCommand.aliases);
+					commandLineMatch = resolvedAliasesCommand.match(option.commandLineMatcher);
+					if (!commandLineMatch) {
+						continue;
+					}
 				}
 				const outputMatcher = option.outputMatcher;
 				let outputMatch;
@@ -427,7 +431,7 @@ function convertToQuickFixOptions(selectorProvider: ITerminalQuickFixProviderSel
 	};
 }
 
-function resolveAliases(commandLine: string, aliases?: string[][]): string {
+export function resolveAliases(commandLine: string, aliases?: string[][]): string {
 	if (!aliases) {
 		return commandLine;
 	}