Handle /webview/vscode-resource/file urls

code-asher · code-asher · commit 95693fb58ed6 · 2019-10-24T14:35:25.000-05:00
See #1103.
diff --git a/src/node/server.ts b/src/node/server.ts
@@ -523,8 +523,8 @@ export class MainServer extends Server {
 				}
 				break;
 			case "/webview":
-				if (requestPath.indexOf("/vscode-resource") === 0) {
-					return this.getResource(requestPath.replace(/^\/vscode-resource/, ""));
+				if (/^\/vscode-resource/.test(requestPath)) {
+					return this.getResource(requestPath.replace(/^\/vscode-resource(\/file)?/, ""));
 				}
 				return this.getResource(
 					this.rootPath,

Original file line number	Diff line number	Diff line change
`@@ -523,8 +523,8 @@ export class MainServer extends Server {`
`523`	`523`	`}`
`524`	`524`	`break;`
`525`	`525`	`case "/webview":`
`526`		`- if (requestPath.indexOf("/vscode-resource") === 0) {`
`527`		`- return this.getResource(requestPath.replace(/^\/vscode-resource/, ""));`
	`526`	`+ if (/^\/vscode-resource/.test(requestPath)) {`
	`527`	`+ return this.getResource(requestPath.replace(/^\/vscode-resource(\/file)?/, ""));`
`528`	`528`	`}`
`529`	`529`	`return this.getResource(`
`530`	`530`	`this.rootPath,`