Skip to content

Commit 95ac0dd

Browse files
committed
Fix paths for Windows
- Fix vscode-remote-resource, #1397. - Fix double slash on webview, was causing images not to load. - Fix client-side tar paths.
1 parent 2e31e8f commit 95ac0dd

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

ci/dev/vscode.patch

+9-7
Original file line numberDiff line numberDiff line change
@@ -167,17 +167,19 @@ index 91b3b92678..f76f2c1548 100644
167167
"extensionAllowedProposedApi": [
168168
"ms-vscode.vscode-js-profile-table",
169169
diff --git a/src/vs/base/common/network.ts b/src/vs/base/common/network.ts
170-
index e4546b2cf6..ad2c544e89 100644
170+
index e4546b2cf6..9df12239fb 100644
171171
--- a/src/vs/base/common/network.ts
172172
+++ b/src/vs/base/common/network.ts
173-
@@ -94,16 +94,17 @@ class RemoteAuthoritiesImpl {
173+
@@ -94,16 +94,18 @@ class RemoteAuthoritiesImpl {
174174
if (host && host.indexOf(':') !== -1) {
175175
host = `[${host}]`;
176176
}
177177
- const port = this._ports[authority];
178178
+ // const port = this._ports[authority];
179179
const connectionToken = this._connectionTokens[authority];
180-
let query = `path=${encodeURIComponent(uri.path)}`;
180+
- let query = `path=${encodeURIComponent(uri.path)}`;
181+
+ // NOTE@coder: Use fsPath for Windows support.
182+
+ let query = `path=${encodeURIComponent(uri.fsPath)}`;
181183
if (typeof connectionToken === 'string') {
182184
query += `&tkn=${encodeURIComponent(connectionToken)}`;
183185
}
@@ -310,7 +312,7 @@ index 2c64061da7..c0ef8faedd 100644
310312
// Do nothing. If we can't read the file we have no
311313
// language pack config.
312314
diff --git a/src/vs/code/browser/workbench/workbench.ts b/src/vs/code/browser/workbench/workbench.ts
313-
index 556c03a03a..3b2a34e60d 100644
315+
index 556c03a03a..ac5d23ed8e 100644
314316
--- a/src/vs/code/browser/workbench/workbench.ts
315317
+++ b/src/vs/code/browser/workbench/workbench.ts
316318
@@ -12,6 +12,8 @@ import { request } from 'vs/base/parts/request/browser/request';
@@ -349,7 +351,7 @@ index 556c03a03a..3b2a34e60d 100644
349351

350352
- const config: IWorkbenchConstructionOptions & { folderUri?: UriComponents, workspaceUri?: UriComponents } = JSON.parse(configElementAttribute);
351353
+ const config: IWorkbenchConstructionOptions & { folderUri?: UriComponents, workspaceUri?: UriComponents } = {
352-
+ webviewEndpoint: `${window.location.origin}${window.location.pathname.replace(/\/+$/, '')}/webview/`,
354+
+ webviewEndpoint: `${window.location.origin}${window.location.pathname.replace(/\/+$/, '')}/webview`,
353355
+ ...JSON.parse(configElementAttribute),
354356
+ };
355357
+
@@ -971,7 +973,7 @@ index 0000000000..0d2e93edae
971973
+}
972974
diff --git a/src/vs/server/browser/worker.ts b/src/vs/server/browser/worker.ts
973975
new file mode 100644
974-
index 0000000000..a93381631a
976+
index 0000000000..8db1e17c38
975977
--- /dev/null
976978
+++ b/src/vs/server/browser/worker.ts
977979
@@ -0,0 +1,57 @@
@@ -994,7 +996,7 @@ index 0000000000..a93381631a
994996
+ scheme: self.location.protocol.replace(':', ''),
995997
+ authority: self.location.host,
996998
+ path: self.location.pathname.replace(/\/static\/([^\/]+)\/.*$/, '/static/$1\/'),
997-
+ query: `tar=${encodeURIComponent(module.extensionLocation.path)}`,
999+
+ query: `tar=${encodeURIComponent(module.extensionLocation.fsPath)}`,
9981000
+ });
9991001
+ const response = await fetch(fetchUri.toString(true));
10001002
+ if (response.status !== 200) {

0 commit comments

Comments
 (0)