Skip to content

Commit 444745a

Browse files
committed
fix: invoking code-server in integrated terminal
1 parent 40b650b commit 444745a

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed

patches/bin-path.diff

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
Use our own bin directory
2+
3+
To test run `code-server` in an integrated terminal. It should spawn our
4+
script and allow you to do things like open files in the current instance.
5+
6+
Index: code-server/lib/vscode/src/vs/server/node/extensionHostConnection.ts
7+
===================================================================
8+
--- code-server.orig/lib/vscode/src/vs/server/node/extensionHostConnection.ts
9+
+++ code-server/lib/vscode/src/vs/server/node/extensionHostConnection.ts
10+
@@ -53,7 +53,7 @@ export async function buildUserEnvironme
11+
};
12+
13+
const binFolder = environmentService.isBuilt ? join(environmentService.appRoot, 'bin') : join(environmentService.appRoot, 'resources', 'server', 'bin-dev');
14+
- const remoteCliBinFolder = join(binFolder, 'remote-cli'); // contains the `code` command that can talk to the remote server
15+
+ const remoteCliBinFolder = join(environmentService.appRoot, '../../bin'); // contains the `code` command that can talk to the remote server
16+
17+
let PATH = readCaseInsensitive(env, 'PATH');
18+
if (PATH) {

patches/series

+1
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ disable-downloads.diff
2020
telemetry.diff
2121
display-language.diff
2222
cli-window-open.diff
23+
bin-path.diff

0 commit comments

Comments
 (0)