bughz
/
code-server
mirror of https://github.com/coder/code-server.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use resolverEnv to get exec path 

This is the last unused variable in the create terminal payload.
This commit is contained in:
Asher 2020-11-19 12:42:59 -06:00
parent fa59156a2a
commit d0f6cbb02d
No known key found for this signature in database
GPG Key ID: D63C1EF81242354A
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ci/dev/vscode.patch
View File

@ -1466,10 +1466,10 @@ index 0000000000000000000000000000000000000000..6ce56bec114a6d8daf5dd3ded945ea78
+} +}
diff --git a/src/vs/server/node/channel.ts b/src/vs/server/node/channel.ts diff --git a/src/vs/server/node/channel.ts b/src/vs/server/node/channel.ts
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..7619b02f04b6e61e86e741b09b542d86fab97e3d index 0000000000000000000000000000000000000000..769d57953e782b7a72519599274630236114b17d
--- /dev/null --- /dev/null
+++ b/src/vs/server/node/channel.ts +++ b/src/vs/server/node/channel.ts
@@ -0,0 +1,887 @@ @@ -0,0 +1,889 @@
+import { field, logger } from '@coder/logger'; +import { field, logger } from '@coder/logger';
+import { Server } from '@coder/node-browser'; +import { Server } from '@coder/node-browser';
+import * as os from 'os'; +import * as os from 'os';
@ -1866,7 +1866,9 @@ index 0000000000000000000000000000000000000000..7619b02f04b6e61e86e741b09b542d86
+ return args.resolvedVariables[`config:${section}`]; + return args.resolvedVariables[`config:${section}`];
+ }, + },
+ getExecPath: (): string | undefined => { + 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 + // 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 + // and none of these resolver methods seem to get called so I don't know