Merge pull request intersystems-community#1144 from gjsjohnmurray/fix-1143

gjsjohnmurray · web-flow · commit 7b37ff0633a4 · 2023-05-11T13:13:20.000+01:00
Make folder-specific settings for ISFS folder work again
diff --git a/src/providers/FileSystemProvider/FileSystemProvider.ts b/src/providers/FileSystemProvider/FileSystemProvider.ts
@@ -145,7 +145,11 @@ export class FileSystemProvider implements vscode.FileSystemProvider {
   }
 
   public stat(uri: vscode.Uri): Promise<vscode.FileStat> {
-    uri = redirectDotvscodeRoot(uri);
+    const redirectedUri = redirectDotvscodeRoot(uri);
+    if (redirectedUri.path !== uri.path) {
+      // When redirecting the /.vscode subtree we must fill in as-yet-unvisited folders to fix https://github.com/intersystems-community/vscode-objectscript/issues/1143
+      return this._lookup(redirectedUri, true);
+    }
     return this._lookup(uri);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,11 @@ export class FileSystemProvider implements vscode.FileSystemProvider {`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`public stat(uri: vscode.Uri): Promise<vscode.FileStat> {`
`148`		`- uri = redirectDotvscodeRoot(uri);`
	`148`	`+ const redirectedUri = redirectDotvscodeRoot(uri);`
	`149`	`+ if (redirectedUri.path !== uri.path) {`
	`150`	`+ // When redirecting the /.vscode subtree we must fill in as-yet-unvisited folders to fix https://github.com/intersystems-community/vscode-objectscript/issues/1143`
	`151`	`+ return this._lookup(redirectedUri, true);`
	`152`	`+ }`
`149`	`153`	`return this._lookup(uri);`
`150`	`154`	`}`
`151`	`155`