diff --git a/ci/dev/vscode.patch b/ci/dev/vscode.patch index 4ec8b2665..0bcec08e9 100644 --- a/ci/dev/vscode.patch +++ b/ci/dev/vscode.patch @@ -1466,10 +1466,10 @@ index 0000000000000000000000000000000000000000..6ce56bec114a6d8daf5dd3ded945ea78 +} diff --git a/src/vs/server/node/channel.ts b/src/vs/server/node/channel.ts new file mode 100644 -index 0000000000000000000000000000000000000000..7619b02f04b6e61e86e741b09b542d86fab97e3d +index 0000000000000000000000000000000000000000..769d57953e782b7a72519599274630236114b17d --- /dev/null +++ b/src/vs/server/node/channel.ts -@@ -0,0 +1,887 @@ +@@ -0,0 +1,889 @@ +import { field, logger } from '@coder/logger'; +import { Server } from '@coder/node-browser'; +import * as os from 'os'; @@ -1866,7 +1866,9 @@ index 0000000000000000000000000000000000000000..7619b02f04b6e61e86e741b09b542d86 + return args.resolvedVariables[`config:${section}`]; + }, + getExecPath: (): string | undefined => { -+ return env['VSCODE_EXEC_PATH']; ++ // Assuming that resolverEnv is just for use in the resolver and not for ++ // the terminal itself. ++ return (args.resolverEnv && args.resolverEnv['VSCODE_EXEC_PATH']) || env['VSCODE_EXEC_PATH']; + }, + // This is just a guess; this is the only file-related thing we're sent + // and none of these resolver methods seem to get called so I don't know