Add back support for unencoded folder/workspace query params (microsoft#15)

* Add back support for unencoded folder/workspace query params

Fixes coder/code-server#4484.

* Standardize on @author for marking our changes

Author: code-asher

src/vs/code/browser/workbench/workbench.ts

@@ -17,6 +17,16 @@ import product from 'vs/platform/product/common/product';
 import { isFolderToOpen, isWorkspaceToOpen } from 'vs/platform/windows/common/windows';
 import { create, ICredentialsProvider, IURLCallbackProvider, IWorkbenchConstructionOptions, IWorkspace, IWorkspaceProvider } from 'vs/workbench/workbench.web.api';
 
+/**
+ * Encode a path for opening via the folder or workspace query parameter. This
+ * preserves slashes so it can be edited by hand more easily.
+ *
+ * @author coder
+ */
+export const encodePath = (path: string): string => {
+	return path.split('/').map((p) => encodeURIComponent(p)).join('/');
+};
+
 interface ICredential {
 	service: string;
 	account: string;
@@ -264,18 +274,43 @@ class WorkspaceProvider implements IWorkspaceProvider {
 		let workspace: IWorkspace;
 		let payload = Object.create(null);
 
+		/**
+		 * If the value begins with a slash assume it is a file path and convert it to
+		 * use the vscode-remote scheme.
+		 *
+		 * @author coder
+		 */
+		const toRemote = (value: string): string => {
+			if (value.startsWith("/")) {
+				return "vscode-remote://" + value;
+			}
+			return value
+		}
+
 		const query = new URL(document.location.href).searchParams;
 		query.forEach((value, key) => {
 			switch (key) {
 
 				// Folder
 				case WorkspaceProvider.QUERY_PARAM_FOLDER:
+					/**
+					 * Handle URIs that we previously left unencoded and de-schemed.
+					 *
+					 * @author coder
+					 */
+					value = toRemote(value);
 					workspace = { folderUri: URI.parse(value) };
 					foundWorkspace = true;
 					break;
 
 				// Workspace
 				case WorkspaceProvider.QUERY_PARAM_WORKSPACE:
+					/**
+					 * Handle URIs that we previously left unencoded and de-schemed.
+					 *
+					 * @author coder
+					 */
+					value = toRemote(value);
 					workspace = { workspaceUri: URI.parse(value) };
 					foundWorkspace = true;
 					break;
@@ -352,13 +387,27 @@ class WorkspaceProvider implements IWorkspaceProvider {
 		}
 
 		// Folder
+		/**
+		 * Modified to print as a human-readable string for file paths.
+		 * @author coder
+		 */
 		else if (isFolderToOpen(workspace)) {
-			targetHref = `${document.location.origin}${document.location.pathname}?${WorkspaceProvider.QUERY_PARAM_FOLDER}=${encodeURIComponent(workspace.folderUri.toString())}`;
+			const target = workspace.folderUri.scheme === Schemas.vscodeRemote
+				? encodePath(workspace.folderUri.path)
+				: encodeURIComponent(workspace.folderUri.toString());
+			targetHref = `${document.location.origin}${document.location.pathname}?${WorkspaceProvider.QUERY_PARAM_FOLDER}=${target}`;
 		}
 
 		// Workspace
+		/**
+		 * Modified to print as a human-readable string for file paths.
+		 * @author coder
+		 */
 		else if (isWorkspaceToOpen(workspace)) {
-			targetHref = `${document.location.origin}${document.location.pathname}?${WorkspaceProvider.QUERY_PARAM_WORKSPACE}=${encodeURIComponent(workspace.workspaceUri.toString())}`;
+			const target = workspace.workspaceUri.scheme === Schemas.vscodeRemote
+				? encodePath(workspace.workspaceUri.path)
+				: encodeURIComponent(workspace.workspaceUri.toString());
+			targetHref = `${document.location.origin}${document.location.pathname}?${WorkspaceProvider.QUERY_PARAM_WORKSPACE}=${target}`;
 		}
 
 		// Append payload if any