Switches to use UriSet to remove duplicates

Author: eamodio

src/git/models/repository.ts

@@ -11,13 +11,14 @@ import type { RepoComparisonKey } from '../../repositories';
 import { asRepoComparisonKey } from '../../repositories';
 import { executeActionCommand } from '../../system/-webview/command';
 import { configuration } from '../../system/-webview/configuration';
+import { UriSet } from '../../system/-webview/uriMap';
 import { getScopedCounter } from '../../system/counter';
 import { gate } from '../../system/decorators/-webview/gate';
 import { memoize } from '../../system/decorators/-webview/memoize';
 import { debug, log, logName } from '../../system/decorators/log';
 import type { Deferrable } from '../../system/function/debounce';
 import { debounce } from '../../system/function/debounce';
-import { filter, groupByMap, join, min, some } from '../../system/iterable';
+import { filter, groupByMap, join, map, min, some } from '../../system/iterable';
 import { getLoggableName, Logger } from '../../system/logger';
 import { getLogScope, startLogScope } from '../../system/logger.scope';
 import { updateRecordValue } from '../../system/object';
@@ -139,7 +140,7 @@ export class RepositoryChangeEvent {
 
 export interface RepositoryFileSystemChangeEvent {
 	readonly repository: Repository;
-	readonly uris: Uri[];
+	readonly uris: UriSet;
 }
 
 const instanceCounter = getScopedCounter();
@@ -416,8 +417,8 @@ export class Repository implements Disposable {
 	}
 
 	private onFileSystemChanged(uri: Uri) {
-		// Ignore .git changes
-		if (/\.git(?:\/|\\|$)/.test(uri.fsPath)) return;
+		// Ignore node_modules and .git changes
+		if (/(?:(?:\/|\\)node_modules|\.git)(?:\/|\\|$)/.test(uri.fsPath)) return;
 
 		this._etagFileSystem = Date.now();
 		this.fireFileSystemChange(uri);
@@ -966,12 +967,18 @@ export class Repository implements Disposable {
 
 		this._fireFileSystemChangeDebounced ??= debounce(this.fireFileSystemChangeCore.bind(this), this._fsChangeDelay);
 
-		this._pendingFileSystemChange ??= { repository: this, uris: [] };
+		this._pendingFileSystemChange ??= { repository: this, uris: new UriSet() };
 		const e = this._pendingFileSystemChange;
-		e.uris.push(uri);
+		e.uris.add(uri);
 
 		if (this._suspended) {
-			Logger.debug(scope, `queueing suspended fs changes=${e.uris.map(u => u.fsPath).join(', ')}`);
+			Logger.debug(
+				scope,
+				`queueing suspended fs changes=${join(
+					map(e.uris, u => u.fsPath),
+					', ',
+				)}`,
+			);
 			return;
 		}
 
@@ -984,15 +991,21 @@ export class Repository implements Disposable {
 
 		this._pendingFileSystemChange = undefined;
 
-		const uris = await this.git.excludeIgnoredUris(e.uris);
-		if (uris.length === 0) return;
+		const uris = await this.git.excludeIgnoredUris([...e.uris]);
+		if (!uris.length) return;
 
-		if (uris.length !== e.uris.length) {
-			e = { ...e, uris: uris };
+		if (uris.length !== e.uris.size) {
+			e = { ...e, uris: new UriSet(uris) };
 		}
 
 		using scope = startLogScope(`${getLoggableName(this)}.fireChangeCore`, false);
-		Logger.debug(scope, `firing fs changes=${e.uris.map(u => u.fsPath).join(', ')}`);
+		Logger.debug(
+			scope,
+			`firing fs changes=${join(
+				map(e.uris, u => u.fsPath),
+				', ',
+			)}`,
+		);
 
 		this._onDidChangeFileSystem.fire(e);
 	}

src/system/iterable.ts

@@ -315,6 +315,10 @@ export function* skip<T>(source: Iterable<T> | IterableIterator<T>, count: numbe
 	}
 }
 
+export function slice<T>(source: Iterable<T> | IterableIterator<T>, start: number, end: number): Iterable<T> {
+	return skip(take(source, end), start);
+}
+
 export function some<T>(source: Iterable<T> | IterableIterator<T>, predicate?: (item: T) => boolean): boolean {
 	for (const item of source) {
 		if (predicate == null || predicate(item)) return true;

src/views/nodes/fileHistoryNode.ts

@@ -11,7 +11,7 @@ import { gate } from '../../system/decorators/-webview/gate';
 import { memoize } from '../../system/decorators/-webview/memoize';
 import { debug } from '../../system/decorators/log';
 import { weakEvent } from '../../system/event';
-import { filterMap, flatMap, map, uniqueBy } from '../../system/iterable';
+import { filterMap, flatMap, map, some, uniqueBy } from '../../system/iterable';
 import { getLoggableName, Logger } from '../../system/logger';
 import { startLogScope } from '../../system/logger.scope';
 import { basename } from '../../system/path';
@@ -226,8 +226,8 @@ export class FileHistoryNode
 
 	private onFileSystemChanged(e: RepositoryFileSystemChangeEvent) {
 		if (this.folder) {
-			if (!e.uris.some(uri => uri.fsPath.startsWith(this.uri.fsPath))) return;
-		} else if (!e.uris.some(uri => uri.toString() === this.uri.toString())) {
+			if (!some(e.uris, uri => uri.fsPath.startsWith(this.uri.fsPath))) return;
+		} else if (!e.uris.has(this.uri)) {
 			return;
 		}
 

src/views/nodes/lineHistoryNode.ts

@@ -228,7 +228,7 @@ export class LineHistoryNode
 	}
 
 	private onFileSystemChanged(e: RepositoryFileSystemChangeEvent) {
-		if (!e.uris.some(uri => uri.toString() === this.uri.toString())) return;
+		if (!e.uris.has(this.uri)) return;
 
 		using scope = startLogScope(
 			`${getLoggableName(this)}.onFileSystemChanged(e=${this.uri.toString(true)})`,

src/views/nodes/repositoryNode.ts

@@ -16,6 +16,7 @@ import { gate } from '../../system/decorators/-webview/gate';
 import { debug, log } from '../../system/decorators/log';
 import { weakEvent } from '../../system/event';
 import { disposableInterval } from '../../system/function';
+import { join, map, slice } from '../../system/iterable';
 import { pad } from '../../system/string';
 import type { ViewsWithRepositories } from '../viewBase';
 import { createViewDecorationUri } from '../viewDecorationProvider';
@@ -393,10 +394,10 @@ export class RepositoryNode extends SubscribeableViewNode<'repository', ViewsWit
 	@debug<RepositoryNode['onFileSystemChanged']>({
 		args: {
 			0: e =>
-				`{ repository: ${e.repository.name ?? ''}, uris(${e.uris.length}): [${e.uris
-					.slice(0, 1)
-					.map(u => u.fsPath)
-					.join(', ')}${e.uris.length > 1 ? ', ...' : ''}] }`,
+				`{ repository: ${e.repository.name ?? ''}, uris(${e.uris.size}): [${join(
+					map(slice(e.uris, 0, 1), u => u.fsPath),
+					', ',
+				)}${e.uris.size > 1 ? ', ...' : ''}] }`,
 		},
 	})
 	private async onFileSystemChanged(_e: RepositoryFileSystemChangeEvent) {