From 2f0878d9b7c4ae3cc6b9afcfcc3442308687bac3 Mon Sep 17 00:00:00 2001
From: Asher <ash@coder.com>
Date: Tue, 29 Oct 2019 11:23:34 -0500
Subject: [PATCH] Revert remote scheme change

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.
---
 scripts/vscode.patch       | 15 ++-------------
 src/node/uriTransformer.js |  9 +++------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/scripts/vscode.patch b/scripts/vscode.patch
index 27ef5acf5..41455f927 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 1312f5b2e..85865b2ec 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;
 			}
 		},