Only emit when Uri changes

cooolbros · Nov 27, 2024 · 6a35078 · 6a35078
1 parent 29bed4b
commit 6a35078
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/packages/client/src/VirtualFileSystem/VirtualFileSystem.ts b/packages/client/src/VirtualFileSystem/VirtualFileSystem.ts
@@ -1,5 +1,5 @@
-import type { Uri } from "common/Uri"
-import { combineLatest, map, Observable } from "rxjs"
+import { Uri } from "common/Uri"
+import { combineLatest, distinctUntilChanged, map, Observable } from "rxjs"
 import type { FileSystemMountPoint } from "./FileSystemMountPoint"
 
 /**
@@ -12,7 +12,8 @@ export function VirtualFileSystem(fileSystems: FileSystemMountPoint[]): FileSyst
 			let observable = observables.get(path)
 			if (!observable) {
 				observable = combineLatest(fileSystems.map((fileSystem) => fileSystem.resolveFile(path))).pipe(
-					map((uris) => uris.find((uri) => uri != null) ?? null)
+					map((uris) => uris.find((uri) => uri != null) ?? null),
+					distinctUntilChanged(Uri.equals)
 				)
 				observables.set(path, observable)
 			}

diff --git a/packages/client/src/VirtualFileSystem/mounts/TeamFortress2FileSystem.ts b/packages/client/src/VirtualFileSystem/mounts/TeamFortress2FileSystem.ts
@@ -1,5 +1,5 @@
-import type { Uri } from "common/Uri"
-import { combineLatest, map, Observable } from "rxjs"
+import { Uri } from "common/Uri"
+import { combineLatest, distinctUntilChanged, map, Observable } from "rxjs"
 import { VDF } from "vdf"
 import * as vscode from "vscode"
 import { z } from "zod"
@@ -84,7 +84,8 @@ export async function TeamFortress2FileSystem(teamFortress2Folder: Uri, factory:
 			let observable = observables.get(path)
 			if (!observable) {
 				observable = combineLatest(fileSystems.map((fileSystem) => fileSystem.resolveFile(path))).pipe(
-					map((uris) => uris.find((uri) => uri != null) ?? null)
+					map((uris) => uris.find((uri) => uri != null) ?? null),
+					distinctUntilChanged(Uri.equals)
 				)
 				observables.set(path, observable)
 			}

diff --git a/packages/client/src/VirtualFileSystem/mounts/WildcardFileSystem.ts b/packages/client/src/VirtualFileSystem/mounts/WildcardFileSystem.ts
@@ -1,5 +1,5 @@
 import { Uri } from "common/Uri"
-import { BehaviorSubject, map, Observable, Subscription } from "rxjs"
+import { BehaviorSubject, distinctUntilChanged, map, Observable, Subscription } from "rxjs"
 import * as vscode from "vscode"
 import type { FileSystemMountPoint } from "../FileSystemMountPoint"
 import type { FileSystemMountPointFactory } from "../FileSystemMountPointFactory"
@@ -144,7 +144,8 @@ export async function WildcardFileSystem(uri: Uri, factory: FileSystemMountPoint
 						})
 					},
 					map((uris) => uris.map(({ value }) => value)),
-					map((uris) => uris.find((uri) => uri != null) ?? null)
+					map((uris) => uris.find((uri) => uri != null) ?? null),
+					distinctUntilChanged(Uri.equals)
 				)
 				observables.set(path, observable)
 			}

diff --git a/packages/common/src/Uri.ts b/packages/common/src/Uri.ts
@@ -12,6 +12,18 @@ export class Uri {
 		fragment: z.string(),
 	}).transform((arg) => new Uri(arg))
 
+	public static equals(a: Uri | null, b: Uri | null): boolean {
+		if (a == b) {
+			return true
+		}
+
+		if (a != null && b != null) {
+			return a.equals(b)
+		}
+
+		return false
+	}
+
 	private readonly uri: URI
 
 	public readonly scheme: string