diff --git a/src/vs/workbench/api/browser/mainThreadTerminalService.ts b/src/vs/workbench/api/browser/mainThreadTerminalService.ts index 3dcabc3718b..a68310bb3ee 100644 --- a/src/vs/workbench/api/browser/mainThreadTerminalService.ts +++ b/src/vs/workbench/api/browser/mainThreadTerminalService.ts @@ -247,8 +247,8 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape this._terminalProcesses[terminalId].emitData(data); } - public $sendProcessPid(terminalId: number, pid: number): void { - this._terminalProcesses[terminalId].emitPid(pid); + public $sendProcessReady(terminalId: number, pid: number, cwd: string): void { + this._terminalProcesses[terminalId].emitReady(pid, cwd); } public $sendProcessExit(terminalId: number, exitCode: number): void { diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts index 0109dda3dec..bb93e419568 100644 --- a/src/vs/workbench/api/common/extHost.protocol.ts +++ b/src/vs/workbench/api/common/extHost.protocol.ts @@ -400,7 +400,7 @@ export interface MainThreadTerminalServiceShape extends IDisposable { // Process $sendProcessTitle(terminalId: number, title: string): void; $sendProcessData(terminalId: number, data: string): void; - $sendProcessPid(terminalId: number, pid: number): void; + $sendProcessReady(terminalId: number, pid: number, cwd: string): void; $sendProcessExit(terminalId: number, exitCode: number): void; $sendProcessInitialCwd(terminalId: number, cwd: string): void; $sendProcessCwd(terminalId: number, initialCwd: string): void; diff --git a/src/vs/workbench/api/node/extHostTerminalService.ts b/src/vs/workbench/api/node/extHostTerminalService.ts index 353bcdd3d0a..f0dd94833f7 100644 --- a/src/vs/workbench/api/node/extHostTerminalService.ts +++ b/src/vs/workbench/api/node/extHostTerminalService.ts @@ -535,7 +535,7 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape { // Fork the process and listen for messages this._logService.debug(`Terminal process launching on ext host`, shellLaunchConfig, initialCwd, cols, rows, env); const p = new TerminalProcess(shellLaunchConfig, initialCwd, cols, rows, env, terminalConfig.get('windowsEnableConpty') as boolean, this._logService); - p.onProcessReady((e: { pid: number, cwd: string }) => this._proxy.$sendProcessPid(id, e.pid)); + p.onProcessReady((e: { pid: number, cwd: string }) => this._proxy.$sendProcessReady(id, e.pid, e.cwd)); p.onProcessTitleChanged(title => this._proxy.$sendProcessTitle(id, title)); p.onProcessData(data => this._proxy.$sendProcessData(id, data)); p.onProcessExit(exitCode => this._onProcessExit(id, exitCode)); diff --git a/src/vs/workbench/contrib/terminal/common/terminal.ts b/src/vs/workbench/contrib/terminal/common/terminal.ts index 61164ac3e9f..c66a35797f0 100644 --- a/src/vs/workbench/contrib/terminal/common/terminal.ts +++ b/src/vs/workbench/contrib/terminal/common/terminal.ts @@ -723,7 +723,7 @@ export interface ITerminalProcessExtHostProxy extends IDisposable { emitData(data: string): void; emitTitle(title: string): void; - emitPid(pid: number): void; + emitReady(pid: number, cwd: string): void; emitExit(exitCode: number): void; emitInitialCwd(initialCwd: string): void; emitCwd(cwd: string): void; diff --git a/src/vs/workbench/contrib/terminal/common/terminalProcessExtHostProxy.ts b/src/vs/workbench/contrib/terminal/common/terminalProcessExtHostProxy.ts index 8346a90cd46..097d3b3145d 100644 --- a/src/vs/workbench/contrib/terminal/common/terminalProcessExtHostProxy.ts +++ b/src/vs/workbench/contrib/terminal/common/terminalProcessExtHostProxy.ts @@ -71,8 +71,8 @@ export class TerminalProcessExtHostProxy extends Disposable implements ITerminal this._onProcessTitleChanged.fire(title); } - public emitPid(pid: number): void { - this._onProcessReady.fire({ pid, cwd: '' }); + public emitReady(pid: number, cwd: string): void { + this._onProcessReady.fire({ pid, cwd }); } public emitExit(exitCode: number): void {