From 677be0815b5a2e98b5313bd9d103d11ba41aa590 Mon Sep 17 00:00:00 2001 From: Jean Pierre Date: Fri, 26 May 2023 05:03:28 -0500 Subject: [PATCH 1/2] Fixes #183445 --- .../terminal/electron-main/electronPtyHostStarter.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/vs/platform/terminal/electron-main/electronPtyHostStarter.ts b/src/vs/platform/terminal/electron-main/electronPtyHostStarter.ts index 92342be0f8d..52974ff702f 100644 --- a/src/vs/platform/terminal/electron-main/electronPtyHostStarter.ts +++ b/src/vs/platform/terminal/electron-main/electronPtyHostStarter.ts @@ -54,8 +54,8 @@ export class ElectronPtyHostStarter implements IPtyHostStarter { this.utilityProcess.start({ type: 'ptyHost', entryPoint: 'vs/platform/terminal/node/ptyHostMain', - payload: this._createPtyHostConfiguration(lastPtyId), - execArgv + execArgv, + env: this._createPtyHostConfiguration(lastPtyId) }); const port = this.utilityProcess.connect(); @@ -78,13 +78,13 @@ export class ElectronPtyHostStarter implements IPtyHostStarter { private _createPtyHostConfiguration(lastPtyId: number) { return { - VSCODE_LAST_PTY_ID: lastPtyId, + VSCODE_LAST_PTY_ID: String(lastPtyId), VSCODE_AMD_ENTRYPOINT: 'vs/platform/terminal/node/ptyHostMain', VSCODE_PIPE_LOGGING: 'true', VSCODE_VERBOSE_LOGGING: 'true', // transmit console logs from server to client, - VSCODE_RECONNECT_GRACE_TIME: this._reconnectConstants.graceTime, - VSCODE_RECONNECT_SHORT_GRACE_TIME: this._reconnectConstants.shortGraceTime, - VSCODE_RECONNECT_SCROLLBACK: this._reconnectConstants.scrollback + VSCODE_RECONNECT_GRACE_TIME: String(this._reconnectConstants.graceTime), + VSCODE_RECONNECT_SHORT_GRACE_TIME: String(this._reconnectConstants.shortGraceTime), + VSCODE_RECONNECT_SCROLLBACK: String(this._reconnectConstants.scrollback) }; } From feec65b5421a5c4e2fbe98730134370f23fc1151 Mon Sep 17 00:00:00 2001 From: Jean Pierre Date: Fri, 26 May 2023 19:04:31 -0500 Subject: [PATCH 2/2] Also pass process.env --- .../platform/terminal/electron-main/electronPtyHostStarter.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/vs/platform/terminal/electron-main/electronPtyHostStarter.ts b/src/vs/platform/terminal/electron-main/electronPtyHostStarter.ts index 52974ff702f..963ed887aa7 100644 --- a/src/vs/platform/terminal/electron-main/electronPtyHostStarter.ts +++ b/src/vs/platform/terminal/electron-main/electronPtyHostStarter.ts @@ -16,6 +16,7 @@ import { IpcMainEvent } from 'electron'; import { validatedIpcMain } from 'vs/base/parts/ipc/electron-main/ipcMain'; import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle'; import { Emitter } from 'vs/base/common/event'; +import { deepClone } from 'vs/base/common/objects'; export class ElectronPtyHostStarter implements IPtyHostStarter { @@ -78,6 +79,7 @@ export class ElectronPtyHostStarter implements IPtyHostStarter { private _createPtyHostConfiguration(lastPtyId: number) { return { + ...deepClone(process.env), VSCODE_LAST_PTY_ID: String(lastPtyId), VSCODE_AMD_ENTRYPOINT: 'vs/platform/terminal/node/ptyHostMain', VSCODE_PIPE_LOGGING: 'true',