mirror of
https://github.com/coder/code-server.git
synced 2024-12-26 11:12:07 +03:00
8377bd23df
* chore: upgrade Code to 1.74.1 * chore: remove require in integration.diff I don't know what the impact of this is but in192c67db71they removed the usage of `require` in `server.main.ts`. More details in PR: https://github.com/microsoft/vscode/pull/165831 * chore: update marketplace.diff * chore: update sha hash in webview.diff * chore: update disable-builtin-ext-update.diff If my logic is right, then this patch is now simplified thanks to this: https://github.com/microsoft/vscode/blob/1.74.1/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts#L1238 * chore: refresh proxy-uri patch * chore: refresh local-storage.diff * chore: refresh sourcemaps.diff * chore: refresh disable-downloads.diff * chore: refresh display-language.diff * chore: refresh getting-started.diff * docs: update testing notes for cli-window-open * docs: update telemetry testing instructions * fix: add GITHUB_TOKEN to build code-server job Downloading @vscode/ripgrep is failing only in CI so adding this environment variable to see if it increases the rate limit. Ref: https://github.com/microsoft/vscode-ripgrep#github-api-limit-note * refactor: use own cache key build code-server job * temp: disable vscode test * refactor: delete wrapper test * Revert "refactor: delete wrapper test" This reverts commit3999279b73. * refactor: move vscode tests to e2e (#5911) * wip: migrate vscode tests to e2e * feat: add codeWorkspace to global setup * refactor: only use dir in spawn when we should * wip: migrate more tests * refactor: move all vscode tests to e2e * refactor(ci): move unit to own job * fixup: add codecov to unit test step * Update test/e2e/models/CodeServer.ts * Update test/e2e/models/CodeServer.ts * docs: add note about intercept requests * refactor: rm unused clean() calls * refactor: delete duplicate test * refactor: update 'should not redirect' test * refactor: rm unused imports * refactor: rm unnecessary navigate call in test * fixup: formatting * wip: update test * refactor: modify assertion for proxy * fixup: use REVERSE_PROXY_BASE_PATH * refactor: add helper fn getMaybeProxiedPathname * fixup: formatting * fixup: rm unused import * chore: increase playwright timeout * Revert "chore: increase playwright timeout" This reverts commita059129252. * chore: rm timeout
35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
Make opening files/folders from the terminal only open in the current instance
|
|
|
|
Previously they would open in every code-server tab/window.
|
|
|
|
To test:
|
|
|
|
1. Run code-server
|
|
2. Open code-server
|
|
3. Open terminal
|
|
4. Open another code-server window
|
|
5. Run node ./out/node/entry.js with a file or directory argument
|
|
|
|
The file or directory should only open from the instance attached to that
|
|
terminal.
|
|
|
|
Index: code-server/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
|
|
===================================================================
|
|
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
|
|
+++ code-server/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
|
|
@@ -100,10 +100,14 @@ class RemoteTerminalBackend extends Base
|
|
}
|
|
const reqId = e.reqId;
|
|
const commandId = e.commandId;
|
|
+ const terminalId = e.persistentProcessId;
|
|
if (!allowedCommands.includes(commandId)) {
|
|
this._remoteTerminalChannel.sendCommandResult(reqId, true, 'Invalid remote cli command: ' + commandId);
|
|
return;
|
|
}
|
|
+ if (typeof terminalId !== "undefined" && !this._ptys.has(terminalId)) {
|
|
+ return
|
|
+ }
|
|
const commandArgs = e.commandArgs.map(arg => revive(arg));
|
|
try {
|
|
const result = await this._commandService.executeCommand(e.commandId, ...commandArgs);
|