Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Terminals aren't persisting anymore #183516

Merged
merged 3 commits into from May 27, 2023
Merged

Fix Terminals aren't persisting anymore #183516

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
677be08
Fixes #183445
jeanp413 May 26, 2023
fcfef87
Merge branch 'main' into fix-183445
meganrogge May 26, 2023
feec65b
Also pass process.env
jeanp413 May 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/vs/platform/terminal/electron-main/electronPtyHostStarter.ts
View file
Open in desktop
Expand Up @@ -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 {

Expand Down Expand Up @@ -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();
Expand All @@ -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)
};
}

Expand Down