Skip to content

Commit 1856747

Browse files
committed
Use resolverEnv to get exec path
This is the last unused variable in the create terminal payload.
1 parent 7f830c4 commit 1856747

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

ci/dev/vscode.patch

+5-3
Original file line numberDiff line numberDiff line change
@@ -1466,10 +1466,10 @@ index 0000000000000000000000000000000000000000..6ce56bec114a6d8daf5dd3ded945ea78
14661466
+}
14671467
diff --git a/src/vs/server/node/channel.ts b/src/vs/server/node/channel.ts
14681468
new file mode 100644
1469-
index 0000000000000000000000000000000000000000..7619b02f04b6e61e86e741b09b542d86fab97e3d
1469+
index 0000000000000000000000000000000000000000..769d57953e782b7a72519599274630236114b17d
14701470
--- /dev/null
14711471
+++ b/src/vs/server/node/channel.ts
1472-
@@ -0,0 +1,887 @@
1472+
@@ -0,0 +1,889 @@
14731473
+import { field, logger } from '@coder/logger';
14741474
+import { Server } from '@coder/node-browser';
14751475
+import * as os from 'os';
@@ -1866,7 +1866,9 @@ index 0000000000000000000000000000000000000000..7619b02f04b6e61e86e741b09b542d86
18661866
+ return args.resolvedVariables[`config:${section}`];
18671867
+ },
18681868
+ getExecPath: (): string | undefined => {
1869-
+ return env['VSCODE_EXEC_PATH'];
1869+
+ // Assuming that resolverEnv is just for use in the resolver and not for
1870+
+ // the terminal itself.
1871+
+ return (args.resolverEnv && args.resolverEnv['VSCODE_EXEC_PATH']) || env['VSCODE_EXEC_PATH'];
18701872
+ },
18711873
+ // This is just a guess; this is the only file-related thing we're sent
18721874
+ // and none of these resolver methods seem to get called so I don't know

0 commit comments

Comments
 (0)