files - lazy trie

Benjamin Pasero · Benjamin Pasero · commit 78b0c662cf9c · 2019-08-06T10:22:16.000+02:00
diff --git a/src/vs/platform/files/common/fileService.ts b/src/vs/platform/files/common/fileService.ts
@@ -164,21 +164,25 @@ export class FileService extends Disposable implements IFileService {
 	private async doResolveFile(resource: URI, options?: IResolveFileOptions): Promise<IFileStat> {
 		const provider = await this.withProvider(resource);
 
-		// leverage a trie to check for recursive resolving
 		const resolveTo = options && options.resolveTo;
-		const trie = TernarySearchTree.forPaths<true>();
-		trie.set(resource.toString(), true);
-		if (isNonEmptyArray(resolveTo)) {
-			resolveTo.forEach(uri => trie.set(uri.toString(), true));
-		}
-
 		const resolveSingleChildDescendants = !!(options && options.resolveSingleChildDescendants);
 		const resolveMetadata = !!(options && options.resolveMetadata);
 
 		const stat = await provider.stat(resource);
 
+		let trie: TernarySearchTree<boolean> | undefined;
+
 		return this.toFileStat(provider, resource, stat, undefined, resolveMetadata, (stat, siblings) => {
 
+			// lazy trie to check for recursive resolving
+			if (!trie) {
+				trie = TernarySearchTree.forPaths<true>();
+				trie.set(resource.toString(), true);
+				if (isNonEmptyArray(resolveTo)) {
+					resolveTo.forEach(uri => trie!.set(uri.toString(), true));
+				}
+			}
+
 			// check for recursive resolving
 			if (Boolean(trie.findSuperstr(stat.resource.toString()) || trie.get(stat.resource.toString()))) {
 				return true;
