diff --git a/scripts/vscode.patch b/scripts/vscode.patch index 27ef5acf..41455f92 100644 --- a/scripts/vscode.patch +++ b/scripts/vscode.patch @@ -1,19 +1,8 @@ diff --git a/src/vs/base/common/network.ts b/src/vs/base/common/network.ts -index 6d41e85e42..f845d0bf9e 100644 +index 6d41e85e42..64f39687a4 100644 --- a/src/vs/base/common/network.ts +++ b/src/vs/base/common/network.ts -@@ -48,7 +48,9 @@ export namespace Schemas { - - export const command: string = 'command'; - -- export const vscodeRemote: string = 'vscode-remote'; -+ // NOTE@coder: Changed this so it'll be reflected in the explorer to prevent -+ // confusion with vscode-remote itself. -+ export const vscodeRemote: string = 'code-server'; - - export const vscodeRemoteResource: string = 'vscode-remote-resource'; - -@@ -96,12 +98,12 @@ class RemoteAuthoritiesImpl { +@@ -96,12 +96,12 @@ class RemoteAuthoritiesImpl { if (host && host.indexOf(':') !== -1) { host = `[${host}]`; } diff --git a/src/node/uriTransformer.js b/src/node/uriTransformer.js index 1312f5b2..85865b2e 100644 --- a/src/node/uriTransformer.js +++ b/src/node/uriTransformer.js @@ -4,22 +4,19 @@ module.exports = (remoteAuthority) => { return { transformIncoming: (uri) => { switch (uri.scheme) { - case "code-server": return { scheme: "file", path: uri.path }; - case "file": return { scheme: "code-server", path: uri.path }; + case "vscode-remote": return { scheme: "file", path: uri.path }; default: return uri; } }, transformOutgoing: (uri) => { switch (uri.scheme) { - case "code-server": return { scheme: "file", path: uri.path }; - case "file": return { scheme: "code-server", authority: remoteAuthority, path: uri.path }; + case "file": return { scheme: "vscode-remote", authority: remoteAuthority, path: uri.path }; default: return uri; } }, transformOutgoingScheme: (scheme) => { switch (scheme) { - case "code-server": return "file"; - case "file": return "code-server"; + case "file": return "vscode-local"; default: return scheme; } },