add aliases in the script in the right way

Author: meganrogge

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

@@ -217,7 +217,6 @@ export const IPtyService = createDecorator<IPtyService>('ptyService');
 
 export const enum ProcessPropertyType {
 	Cwd = 'cwd',
-	Aliases = 'aliases',
 	InitialCwd = 'initialCwd',
 	FixedDimensions = 'fixedDimensions',
 	Title = 'title',
@@ -245,7 +244,6 @@ export interface IProcessPropertyMap {
 	[ProcessPropertyType.OverrideDimensions]: ITerminalDimensionsOverride | undefined;
 	[ProcessPropertyType.FailedShellIntegrationActivation]: boolean | undefined;
 	[ProcessPropertyType.UsedShellIntegrationInjection]: boolean | undefined;
-	[ProcessPropertyType.Aliases]: string | undefined;
 }
 
 export interface IFixedTerminalDimensions {

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

@@ -548,3 +548,17 @@ 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/platform/terminal/node/terminalProcess.ts

@@ -89,7 +89,6 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 	readonly shouldPersist = false;
 
 	private _properties: IProcessPropertyMap = {
-		aliases: '',
 		cwd: '',
 		initialCwd: '',
 		fixedDimensions: { cols: undefined, rows: undefined },
@@ -103,7 +102,6 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 	};
 	private static _lastKillOrStart = 0;
 	private _exitCode: number | undefined;
-	private _aliases: string | undefined;
 	private _exitMessage: string | undefined;
 	private _closeTimeout: any;
 	private _ptyProcess: pty.IPty | undefined;
@@ -232,8 +230,6 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 
 		try {
 			await this.setupPtyProcess(this.shellLaunchConfig, this._ptyOptions, injection);
-			this._aliases = this._ptyOptions?.env?.['USER_ALIASES'] || undefined;
-			this._onDidChangeProperty.fire({ type: ProcessPropertyType.Aliases, value: this._aliases });
 			return undefined;
 		} catch (err) {
 			this._logService.trace('IPty#spawn native exception', err);

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
-export USER_ALIASES=$(alias)
+echo -ne "\x1b]633;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
-export USER_ALIASES=$(alias)
+echo -ne "\x1b]633;UserAliases;$(alias)"

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

@@ -92,3 +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")

src/vs/workbench/contrib/terminal/browser/remotePty.ts

@@ -30,7 +30,6 @@ export class RemotePty extends Disposable implements ITerminalChildProcess {
 	private _inReplay = false;
 
 	private _properties: IProcessPropertyMap = {
-		aliases: '',
 		cwd: '',
 		initialCwd: '',
 		fixedDimensions: { cols: undefined, rows: undefined },

src/vs/workbench/contrib/terminal/browser/terminalInstance.ts

@@ -822,24 +822,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		return xterm;
 	}
 
-	private _parseAliases(aliasString: string): string[][] {
-		const aliases: string[][] = [];
-		const rows = aliasString.split('\n');
-		for (const row of rows) {
-			if (this.shellType === 'zsh') {
-				aliases.push(row.split('='));
-			} else if (this.shellType === 'bash') {
-				// trim off 'alias '
-				aliases.push(row.substring(6).split('='));
-			}
-		}
-		if (aliases.length) {
-			this._aliases = aliases;
-		}
-		console.log(this._aliases);
-		return aliases;
-	}
-
 	async runCommand(commandLine: string, addNewLine: boolean): Promise<void> {
 		// Determine whether to send ETX (ctrl+c) before running the command. This should always
 		// happen unless command detection can reliably say that a command is being entered and
@@ -1482,11 +1464,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 				case ProcessPropertyType.UsedShellIntegrationInjection:
 					this._usedShellIntegrationInjection = true;
 					break;
-				case ProcessPropertyType.Aliases:
-					if (value) {
-						this._parseAliases(value);
-					}
-					break;
 			}
 		});