development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-28 05:19:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #183516 from jeanp413/fix-183445

Browse source
This commit is contained in:
Megan Rogge 2023-05-26 19:32:21 -05:00 committed by GitHub
parent dbead18832 feec65b542
commit eef30e7165
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/vs/platform/terminal/electron-main/electronPtyHostStarter.ts
View file

@ -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 {
@ -54,8 +55,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 +79,14 @@ export class ElectronPtyHostStarter implements IPtyHostStarter {
private _createPtyHostConfiguration(lastPtyId: number) {
return {
VSCODE_LAST_PTY_ID: lastPtyId,
...deepClone(process.env),
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)
};
}