Tweak names, make shellLaunchConfig readonly again

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

@@ -326,7 +326,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 	public $sendResolvedLaunchConfig(terminalId: number, shellLaunchConfig: IShellLaunchConfig): void {
 		const instance = this._terminalService.getInstanceFromId(terminalId);
 		if (instance) {
-			this._getTerminalProcess(terminalId).then(e => e.emitOverrideShellLaunchConfig(shellLaunchConfig));
+			this._getTerminalProcess(terminalId).then(e => e.emitResolvedShellLaunchConfig(shellLaunchConfig));
 		}
 	}
 

src/vs/workbench/api/common/extHost.protocol.ts

@@ -407,9 +407,9 @@ export interface MainThreadTerminalServiceShape extends IDisposable {
 	$sendProcessData(terminalId: number, data: string): void;
 	$sendProcessReady(terminalId: number, pid: number, cwd: string): void;
 	$sendProcessExit(terminalId: number, exitCode: number): void;
-	$sendOverrideDimensions(terminalId: number, dimensions: ITerminalDimensions | undefined): void;
 	$sendProcessInitialCwd(terminalId: number, cwd: string): void;
 	$sendProcessCwd(terminalId: number, initialCwd: string): void;
+	$sendOverrideDimensions(terminalId: number, dimensions: ITerminalDimensions | undefined): void;
 	$sendResolvedLaunchConfig(terminalId: number, shellLaunchConfig: IShellLaunchConfig): void;
 
 	// Renderer

src/vs/workbench/api/node/extHostTerminalService.ts

@@ -319,7 +319,6 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
 		const terminal = new ExtHostTerminal(this._proxy, name);
 		terminal.create(shellPath, shellArgs);
 		this._terminals.push(terminal);
-
 		return terminal;
 	}
 

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

