Include passed environment in extension host spawn

code-asher · code-asher · commit 8f062c3e0cf7 · 2021-06-21T15:09:52.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/node/connection.ts b/lib/vscode/src/vs/server/node/connection.ts
@@ -174,6 +174,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
`@@ -174,6 +174,7 @@ export class ExtensionHostConnection extends Connection {`
`174`	`174`	`{`
`175`	`175`	`env: {`
`176`	`176`	`...process.env,`
	`177`	`+ ...(this.params.env \|\| {}),`
`177`	`178`	`VSCODE_AMD_ENTRYPOINT: 'vs/workbench/services/extensions/node/extensionHostProcess',`
`178`	`179`	`VSCODE_PIPE_LOGGING: 'true',`
`179`	`180`	`VSCODE_VERBOSE_LOGGING: 'true',`