Skip to content

Commit ac74ac1

Browse files
committed
Deep clone process args. Add args to start of extension host.
1 parent 6da7140 commit ac74ac1

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/vs/server/connection/extensionHostConnection.ts

+1
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ export class ExtensionHostConnection extends AbstractConnection {
143143
debug: this.startParams.break ? undefined : portNumber,
144144
args: ['--type=extensionHost', '--skipWorkspaceStorageLock'],
145145
env: <ForkEnvironmentVariables>{
146+
...(this.startParams.env || {}),
146147
VSCODE_AMD_ENTRYPOINT: 'vs/workbench/services/extensions/node/extensionHostProcess',
147148
VSCODE_PIPE_LOGGING: true,
148149
VSCODE_VERBOSE_LOGGING: true,

src/vs/server/ipc/terminalProviderIpc.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import * as os from 'os';
77
import { Emitter, Event } from 'vs/base/common/event';
88
import { IDisposable } from 'vs/base/common/lifecycle';
9-
import { cloneAndChange } from 'vs/base/common/objects';
9+
import { cloneAndChange, deepClone } from 'vs/base/common/objects';
1010
import { IProcessEnvironment } from 'vs/base/common/platform';
1111
import { URI } from 'vs/base/common/uri';
1212
import { IURITransformer, transformIncomingURIs } from 'vs/base/common/uriIpc';
@@ -143,7 +143,7 @@ export class TerminalProviderChannel implements IServerChannel<RemoteAgentConnec
143143
);
144144

145145
const processEnv: IProcessEnvironment = {
146-
...process.env,
146+
...deepClone(process.env),
147147
...(resolverEnv || {}),
148148
VSCODE_IPC_HOOK_CLI: cliServer.ipcHandlePath,
149149
};

0 commit comments

Comments
 (0)