Consolidates view node splatting

eamodio · eamodio · commit 097c74f3792c · 2024-12-02T14:52:46.000-05:00
diff --git a/src/views/branchesView.ts b/src/views/branchesView.ts
@@ -76,7 +76,7 @@ export class BranchesViewNode extends RepositoriesSubscribeableNode<BranchesView
 
 			const splat = repositories.length === 1;
 			this.children = repositories.map(
-				r => new BranchesRepositoryNode(GitUri.fromRepoPath(r.path), this.view, this, r, splat),
+				r => new BranchesRepositoryNode(GitUri.fromRepoPath(r.path), this.view, this, splat, r),
 			);
 		}
 
diff --git a/src/views/commitsView.ts b/src/views/commitsView.ts
@@ -136,7 +136,7 @@ export class CommitsViewNode extends RepositoriesSubscribeableNode<CommitsView,
 			const splat = repositories.length === 1;
 			this.children = repositories.map(
 				r =>
-					new CommitsRepositoryNode(GitUri.fromRepoPath(r.path), this.view, this, r, splat, {
+					new CommitsRepositoryNode(GitUri.fromRepoPath(r.path), this.view, this, splat, r, {
 						showBranchAndLastFetched: true,
 					}),
 			);
diff --git a/src/views/contributorsView.ts b/src/views/contributorsView.ts
@@ -76,7 +76,7 @@ export class ContributorsViewNode extends RepositoriesSubscribeableNode<Contribu
 
 			const splat = repositories.length === 1;
 			this.children = repositories.map(
-				r => new ContributorsRepositoryNode(GitUri.fromRepoPath(r.path), this.view, this, r, splat),
+				r => new ContributorsRepositoryNode(GitUri.fromRepoPath(r.path), this.view, this, splat, r),
 			);
 		}
 
diff --git a/src/views/nodes/abstract/repositoriesSubscribeableNode.ts b/src/views/nodes/abstract/repositoriesSubscribeableNode.ts
@@ -13,10 +13,8 @@ export abstract class RepositoriesSubscribeableNode<
 	TView extends View = View,
 	TChild extends ViewNode = ViewNode,
 > extends SubscribeableViewNode<'repositories', TView, TChild> {
-	protected override splatted = true;
-
 	constructor(view: TView) {
-		super('repositories', unknownGitUri, view);
+		super('repositories', unknownGitUri, view, undefined, true);
 	}
 
 	override async getSplattedChild() {
diff --git a/src/views/nodes/abstract/repositoryFolderNode.ts b/src/views/nodes/abstract/repositoryFolderNode.ts
@@ -19,22 +19,18 @@ export abstract class RepositoryFolderNode<
 	TView extends View = View,
 	TChild extends ViewNode = ViewNode,
 > extends SubscribeableViewNode<'repo-folder', TView> {
-	protected override splatted = true;
-
 	constructor(
 		uri: GitUri,
 		view: TView,
 		protected override readonly parent: ViewNode,
-		public readonly repo: Repository,
 		splatted: boolean,
+		public readonly repo: Repository,
 		private readonly options?: { showBranchAndLastFetched?: boolean },
 	) {
-		super('repo-folder', uri, view, parent);
+		super('repo-folder', uri, view, parent, splatted);
 
 		this.updateContext({ repository: this.repo });
 		this._uniqueId = getViewNodeId(this.type, this.context);
-
-		this.splatted = splatted;
 	}
 
 	private _child: TChild | undefined;
@@ -66,8 +62,6 @@ export abstract class RepositoryFolderNode<
 	}
 
 	async getTreeItem(): Promise<TreeItem> {
-		this.splatted = false;
-
 		const branch = await this.repo.git.getBranch();
 		const ahead = (branch?.state.ahead ?? 0) > 0;
 		const behind = (branch?.state.behind ?? 0) > 0;
diff --git a/src/views/nodes/abstract/subscribeableViewNode.ts b/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) {
-		super(type, uri, view, parent);
+	constructor(type: Type, uri: GitUri, view: TView, parent?: ViewNode, splatted?: boolean) {
+		super(type, uri, view, parent, splatted);
 
 		const disposables = [
 			weakEvent(this.view.onDidChangeVisibility, this.onVisibilityChanged, this),
diff --git a/src/views/nodes/abstract/viewNode.ts b/src/views/nodes/abstract/viewNode.ts
@@ -253,7 +253,7 @@ export abstract class ViewNode<
 	}
 
 	protected _uniqueId!: string;
-	protected splatted = false;
+	splatted = false;
 	// NOTE: @eamodio uncomment to track node leaks
 	// readonly uuid = uuid();
 
@@ -262,8 +262,12 @@ export abstract class ViewNode<
 		// public readonly id: string | undefined,
 		uri: GitUri,
 		public readonly view: TView,
-		protected parent?: ViewNode,
+		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;
@@ -339,32 +343,36 @@ export abstract class ViewNode<
 
 	getSplattedChild?(): Promise<ViewNode | undefined>;
 
+	protected get storedId(): string | undefined {
+		return this.id;
+	}
+
 	deleteState<T extends StateKey<State> = StateKey<State>>(key?: T): void {
-		if (this.id == null) {
+		if (this.storedId == null) {
 			debugger;
 			throw new Error('Id is required to delete state');
 		}
-		this.view.nodeState.deleteState(this.id, key as string);
+		this.view.nodeState.deleteState(this.storedId, key as string);
 	}
 
 	getState<T extends StateKey<State> = StateKey<State>>(key: T): StateValue<State, T> | undefined {
-		if (this.id == null) {
+		if (this.storedId == null) {
 			debugger;
 			throw new Error('Id is required to get state');
 		}
-		return this.view.nodeState.getState(this.id, key as string);
+		return this.view.nodeState.getState(this.storedId, key as string);
 	}
 
 	storeState<T extends StateKey<State> = StateKey<State>>(
 		key: T,
 		value: StateValue<State, T>,
 		sticky?: boolean,
 	): void {
-		if (this.id == null) {
+		if (this.storedId == null) {
 			debugger;
 			throw new Error('Id is required to store state');
 		}
-		this.view.nodeState.storeState(this.id, key as string, value, sticky);
+		this.view.nodeState.storeState(this.storedId, key as string, value, sticky);
 	}
 }
 
diff --git a/src/views/nodes/abstract/viewRefNode.ts b/src/views/nodes/abstract/viewRefNode.ts
@@ -17,8 +17,9 @@ export abstract class ViewRefNode<
 		uri: GitUri,
 		view: TView,
 		protected override readonly parent: ViewNode,
+		splatted?: boolean,
 	) {
-		super(type, uri, view, parent);
+		super(type, uri, view, parent, splatted);
 	}
 
 	abstract get ref(): TReference;
diff --git a/src/views/nodes/branchNode.ts b/src/views/nodes/branchNode.ts
@@ -69,7 +69,6 @@ export class BranchNode
 	limit: number | undefined;
 
 	private readonly options: Options;
-	protected override splatted = true;
 
 	constructor(
 		uri: GitUri,
@@ -81,7 +80,7 @@ export class BranchNode
 		public readonly root: boolean,
 		options?: Partial<Options>,
 	) {
-		super('branch', uri, view, parent);
+		super('branch', uri, view, parent, root);
 
 		this.updateContext({ repository: repo, branch: branch, root: root });
 		this._uniqueId = getViewNodeId(this.type, this.context);
@@ -418,8 +417,6 @@ export class BranchNode
 	}
 
 	async getTreeItem(): Promise<TreeItem> {
-		this.splatted = false;
-
 		const parts = await getBranchNodeParts(this.view.container, this.branch, this.current, {
 			pendingPullRequest: this.getState('pendingPullRequest'),
 			showAsCommits: this.options.showAsCommits,
diff --git a/src/views/nodes/branchesNode.ts b/src/views/nodes/branchesNode.ts
@@ -19,7 +19,7 @@ export class BranchesNode extends CacheableChildrenViewNode<'branches', ViewsWit
 		protected override readonly parent: ViewNode,
 		public readonly repo: Repository,
 	) {
-		super('branches', uri, view, parent);
+		super('branches', uri, view, parent, true);
 
 		this.updateContext({ repository: repo });
 		this._uniqueId = getViewNodeId(this.type, this.context);
diff --git a/src/views/nodes/contributorsNode.ts b/src/views/nodes/contributorsNode.ts
@@ -17,16 +17,14 @@ export class ContributorsNode extends CacheableChildrenViewNode<
 	ViewsWithContributorsNode,
 	ContributorNode
 > {
-	protected override splatted = true;
-
 	constructor(
 		uri: GitUri,
 		view: ViewsWithContributorsNode,
 		protected override readonly parent: ViewNode,
 		public readonly repo: Repository,
 		private readonly options?: { all?: boolean; showMergeCommits?: boolean; stats?: boolean },
 	) {
-		super('contributors', uri, view, parent);
+		super('contributors', uri, view, parent, true);
 
 		this.updateContext({ repository: repo });
 		this._uniqueId = getViewNodeId(this.type, this.context);
@@ -83,8 +81,6 @@ export class ContributorsNode extends CacheableChildrenViewNode<
 	}
 
 	getTreeItem(): TreeItem {
-		this.splatted = false;
-
 		const item = new TreeItem('Contributors', TreeItemCollapsibleState.Collapsed);
 		item.id = this.id;
 		item.contextValue = ContextValues.Contributors;
diff --git a/src/views/nodes/fileHistoryNode.ts b/src/views/nodes/fileHistoryNode.ts
@@ -29,16 +29,14 @@ export class FileHistoryNode
 {
 	limit: number | undefined;
 
-	protected override splatted = true;
-
 	constructor(
 		uri: GitUri,
 		view: FileHistoryView,
 		protected override readonly parent: ViewNode,
 		private readonly folder: boolean,
 		private readonly branch: GitBranch | undefined,
 	) {
-		super('file-history', uri, view, parent);
+		super('file-history', uri, view, parent, true);
 
 		if (branch != null) {
 			this.updateContext({ branch: branch });
@@ -148,8 +146,6 @@ export class FileHistoryNode
 	}
 
 	getTreeItem(): TreeItem {
-		this.splatted = false;
-
 		const label = this.label;
 		const item = new TreeItem(label, TreeItemCollapsibleState.Expanded);
 		item.contextValue = ContextValues.FileHistory;
diff --git a/src/views/nodes/fileHistoryTrackerNode.ts b/src/views/nodes/fileHistoryTrackerNode.ts
@@ -22,10 +22,9 @@ import { FileHistoryNode } from './fileHistoryNode';
 
 export class FileHistoryTrackerNode extends SubscribeableViewNode<'file-history-tracker', FileHistoryView> {
 	private _base: string | undefined;
-	protected override splatted = true;
 
 	constructor(view: FileHistoryView) {
-		super('file-history-tracker', unknownGitUri, view);
+		super('file-history-tracker', unknownGitUri, view, undefined, true);
 	}
 
 	override dispose() {
@@ -85,8 +84,6 @@ export class FileHistoryTrackerNode extends SubscribeableViewNode<'file-history-
 	}
 
 	getTreeItem(): TreeItem {
-		this.splatted = false;
-
 		const item = new TreeItem('File History', TreeItemCollapsibleState.Expanded);
 		item.contextValue = ContextValues.ActiveFileHistory;
 
diff --git a/src/views/nodes/lineHistoryNode.ts b/src/views/nodes/lineHistoryNode.ts
@@ -30,8 +30,6 @@ export class LineHistoryNode
 {
 	limit: number | undefined;
 
-	protected override splatted = true;
-
 	constructor(
 		uri: GitUri,
 		view: FileHistoryView | LineHistoryView,
@@ -40,7 +38,7 @@ export class LineHistoryNode
 		public readonly selection: Selection,
 		private readonly editorContents: string | undefined,
 	) {
-		super('line-history', uri, view, parent);
+		super('line-history', uri, view, parent, true);
 
 		if (branch != null) {
 			this.updateContext({ branch: branch });
@@ -163,8 +161,6 @@ export class LineHistoryNode
 	}
 
 	getTreeItem(): TreeItem {
-		this.splatted = false;
-
 		const label = this.label;
 		const item = new TreeItem(label, TreeItemCollapsibleState.Expanded);
 		item.contextValue = ContextValues.LineHistory;
diff --git a/src/views/nodes/lineHistoryTrackerNode.ts b/src/views/nodes/lineHistoryTrackerNode.ts
@@ -28,10 +28,9 @@ export class LineHistoryTrackerNode extends SubscribeableViewNode<
 	private _base: string | undefined;
 	private _editorContents: string | undefined;
 	private _selection: Selection | undefined;
-	protected override splatted = true;
 
 	constructor(view: FileHistoryView | LineHistoryView) {
-		super('line-history-tracker', unknownGitUri, view);
+		super('line-history-tracker', unknownGitUri, view, undefined, true);
 	}
 
 	override dispose() {
@@ -96,8 +95,6 @@ export class LineHistoryTrackerNode extends SubscribeableViewNode<
 	}
 
 	getTreeItem(): TreeItem {
-		this.splatted = false;
-
 		const item = new TreeItem('Line History', TreeItemCollapsibleState.Expanded);
 		item.contextValue = ContextValues.ActiveLineHistory;
 
diff --git a/src/views/nodes/resultsCommitsNode.ts b/src/views/nodes/resultsCommitsNode.ts
@@ -51,7 +51,7 @@ export class ResultsCommitsNode<View extends ViewsWithCommits = ViewsWithCommits
 		options?: Partial<Options>,
 		splatted?: boolean,
 	) {
-		super('results-commits', GitUri.fromRepoPath(repoPath), view, parent);
+		super('results-commits', GitUri.fromRepoPath(repoPath), view, parent, splatted);
 
 		if (_results.direction != null) {
 			this.updateContext({ branchStatusUpstreamType: _results.direction });
@@ -60,9 +60,6 @@ export class ResultsCommitsNode<View extends ViewsWithCommits = ViewsWithCommits
 		this.limit = this.view.getNodeLastKnownLimit(this);
 
 		this._options = { autolinks: true, expand: true, ...options };
-		if (splatted != null) {
-			this.splatted = splatted;
-		}
 	}
 
 	override get id(): string {
diff --git a/src/views/nodes/worktreeNode.ts b/src/views/nodes/worktreeNode.ts
@@ -190,8 +190,6 @@ export class WorktreeNode extends CacheableChildrenViewNode<'worktree', ViewsWit
 	}
 
 	async getTreeItem(): Promise<TreeItem> {
-		this.splatted = false;
-
 		let description = '';
 		let icon: IconPath | undefined;
 		let hasChanges = false;
diff --git a/src/views/remotesView.ts b/src/views/remotesView.ts
@@ -68,7 +68,7 @@ export class RemotesViewNode extends RepositoriesSubscribeableNode<RemotesView,
 
 			const splat = repositories.length === 1;
 			this.children = repositories.map(
-				r => new RemotesRepositoryNode(GitUri.fromRepoPath(r.path), this.view, this, r, splat),
+				r => new RemotesRepositoryNode(GitUri.fromRepoPath(r.path), this.view, this, splat, r),
 			);
 		}
 
diff --git a/src/views/searchAndCompareView.ts b/src/views/searchAndCompareView.ts
@@ -29,11 +29,10 @@ import { disposeChildren, ViewBase } from './viewBase';
 import { registerViewCommand } from './viewCommands';
 
 export class SearchAndCompareViewNode extends ViewNode<'search-compare', SearchAndCompareView> {
-	protected override splatted = true;
 	private comparePicker: ComparePickerNode | undefined;
 
 	constructor(view: SearchAndCompareView) {
-		super('search-compare', unknownGitUri, view);
+		super('search-compare', unknownGitUri, view, undefined, true);
 	}
 
 	override dispose() {
@@ -73,8 +72,6 @@ export class SearchAndCompareViewNode extends ViewNode<'search-compare', SearchA
 	}
 
 	getTreeItem(): TreeItem {
-		this.splatted = false;
-
 		const item = new TreeItem('SearchAndCompare', TreeItemCollapsibleState.Expanded);
 		item.contextValue = ContextValues.SearchAndCompare;
 		return item;
diff --git a/src/views/stashesView.ts b/src/views/stashesView.ts
@@ -54,7 +54,7 @@ export class StashesViewNode extends RepositoriesSubscribeableNode<StashesView,
 
 			const splat = repositories.length === 1;
 			this.children = repositories.map(
-				r => new StashesRepositoryNode(GitUri.fromRepoPath(r.path), this.view, this, r, splat),
+				r => new StashesRepositoryNode(GitUri.fromRepoPath(r.path), this.view, this, splat, r),
 			);
 		}
 
diff --git a/src/views/tagsView.ts b/src/views/tagsView.ts
@@ -55,7 +55,7 @@ export class TagsViewNode extends RepositoriesSubscribeableNode<TagsView, TagsRe
 
 			const splat = repositories.length === 1;
 			this.children = repositories.map(
-				r => new TagsRepositoryNode(GitUri.fromRepoPath(r.path), this.view, this, r, splat),
+				r => new TagsRepositoryNode(GitUri.fromRepoPath(r.path), this.view, this, splat, r),
 			);
 		}
 
diff --git a/src/views/viewBase.ts b/src/views/viewBase.ts
diff --git a/src/views/worktreesView.ts b/src/views/worktreesView.ts

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ export class BranchesViewNode extends RepositoriesSubscribeableNode<BranchesView`
`76`	`76`
`77`	`77`	`const splat = repositories.length === 1;`
`78`	`78`	`this.children = repositories.map(`
`79`		`- r => new BranchesRepositoryNode(GitUri.fromRepoPath(r.path), this.view, this, r, splat),`
	`79`	`+ r => new BranchesRepositoryNode(GitUri.fromRepoPath(r.path), this.view, this, splat, r),`
`80`	`80`	`);`
`81`	`81`	`}`
`82`	`82`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ export class ContributorsViewNode extends RepositoriesSubscribeableNode<Contribu`
`76`	`76`
`77`	`77`	`const splat = repositories.length === 1;`
`78`	`78`	`this.children = repositories.map(`
`79`		`- r => new ContributorsRepositoryNode(GitUri.fromRepoPath(r.path), this.view, this, r, splat),`
	`79`	`+ r => new ContributorsRepositoryNode(GitUri.fromRepoPath(r.path), this.view, this, splat, r),`
`80`	`80`	`);`
`81`	`81`	`}`
`82`	`82`