try to fire property change aliases after shell integration injection happens to no avail

Author: meganrogge

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

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

src/vs/platform/terminal/node/terminalProcess.ts

@@ -89,6 +89,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 	readonly shouldPersist = false;
 
 	private _properties: IProcessPropertyMap = {
+		aliases: '',
 		cwd: '',
 		initialCwd: '',
 		fixedDimensions: { cols: undefined, rows: undefined },
@@ -231,6 +232,8 @@ 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);
@@ -294,7 +297,6 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 		this._logService.trace('IPty#spawn', shellLaunchConfig.executable, args, options);
 		const ptyProcess = (await import('node-pty')).spawn(shellLaunchConfig.executable!, args, options);
 		this._ptyProcess = ptyProcess;
-		this._aliases = options.env ? options.env['USER_ALIASES'] : undefined;
 		this._childProcessMonitor = this._register(new ChildProcessMonitor(ptyProcess.pid, this._logService));
 		this._childProcessMonitor.onDidChangeHasChildProcesses(value => this._onDidChangeProperty.fire({ type: ProcessPropertyType.HasChildProcesses, value }));
 		this._processStartupComplete = new Promise<void>(c => {
@@ -396,7 +398,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 	}
 
 	private _sendProcessId(pid: number) {
-		this._onProcessReady.fire({ pid, cwd: this._initialCwd, requiresWindowsMode: isWindows && getWindowsBuildNumber() < 21376, aliases: this._aliases });
+		this._onProcessReady.fire({ pid, cwd: this._initialCwd, requiresWindowsMode: isWindows && getWindowsBuildNumber() < 21376 });
 	}
 
 	private _sendProcessTitle(ptyProcess: pty.IPty): void {

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

@@ -206,3 +206,4 @@ if [[ -z "${bash_preexec_imported:-}" ]]; then
 		PROMPT_COMMAND=__vsc_prompt_cmd
 	fi
 fi
+export USER_ALIASES=$(alias)

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

@@ -30,6 +30,7 @@ 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

@@ -826,8 +826,17 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		const aliases: string[][] = [];
 		const rows = aliasString.split('\n');
 		for (const row of rows) {
-			aliases.push(row.split('='));
+			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;
 	}
 
@@ -1418,9 +1427,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		const processManager = this._scopedInstantiationService.createInstance(TerminalProcessManager, this._instanceId, this._configHelper, this.shellLaunchConfig?.cwd, deserializedCollections);
 		this.capabilities.add(processManager.capabilities);
 		processManager.onProcessReady(async (e) => {
-			if (e.aliases) {
-				this._aliases = this._parseAliases(e.aliases);
-			}
 			this._onProcessIdReady.fire(this);
 			this._initialCwd = await this.getInitialCwd();
 			// Set the initial name based on the _resolved_ shell launch config, this will also
@@ -1476,6 +1482,9 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 				case ProcessPropertyType.UsedShellIntegrationInjection:
 					this._usedShellIntegrationInjection = true;
 					break;
+				case ProcessPropertyType.Aliases:
+					this._parseAliases(value);
+					break;
 			}
 		});
 

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

@@ -17,6 +17,7 @@ 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 },