@@ -968,7 +968,7 @@ export class TerminalInstance implements ITerminalInstance {
 		this._processManager.onProcessExit(exitCode => this._onProcessExit(exitCode));
 		this._processManager.onProcessData(data => this._onData.fire(data));
 		this._processManager.onProcessOverrideDimensions(e => this.setDimensions(e));
-		this._processManager.onProcessOverrideShellLaunchConfig(e => this.setShellLaunchConfig(e));
+		this._processManager.onProcessResolvedShellLaunchConfig(e => this._setResolvedShellLaunchConfig(e));
 
 		if (this._shellLaunchConfig.name) {
 			this.setTitle(this._shellLaunchConfig.name, false);
@@ -1380,7 +1380,7 @@ export class TerminalInstance implements ITerminalInstance {
 		this._resize();
 	}
 
-	private setShellLaunchConfig(shellLaunchConfig: IShellLaunchConfig): void {
+	private _setResolvedShellLaunchConfig(shellLaunchConfig: IShellLaunchConfig): void {
 		this._shellLaunchConfig.args = shellLaunchConfig.args;
 		this._shellLaunchConfig.cwd = shellLaunchConfig.cwd;
 		this._shellLaunchConfig.executable = shellLaunchConfig.executable;

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

@@ -71,7 +71,7 @@ export class TerminalProcessManager implements ITerminalProcessManager {
 	private readonly _onProcessOverrideDimensions = new Emitter<ITerminalDimensions | undefined>();
 	public get onProcessOverrideDimensions(): Event<ITerminalDimensions | undefined> { return this._onProcessOverrideDimensions.event; }
 	private readonly _onProcessOverrideShellLaunchConfig = new Emitter<IShellLaunchConfig>();
-	public get onProcessOverrideShellLaunchConfig(): Event<IShellLaunchConfig> { return this._onProcessOverrideShellLaunchConfig.event; }
+	public get onProcessResolvedShellLaunchConfig(): Event<IShellLaunchConfig> { return this._onProcessOverrideShellLaunchConfig.event; }
 
 	constructor(
 		private readonly _terminalId: number,
@@ -172,8 +172,8 @@ export class TerminalProcessManager implements ITerminalProcessManager {
 		if (this._process.onProcessOverrideDimensions) {
 			this._process.onProcessOverrideDimensions(e => this._onProcessOverrideDimensions.fire(e));
 		}
-		if (this._process.onProcessOverrideShelllaunchConfig) {
-			this._process.onProcessOverrideShelllaunchConfig(e => this._onProcessOverrideShellLaunchConfig.fire(e));
+		if (this._process.onProcessResolvedShellLaunchConfig) {
+			this._process.onProcessResolvedShellLaunchConfig(e => this._onProcessOverrideShellLaunchConfig.fire(e));
 		}
 
 		setTimeout(() => {

src/vs/workbench/contrib/terminal/common/terminal.ts

@@ -468,7 +468,7 @@ export interface ITerminalInstance {
 	/**
 	 * The shell launch config used to launch the shell.
 	 */
-	shellLaunchConfig: IShellLaunchConfig;
+	readonly shellLaunchConfig: IShellLaunchConfig;
 
 	/**
 	 * Whether to disable layout for the terminal. This is useful when the size of the terminal is
@@ -709,7 +709,7 @@ export interface ITerminalProcessManager extends IDisposable {
 	readonly onProcessTitle: Event<string>;
 	readonly onProcessExit: Event<number>;
 	readonly onProcessOverrideDimensions: Event<ITerminalDimensions | undefined>;
-	readonly onProcessOverrideShellLaunchConfig: Event<IShellLaunchConfig>;
+	readonly onProcessResolvedShellLaunchConfig: Event<IShellLaunchConfig>;
 
 	dispose(immediate?: boolean): void;
 	createProcess(shellLaunchConfig: IShellLaunchConfig, cols: number, rows: number, isScreenReaderModeEnabled: boolean): Promise<void>;
@@ -748,7 +748,7 @@ export interface ITerminalProcessExtHostProxy extends IDisposable {
 	emitReady(pid: number, cwd: string): void;
 	emitExit(exitCode: number): void;
 	emitOverrideDimensions(dimensions: ITerminalDimensions | undefined): void;
-	emitOverrideShellLaunchConfig(shellLaunchConfig: IShellLaunchConfig): void;
+	emitResolvedShellLaunchConfig(shellLaunchConfig: IShellLaunchConfig): void;
 	emitInitialCwd(initialCwd: string): void;
 	emitCwd(cwd: string): void;
 	emitLatency(latency: number): void;
@@ -804,7 +804,7 @@ export interface ITerminalChildProcess {
 	onProcessReady: Event<{ pid: number, cwd: string }>;
 	onProcessTitleChanged: Event<string>;
 	onProcessOverrideDimensions?: Event<ITerminalDimensions | undefined>;
-	onProcessOverrideShelllaunchConfig?: Event<IShellLaunchConfig>;
+	onProcessResolvedShellLaunchConfig?: Event<IShellLaunchConfig>;
 
 	/**
 	 * Shutdown the terminal process.

src/vs/workbench/contrib/terminal/common/terminalProcessExtHostProxy.ts

@@ -24,8 +24,8 @@ export class TerminalProcessExtHostProxy extends Disposable implements ITerminal
 	public readonly onProcessTitleChanged: Event<string> = this._onProcessTitleChanged.event;
 	private readonly _onProcessOverrideDimensions = new Emitter<ITerminalDimensions | undefined>();
 	public get onProcessOverrideDimensions(): Event<ITerminalDimensions | undefined> { return this._onProcessOverrideDimensions.event; }
-	private readonly _onProcessOverrideShellLaunchConfig = new Emitter<IShellLaunchConfig>();
-	public get onProcessOverrideShelllaunchConfig(): Event<IShellLaunchConfig> { return this._onProcessOverrideShellLaunchConfig.event; }
+	private readonly _onProcessResolvedShellLaunchConfig = new Emitter<IShellLaunchConfig>();
+	public get onProcessResolvedShellLaunchConfig(): Event<IShellLaunchConfig> { return this._onProcessResolvedShellLaunchConfig.event; }
 
 	private readonly _onInput = this._register(new Emitter<string>());
 	public readonly onInput: Event<string> = this._onInput.event;
@@ -95,8 +95,8 @@ export class TerminalProcessExtHostProxy extends Disposable implements ITerminal
 		this._onProcessOverrideDimensions.fire(dimensions);
 	}
 
-	public emitOverrideShellLaunchConfig(shellLaunchConfig: IShellLaunchConfig): void {
-		this._onProcessOverrideShellLaunchConfig.fire(shellLaunchConfig);
+	public emitResolvedShellLaunchConfig(shellLaunchConfig: IShellLaunchConfig): void {
+		this._onProcessResolvedShellLaunchConfig.fire(shellLaunchConfig);
 	}
 
 	public emitInitialCwd(initialCwd: string): void {