Merge pull request #100 from gjsjohnmurray/fix-99

gjsjohnmurray · web-flow · commit 5458d3aa0691 · 2021-06-25T13:24:03.000+01:00
fix #99 do not add `pathPrefix` to the isfs uri
diff --git a/src/extension.ts b/src/extension.ts
@@ -228,7 +228,7 @@ export function activate(context: vscode.ExtensionContext) {
                         return;
                     }
 
-                    const uri = vscode.Uri.parse(`isfs${readonly ? "-readonly" : ""}://${serverName}:${namespace}${serverSpec.webServer.pathPrefix || ''}/${csp ? '?csp' : ''}`);
+                    const uri = vscode.Uri.parse(`isfs${readonly ? "-readonly" : ""}://${serverName}:${namespace}/${csp ? '?csp' : ''}`);
                     if ((vscode.workspace.workspaceFolders || []).filter((workspaceFolder) => workspaceFolder.uri.toString() === uri.toString()).length === 0) {                       
                         const label = `${serverName}:${namespace}${csp ? ' webfiles' : ''}${readonly ? " (read-only)" : ""}`;
                         const added = vscode.workspace.updateWorkspaceFolders(

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ export function activate(context: vscode.ExtensionContext) {`
`228`	`228`	`return;`
`229`	`229`	`}`
`230`	`230`
`231`		- const uri = vscode.Uri.parse(`isfs${readonly ? "-readonly" : ""}://${serverName}:${namespace}${serverSpec.webServer.pathPrefix \|\| ''}/${csp ? '?csp' : ''}`);
	`231`	+ const uri = vscode.Uri.parse(`isfs${readonly ? "-readonly" : ""}://${serverName}:${namespace}/${csp ? '?csp' : ''}`);
`232`	`232`	`if ((vscode.workspace.workspaceFolders \|\| []).filter((workspaceFolder) => workspaceFolder.uri.toString() === uri.toString()).length === 0) {`
`233`	`233`	const label = `${serverName}:${namespace}${csp ? ' webfiles' : ''}${readonly ? " (read-only)" : ""}`;
`234`	`234`	`const added = vscode.workspace.updateWorkspaceFolders(`