From cb6374447511d2c9647ce197488ee853e1177afa Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Tue, 10 Nov 2020 11:07:00 +0100
Subject: [PATCH] Adopt TernarySearchTree#forUris2 (#110241)

---
 src/vs/platform/files/common/fileService.ts | 3 ++-
 src/vs/platform/files/common/files.ts       | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/vs/platform/files/common/fileService.ts b/src/vs/platform/files/common/fileService.ts
index b36a5aac681..8648504a3c5 100644
--- a/src/vs/platform/files/common/fileService.ts
+++ b/src/vs/platform/files/common/fileService.ts
@@ -180,6 +180,7 @@ export class FileService extends Disposable implements IFileService {
 	private async doResolveFile(resource: URI, options?: IResolveFileOptions): Promise<IFileStat>;
 	private async doResolveFile(resource: URI, options?: IResolveFileOptions): Promise<IFileStat> {
 		const provider = await this.withProvider(resource);
+		const isPathCaseSensitive = this.isPathCaseSensitive(provider);
 
 		const resolveTo = options?.resolveTo;
 		const resolveSingleChildDescendants = options?.resolveSingleChildDescendants;
@@ -193,7 +194,7 @@ export class FileService extends Disposable implements IFileService {
 
 			// lazy trie to check for recursive resolving
 			if (!trie) {
-				trie = TernarySearchTree.forUris<true>();
+				trie = TernarySearchTree.forUris2<true>(() => !isPathCaseSensitive);
 				trie.set(resource, true);
 				if (isNonEmptyArray(resolveTo)) {
 					resolveTo.forEach(uri => trie!.set(uri, true));
diff --git a/src/vs/platform/files/common/files.ts b/src/vs/platform/files/common/files.ts
index ed480b1c068..4232528124a 100644
--- a/src/vs/platform/files/common/files.ts
+++ b/src/vs/platform/files/common/files.ts
@@ -521,19 +521,19 @@ export class FileChangesEvent {
 			switch (change.type) {
 				case FileChangeType.ADDED:
 					if (!this.added) {
-						this.added = TernarySearchTree.forUris<IFileChange>(this.ignorePathCasing);
+						this.added = TernarySearchTree.forUris2<IFileChange>(() => this.ignorePathCasing);
 					}
 					this.added.set(change.resource, change);
 					break;
 				case FileChangeType.UPDATED:
 					if (!this.updated) {
-						this.updated = TernarySearchTree.forUris<IFileChange>(this.ignorePathCasing);
+						this.updated = TernarySearchTree.forUris2<IFileChange>(() => this.ignorePathCasing);
 					}
 					this.updated.set(change.resource, change);
 					break;
 				case FileChangeType.DELETED:
 					if (!this.deleted) {
-						this.deleted = TernarySearchTree.forUris<IFileChange>(this.ignorePathCasing);
+						this.deleted = TernarySearchTree.forUris2<IFileChange>(() => this.ignorePathCasing);
 					}
 					this.deleted.set(change.resource, change);
 					break;
-- 
GitLab