From aa8083f4193f36c84e2f21b6d49a27109c2a4724 Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 21 Dec 2021 19:07:18 +0000 Subject: [PATCH 1/2] Remove unused patch --- src/vs/server/@types/code-server-lib/index.d.ts | 2 -- src/vs/server/remoteCli.ts | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/vs/server/@types/code-server-lib/index.d.ts b/src/vs/server/@types/code-server-lib/index.d.ts index 452356912b04b..fac75f986bf94 100644 --- a/src/vs/server/@types/code-server-lib/index.d.ts +++ b/src/vs/server/@types/code-server-lib/index.d.ts @@ -125,8 +125,6 @@ declare global { executableName: string; } - export type RemoteCLIMain = (desc: ProductDescription, args: string[]) => void; - export interface IServerAPI { handleRequest(req: http.IncomingMessage, res: http.ServerResponse): Promise; handleUpgrade(req: http.IncomingMessage, socket: net.Socket): void; diff --git a/src/vs/server/remoteCli.ts b/src/vs/server/remoteCli.ts index faaf2e537552b..f09624b6e1cd6 100644 --- a/src/vs/server/remoteCli.ts +++ b/src/vs/server/remoteCli.ts @@ -410,6 +410,5 @@ function mapFileToRemoteUri(uri: string): string { return uri.replace(/^file:\/\//, 'vscode-remote://' + cliRemoteAuthority); } -// let [, , productName, version, commit, executableName, ...remainingArgs] = process.argv; -// main({ productName, version, commit, executableName }, remainingArgs); - +let [, , productName, version, commit, executableName, ...remainingArgs] = process.argv; +main({ productName, version, commit, executableName }, remainingArgs); From e7150619888e557af03bef12abb84302bf89818d Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 21 Dec 2021 19:31:23 +0000 Subject: [PATCH 2/2] Restore socket write patch This allows external processes to read the socket or pipe and open files in VS Code. --- src/vs/workbench/api/node/extHostExtensionService.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts index b237c4e4e635e..a0aaefd1f53c1 100644 --- a/src/vs/workbench/api/node/extHostExtensionService.ts +++ b/src/vs/workbench/api/node/extHostExtensionService.ts @@ -3,6 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { promises as fs } from 'fs'; +import * as os from 'os' +import * as path from 'vs/base/common/path'; import * as performance from 'vs/base/common/performance'; import { createApiFactoryAndRegisterActors } from 'vs/workbench/api/common/extHost.api.impl'; import { RequireInterceptor } from 'vs/workbench/api/common/extHostRequireInterceptor'; @@ -59,6 +62,14 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService { if (this._initData.remote.isRemote && this._initData.remote.authority) { const cliServer = this._instaService.createInstance(CLIServer); process.env['VSCODE_IPC_HOOK_CLI'] = cliServer.ipcHandlePath; + + /** + * Write this out so we can get the most recent path. + * @author coder + */ + fs.writeFile(path.join(os.tmpdir(), 'vscode-ipc'), cliServer.ipcHandlePath).catch((error) => { + this._logService.error(error); + }); } // Module loading tricks