mirror of
https://github.com/Microsoft/vscode
synced 2024-09-18 01:58:27 +00:00
Pass cwd through to main
This commit is contained in:
parent
c5ed5b0728
commit
a7412fbb2b
|
@ -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 {
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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));
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 {
|
||||
|
|
Loading…
Reference in a new issue