echo e is removing new lines

Author: meganrogge

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

@@ -159,6 +159,7 @@ export interface ICommandDetectionCapability {
 	readonly onCurrentCommandInvalidated: Event<ICommandInvalidationRequest>;
 	setCwd(value: string): void;
 	setIsWindowsPty(value: boolean): void;
+	setAliases(value: string): void;
 	setIsCommandStorageDisabled(): void;
 	/**
 	 * Gets the working directory for a line, this will return undefined if it's unknown in which
@@ -221,6 +222,7 @@ export interface ITerminalCommand {
 	executedMarker?: IXtermMarker;
 	commandStartLineContent?: string;
 	markProperties?: IMarkProperties;
+	aliases?: string[][];
 	getOutput(): string | undefined;
 	getOutputMatch(outputMatcher: ITerminalOutputMatcher): ITerminalOutputMatch | undefined;
 	hasOutput(): boolean;

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

@@ -58,6 +58,7 @@ export class CommandDetectionCapability implements ICommandDetectionCapability {
 	private _cwd: string | undefined;
 	private _currentCommand: ICurrentPartialCommand = {};
 	private _isWindowsPty: boolean = false;
+	private _aliases: string[][] = [];
 	private _onCursorMoveListener?: IDisposable;
 	private _commandMarkers: IMarker[] = [];
 	private _dimensions: ITerminalDimensions;
@@ -270,6 +271,10 @@ export class CommandDetectionCapability implements ICommandDetectionCapability {
 		this._isWindowsPty = value;
 	}
 
+	setAliases(value: string): void {
+		this._aliases = parseAliases(value, this._isWindowsPty);
+	}
+
 	setIsCommandStorageDisabled(): void {
 		this.__isCommandStorageDisabled = true;
 	}
@@ -776,3 +781,30 @@ function countNewLines(regex: RegExp): number {
 	}
 	return count;
 }
+
+function parseAliases(aliasString: string, isWindows?: boolean): string[][] {
+	const aliases: string[][] = [];
+	const rows = aliasString.split('\n');
+	let shellType;
+	if (isWindows || aliasString.includes('Definition')) {
+		shellType = 'pwsh';
+		// Remove the column headers
+		rows.shift();
+	} else if (rows.length > 1 && rows[1].startsWith('alias')) {
+		shellType = 'bash';
+	} else {
+		shellType = 'zsh';
+	}
+
+	for (const row of rows) {
+		if (shellType === 'zsh') {
+			aliases.push(row.split('='));
+		} else if (shellType === 'bash') {
+			aliases.push(row.substring(6).split('='));
+		} else {
+			aliases.push(row.split(''));
+		}
+	}
+	console.log(aliases);
+	return aliases;
+}

src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts

@@ -371,6 +371,10 @@ export class ShellIntegrationAddon extends Disposable implements IShellIntegrati
 						this.capabilities.get(TerminalCapability.CommandDetection)?.setIsCommandStorageDisabled();
 						return true;
 					}
+					case 'UserAliases': {
+						this._createOrGetCommandDetection(this._terminal).setAliases(value);
+						return true;
+					}
 				}
 			}
 			case VSCodeOscPt.SetMark: {
@@ -548,17 +552,3 @@ export function parseMarkSequence(sequence: string[]): { id?: string; hidden?: b
 	}
 	return { id, hidden };
 }
-
-function parseAliases(aliasString: string, shellType: string): string[][] {
-	const aliases: string[][] = [];
-	const rows = aliasString.split('\n');
-	for (const row of rows) {
-		if (shellType === 'zsh') {
-			aliases.push(row.split('='));
-		} else if (shellType === 'bash') {
-			// trim off 'alias '
-			aliases.push(row.substring(6).split('='));
-		}
-	}
-	return aliases;
-}

src/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh

@@ -206,4 +206,4 @@ if [[ -z "${bash_preexec_imported:-}" ]]; then
 		PROMPT_COMMAND=__vsc_prompt_cmd
 	fi
 fi
-echo -ne "\x1b]633;UserAliases;$(alias)"
+echo -e "\x1b]633;P;UserAliases=$(alias)"

src/vs/workbench/contrib/terminal/browser/media/shellIntegration-rc.zsh

@@ -130,4 +130,4 @@ add-zsh-hook preexec __vsc_preexec
 if [[ $options[login] = off && $USER_ZDOTDIR != $VSCODE_ZDOTDIR ]]; then
 	ZDOTDIR=$USER_ZDOTDIR
 fi
-echo -ne "\x1b]633;UserAliases;$(alias)"
+echo -e "\x1b]633;P;UserAliases=$(alias)"

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

@@ -92,4 +92,4 @@ function Set-MappedKeyHandlers {
 	Set-MappedKeyHandler -Chord Shift+End -Sequence 'F12,d'
 }
 Set-MappedKeyHandlers
-[Console]::Write("`e]633;P;Aliases=$(Get-Alias | Select-Object Name, Definition)`a")
+[Console]::Write("`e]633;P;UserAliases=$(Get-Alias | Select-Object Name, Definition)`a")

src/vs/workbench/contrib/terminal/electron-sandbox/localPty.ts

@@ -17,7 +17,6 @@ import { IPtyHostProcessReplayEvent, ISerializedCommandDetectionCapability } fro
 export class LocalPty extends Disposable implements ITerminalChildProcess {
 	private _inReplay = false;
 	private _properties: IProcessPropertyMap = {
-		aliases: '',
 		cwd: '',
 		initialCwd: '',
 		fixedDimensions: { cols: undefined, rows: undefined },