wbrawner/code-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert remote scheme change

Browse source 
It doesn't show in the explorer anymore so there's no point. Also remove
the local scheme transform which is no longer required with the latest
client-side extension implementation.
This commit is contained in:
Asher 2019-10-29 11:23:34 -05:00
parent f65c9b23fc
commit 2f0878d9b7
No known key found for this signature in database
GPG key ID: D63C1EF81242354A
2 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
scripts/vscode.patch
View file

@ -1,19 +1,8 @@
diff --git a/src/vs/base/common/network.ts b/src/vs/base/common/network.ts 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 --- a/src/vs/base/common/network.ts
+++ b/src/vs/base/common/network.ts +++ b/src/vs/base/common/network.ts
@@ -48,7 +48,9 @@ export namespace Schemas { @@ -96,12 +96,12 @@ class RemoteAuthoritiesImpl {
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 {
if (host && host.indexOf(':') !== -1) { if (host && host.indexOf(':') !== -1) {
host = `[${host}]`; host = `[${host}]`;
} }

9
src/node/uriTransformer.js
View file

@ -4,22 +4,19 @@ module.exports = (remoteAuthority) => {
return { return {
transformIncoming: (uri) => { transformIncoming: (uri) => {
switch (uri.scheme) { switch (uri.scheme) {
case "code-server": return { scheme: "file", path: uri.path }; case "vscode-remote": return { scheme: "file", path: uri.path };
case "file": return { scheme: "code-server", path: uri.path };
default: return uri; default: return uri;
} }
}, },
transformOutgoing: (uri) => { transformOutgoing: (uri) => {
switch (uri.scheme) { switch (uri.scheme) {
case "code-server": return { scheme: "file", path: uri.path }; case "file": return { scheme: "vscode-remote", authority: remoteAuthority, path: uri.path };
case "file": return { scheme: "code-server", authority: remoteAuthority, path: uri.path };
default: return uri; default: return uri;
} }
}, },
transformOutgoingScheme: (scheme) => { transformOutgoingScheme: (scheme) => {
switch (scheme) { switch (scheme) {
case "code-server": return "file"; case "file": return "vscode-local";
case "file": return "code-server";
default: return scheme; default: return scheme;
} }
}, },