Skip to content

Commit 89d78a5

Browse files
committed
Encode query params from open dialog
Fixes #1424.
1 parent 99dd2db commit 89d78a5

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

ci/vscode.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ index 2c64061da7..c0ef8faedd 100644
210210
// Do nothing. If we can't read the file we have no
211211
// language pack config.
212212
diff --git a/src/vs/code/browser/workbench/workbench.ts b/src/vs/code/browser/workbench/workbench.ts
213-
index 45f6f17ce0..ecdb80a5ba 100644
213+
index 45f6f17ce0..79fde0b92c 100644
214214
--- a/src/vs/code/browser/workbench/workbench.ts
215215
+++ b/src/vs/code/browser/workbench/workbench.ts
216216
@@ -246,12 +246,18 @@ class WorkspaceProvider implements IWorkspaceProvider {
@@ -219,7 +219,7 @@ index 45f6f17ce0..ecdb80a5ba 100644
219219
else if (isFolderToOpen(workspace)) {
220220
- targetHref = `${document.location.origin}${document.location.pathname}?${WorkspaceProvider.QUERY_PARAM_FOLDER}=${encodeURIComponent(workspace.folderUri.toString())}`;
221221
+ const target = workspace.folderUri.scheme === Schemas.vscodeRemote
222-
+ ? workspace.folderUri.path
222+
+ ? encodeURIComponent(workspace.folderUri.path).replace(/%2F/g, "/")
223223
+ : encodeURIComponent(workspace.folderUri.toString());
224224
+ targetHref = `${document.location.origin}${document.location.pathname}?${WorkspaceProvider.QUERY_PARAM_FOLDER}=${target}`;
225225
}
@@ -228,7 +228,7 @@ index 45f6f17ce0..ecdb80a5ba 100644
228228
else if (isWorkspaceToOpen(workspace)) {
229229
- targetHref = `${document.location.origin}${document.location.pathname}?${WorkspaceProvider.QUERY_PARAM_WORKSPACE}=${encodeURIComponent(workspace.workspaceUri.toString())}`;
230230
+ const target = workspace.workspaceUri.scheme === Schemas.vscodeRemote
231-
+ ? workspace.workspaceUri.path
231+
+ ? encodeURIComponent(workspace.workspaceUri.path).replace(/%2F/g, "/")
232232
+ : encodeURIComponent(workspace.workspaceUri.toString());
233233
+ targetHref = `${document.location.origin}${document.location.pathname}?${WorkspaceProvider.QUERY_PARAM_WORKSPACE}=${target}`;
234234
}

0 commit comments

Comments
 (0)