Improves splat tracking (now automatic)

Improves view initialization & reveal

Author: eamodio

src/views/branchesView.ts

@@ -64,7 +64,7 @@ export class BranchesViewNode extends RepositoriesSubscribeableNode<BranchesView
 			}
 
 			let repositories = this.view.container.git.openRepositories;
-			if (repositories.length === 0) {
+			if (!repositories.length) {
 				this.view.message = 'No branches could be found.';
 				return [];
 			}
@@ -80,9 +80,8 @@ export class BranchesViewNode extends RepositoriesSubscribeableNode<BranchesView
 				worktreesByBranch: worktreesByBranch?.size ? worktreesByBranch : undefined,
 			});
 
-			const splat = repositories.length === 1;
 			this.children = repositories.map(
-				r => new BranchesRepositoryNode(GitUri.fromRepoPath(r.path), this.view, this, splat, r),
+				r => new BranchesRepositoryNode(GitUri.fromRepoPath(r.path), this.view, this, r),
 			);
 		}
 
@@ -98,7 +97,7 @@ export class BranchesViewNode extends RepositoriesSubscribeableNode<BranchesView
 				filter: b =>
 					!b.remote || (showRemoteBranches && defaultRemote != null && b.getRemoteName() === defaultRemote),
 			});
-			if (branches.values.length === 0) {
+			if (!branches.values.length) {
 				this.view.message = 'No branches could be found.';
 				void child.ensureSubscription();
 

src/views/commitsView.ts

@@ -137,16 +137,15 @@ export class CommitsViewNode extends RepositoriesSubscribeableNode<CommitsView,
 			}
 
 			const repositories = this.view.container.git.openRepositories;
-			if (repositories.length === 0) {
+			if (!repositories.length) {
 				this.view.message = 'No commits could be found.';
 
 				return [];
 			}
 
-			const splat = repositories.length === 1;
 			this.children = repositories.map(
 				r =>
-					new CommitsRepositoryNode(GitUri.fromRepoPath(r.path), this.view, this, splat, r, {
+					new CommitsRepositoryNode(GitUri.fromRepoPath(r.path), this.view, this, r, {
 						showBranchAndLastFetched: true,
 					}),
 			);

src/views/contributorsView.ts

@@ -65,7 +65,7 @@ export class ContributorsViewNode extends RepositoriesSubscribeableNode<Contribu
 			}
 
 			let repositories = this.view.container.git.openRepositories;
-			if (repositories.length === 0) {
+			if (!repositories.length) {
 				this.view.message = 'No contributors could be found.';
 				return [];
 			}
@@ -78,9 +78,8 @@ export class ContributorsViewNode extends RepositoriesSubscribeableNode<Contribu
 				repositories = [...grouped.keys()];
 			}
 
-			const splat = repositories.length === 1;
 			this.children = repositories.map(
-				r => new ContributorsRepositoryNode(GitUri.fromRepoPath(r.path), this.view, this, splat, r),
+				r => new ContributorsRepositoryNode(GitUri.fromRepoPath(r.path), this.view, this, r),
 			);
 		}
 
@@ -103,7 +102,7 @@ export class ContributorsViewNode extends RepositoriesSubscribeableNode<Contribu
 			// }
 
 			// const contributors = await child.repo.getContributors({ all: all, ref: ref });
-			if (children.length === 0) {
+			if (!children.length) {
 				this.view.message = 'No contributors could be found.';
 				void child.ensureSubscription();
 

src/views/nodes/abstract/repositoriesSubscribeableNode.ts

@@ -14,7 +14,7 @@ export abstract class RepositoriesSubscribeableNode<
 	TChild extends ViewNode = ViewNode,
 > extends SubscribeableViewNode<'repositories', TView, TChild> {
 	constructor(view: TView) {
-		super('repositories', unknownGitUri, view, undefined, true);
+		super('repositories', unknownGitUri, view);
 	}
 
 	override async getSplattedChild(): Promise<TChild | undefined> {

src/views/nodes/abstract/repositoryFolderNode.ts

@@ -24,11 +24,10 @@ export abstract class RepositoryFolderNode<
 		uri: GitUri,
 		view: TView,
 		protected override readonly parent: ViewNode,
-		splatted: boolean,
 		public readonly repo: Repository,
 		private readonly options?: { showBranchAndLastFetched?: boolean },
 	) {
-		super('repo-folder', uri, view, parent, splatted);
+		super('repo-folder', uri, view, parent);
 
 		this.updateContext({ repository: this.repo });
 		this._uniqueId = getViewNodeId(this.type, this.context);

src/views/nodes/abstract/subscribeableViewNode.ts

@@ -21,8 +21,8 @@ export abstract class SubscribeableViewNode<
 
 	protected loaded: boolean = false;
 
-	constructor(type: Type, uri: GitUri, view: TView, parent?: ViewNode, splatted?: boolean) {
-		super(type, uri, view, parent, splatted);
+	constructor(type: Type, uri: GitUri, view: TView, parent?: ViewNode) {
+		super(type, uri, view, parent);
 
 		const disposables = [
 			weakEvent(this.view.onDidChangeVisibility, this.onVisibilityChanged, this),

src/views/nodes/abstract/viewNode.ts

@@ -157,7 +157,7 @@ export function getViewNodeId(type: string, context: AmbientContext): string {
 		uniqueness += `/worktree/${context.worktree.uri.path}`;
 	}
 	if (context.remote != null) {
-		uniqueness += `/remote/${context.remote.name}`;
+		uniqueness += `/remote/${context.remote.id}`;
 	}
 	if (context.tag != null) {
 		uniqueness += `/tag/${context.tag.id}`;
@@ -237,25 +237,35 @@ export abstract class ViewNode<
 		return types.includes(this.type as unknown as T[number]);
 	}
 
-	protected _uniqueId!: string;
-	splatted = false;
+	splatted: boolean | undefined;
+
 	// NOTE: @eamodio uncomment to track node leaks
 	// readonly uuid = uuid();
 
+	protected _uniqueId!: string;
+
 	constructor(
 		public readonly type: Type,
 		// public readonly id: string | undefined,
 		uri: GitUri,
 		public readonly view: TView,
 		protected parent?: ViewNode | undefined,
-		//** Indicates if this node is only shown as its children, not itself */
-		splatted?: boolean,
 	) {
-		this.splatted = splatted ?? false;
-
 		// NOTE: @eamodio uncomment to track node leaks
 		// queueMicrotask(() => this.view.registerNode(this));
 		this._uri = uri;
+
+		const originalGetChildren = this.getChildren;
+		this.getChildren = function (this: ViewNode) {
+			this.splatted ??= true;
+			return originalGetChildren.call(this);
+		};
+
+		const originalGetTreeItem = this.getTreeItem;
+		this.getTreeItem = function (this: ViewNode) {
+			this.splatted = false;
+			return originalGetTreeItem.call(this);
+		};
 	}
 
 	protected _disposed = false;

src/views/nodes/abstract/viewRefNode.ts

@@ -17,9 +17,8 @@ export abstract class ViewRefNode<
 		uri: GitUri,
 		view: TView,
 		protected override readonly parent: ViewNode,
-		splatted?: boolean,
 	) {
-		super(type, uri, view, parent, splatted);
+		super(type, uri, view, parent);
 	}
 
 	abstract get ref(): TReference;

src/views/nodes/branchNode.ts

@@ -82,7 +82,7 @@ export class BranchNode
 		public readonly root: boolean,
 		options?: Partial<Options>,
 	) {
-		super('branch', uri, view, parent, root);
+		super('branch', uri, view, parent);
 
 		this.updateContext({ repository: repo, branch: branch, root: root });
 		this._uniqueId = getViewNodeId(this.type, this.context);

src/views/nodes/branchesNode.ts

@@ -21,7 +21,7 @@ export class BranchesNode extends CacheableChildrenViewNode<'branches', ViewsWit
 		protected override readonly parent: ViewNode,
 		public readonly repo: Repository,
 	) {
-		super('branches', uri, view, parent, true);
+		super('branches', uri, view, parent);
 
 		this.updateContext({ repository: repo });
 		this._uniqueId = getViewNodeId(this.type, this.context);