Include passed environment in extension host spawn

code-asher · code-asher · commit cfd9fafdfa02 · 2021-08-25T14:09:11.000-05:00
It's possible for the options to include environment variables which we
were not including.
diff --git a/lib/vscode/src/vs/server/connection.ts b/lib/vscode/src/vs/server/connection.ts
@@ -181,6 +181,7 @@ export class ExtensionHostConnection extends Connection {
 			{
 				env: {
 					...process.env,
+					...(this.params.env || {}),
 					VSCODE_AMD_ENTRYPOINT: 'vs/workbench/services/extensions/node/extensionHostProcess',
 					VSCODE_PIPE_LOGGING: 'true',
 					VSCODE_VERBOSE_LOGGING: 'true',

Original file line number	Diff line number	Diff line change
`@@ -181,6 +181,7 @@ export class ExtensionHostConnection extends Connection {`
`181`	`181`	`{`
`182`	`182`	`env: {`
`183`	`183`	`...process.env,`
	`184`	`+ ...(this.params.env \|\| {}),`
`184`	`185`	`VSCODE_AMD_ENTRYPOINT: 'vs/workbench/services/extensions/node/extensionHostProcess',`
`185`	`186`	`VSCODE_PIPE_LOGGING: 'true',`
`186`	`187`	`VSCODE_VERBOSE_LOGGING: 'true',`