Support trailing slash in isfs directory URIs (#1357)

intersystems-community · May 9, 2024 · 28a504b · 28a504b
1 parent cee4a1e
commit 28a504b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/providers/FileSystemProvider/FileSystemProvider.ts b/src/providers/FileSystemProvider/FileSystemProvider.ts
@@ -218,7 +218,7 @@ export class FileSystemProvider implements vscode.FileSystemProvider {
           if (!entry.Name.includes(".")) {
             if (!parent.entries.has(entry.Name)) {
               const folder = !csp
-                ? uri.path.replace(/\//g, ".")
+                ? uri.path.replace(/\/$/, "").replace(/\//g, ".")
                 : uri.path === "/"
                 ? ""
                 : uri.path.endsWith("/")
@@ -247,7 +247,7 @@ export class FileSystemProvider implements vscode.FileSystemProvider {
     }
     const csp = params.has("csp") && ["", "1"].includes(params.get("csp"));
     const folder = !csp
-      ? uri.path.replace(/\//g, ".")
+      ? uri.path.replace(/\/$/, "").replace(/\//g, ".")
       : uri.path === "/"
       ? ""
       : uri.path.endsWith("/")

diff --git a/src/utils/FileProviderUtil.ts b/src/utils/FileProviderUtil.ts
@@ -110,7 +110,7 @@ export function fileSpecFromURI(uri: vscode.Uri): string {
   const csp = params.has("csp") && ["", "1"].includes(params.get("csp"));
 
   const folder = !csp
-    ? uri.path.replace(/\//g, ".")
+    ? uri.path.replace(/\/$/, "").replace(/\//g, ".")
     : uri.path === "/"
     ? ""
     : uri.path.endsWith("/")