(WIP) Adds new view ids

src/views/launchpadView.ts

@@ -46,10 +46,6 @@ export class LaunchpadItemNode extends CacheableChildrenViewNode<'launchpad-item
 		this.repoPath = repoPath;
 	}
 
-	override get id(): string {
-		return this._uniqueId;
-	}
-
 	override toClipboard(type?: ClipboardType): string {
 		const url = this.getUrl();
 		switch (type) {

src/views/nodes/UncommittedFilesNode.ts

@@ -31,10 +31,6 @@ export class UncommittedFilesNode extends ViewNode<'uncommitted-files', ViewsWit
 		this._uniqueId = getViewNodeId(this.type, this.context);
 	}
 
-	override get id(): string {
-		return this._uniqueId;
-	}
-
 	get repoPath(): string {
 		return this.status.repoPath;
 	}

src/views/nodes/abstract/repositoryFolderNode.ts

@@ -49,10 +49,6 @@ export abstract class RepositoryFolderNode<
 		this.child = undefined;
 	}
 
-	override get id(): string {
-		return this._uniqueId;
-	}
-
 	override toClipboard(): string {
 		return this.repo.path;
 	}

src/views/nodes/abstract/viewNode.ts

@@ -154,7 +154,29 @@ export interface AmbientContext {
 	readonly worktreesByBranch?: Map<string, GitWorktree>;
 }
 
-export function getViewNodeId(type: string, context: AmbientContext): string {
+export function getViewNodeId(
+	type: TreeViewNodeTypes | `${TreeViewNodeTypes}+${string}`,
+	context: AmbientContext,
+): string {
+	switch (type) {
+		case 'branch':
+			return `${type}(${context.branch?.id})`;
+
+		case 'commit':
+			return `${type}(${context.commit?.repoPath}|${context.commit?.sha})`;
+
+		case 'pullrequest':
+			return `${type}(${context.pullRequest?.url})`;
+
+		case 'commit-file':
+			return `${type}:(${
+				context.repository?.path ?? context.branch?.repoPath ?? context.commit?.repoPath
+			}|${context.file?.path}+${context.file?.status})`;
+
+		// case 'results-file':
+		// 	return `${type}(${context.file?.path}+${context.file?.status})`;
+	}
+
 	let uniqueness = '';
 	if (context.root) {
 		uniqueness += '/root';
@@ -252,8 +274,22 @@ export abstract class ViewNode<
 		return types.includes(this.type as unknown as T[number]);
 	}
 
+	public childrenIds = new Set<string>();
+	public childrenCount = 0;
 	protected _uniqueId!: string;
-	splatted = false;
+
+	private _splatted: boolean;
+	//** Indicates if this node is only shown as its children, not itself */
+	get splatted(): boolean {
+		return this._splatted;
+	}
+	set splatted(value: boolean) {
+		if (this._splatted === value) return;
+
+		this._splatted = value;
+		// this.setId();
+	}
+
 	// NOTE: @eamodio uncomment to track node leaks
 	// readonly uuid = uuid();
 
@@ -266,7 +302,10 @@ export abstract class ViewNode<
 		//** Indicates if this node is only shown as its children, not itself */
 		splatted?: boolean,
 	) {
-		this.splatted = splatted ?? false;
+		this._splatted = splatted ?? false;
+		(parent ?? this).childrenCount++;
+
+		// this.setId();
 
 		// NOTE: @eamodio uncomment to track node leaks
 		// queueMicrotask(() => this.view.registerNode(this));
@@ -281,9 +320,38 @@ export abstract class ViewNode<
 		// NOTE: @eamodio uncomment to track node leaks
 		// this.view.unregisterNode(this);
 	}
+	private _id!: string;
+	get id(): string {
+		if (this._id == null) {
+			// if (!this.splatted) {
+			this._id = this._uniqueId ?? `${(this.parent ?? this).childrenCount}:${this.type}`;
+			// }
+		}
+		return this._id;
+	}
+
+	get parentId(): string {
+		return this.parent?.treeId ?? '~';
+	}
+
+	get treeId(): string {
+		return this.splatted ? this.parentId : `${this.parentId}/${this.id}`;
+	}
 
-	get id(): string | undefined {
-		return this._uniqueId;
+	private setId() {
+		// if (this.splatted) {
+		// 	this._id = undefined!; //this.parent?.id ?? '~';
+		// } else {
+		// 	const { parent } = this;
+		// 	const { childrenIds } = parent ?? this;
+		// 	this._id = this._uniqueId ?? `${childrenIds.size ?? 0}:${this.type}`;
+		// 	if (childrenIds.has(this._id)) {
+		// 		debugger;
+		// 		// this._id = `${this._id}-${this._uniqueCounter++}`;
+		// 	}
+		// 	childrenIds.add(this._id);
+		// }
+		// console.log('#######', this.type, this.splatted, this._id);
 	}
 
 	private _context: AmbientContext | undefined;

src/views/nodes/autolinkedItemNode.ts

@@ -22,10 +22,6 @@ export class AutolinkedItemNode extends ViewNode<'autolink', ViewsWithCommits> {
 		this._uniqueId = getViewNodeId(`${this.type}+${item.id}`, this.context);
 	}
 
-	override get id(): string {
-		return this._uniqueId;
-	}
-
 	override async toClipboard(type?: ClipboardType): Promise<string> {
 		const enriched = await this.maybeEnriched;
 		switch (type) {

src/views/nodes/autolinkedItemsNode.ts

@@ -30,10 +30,6 @@ export class AutolinkedItemsNode extends CacheableChildrenViewNode<'autolinks',
 		this._uniqueId = getViewNodeId(this.type, this.context);
 	}
 
-	override get id(): string {
-		return this._uniqueId;
-	}
-
 	async getChildren(): Promise<ViewNode[]> {
 		if (this.children == null) {
 			const commits = [...this.log.commits.values()];

src/views/nodes/branchNode.ts

@@ -83,7 +83,9 @@ export class BranchNode
 		super('branch', uri, view, parent, root);
 
 		this.updateContext({ repository: repo, branch: branch, root: root });
-		this._uniqueId = getViewNodeId(this.type, this.context);
+		// this._uniqueId = getViewNodeId(this.type, this.context);
+		this._uniqueId = `${this.type}(${this.branch.id})`;
+
 		this.limit = this.view.getNodeLastKnownLimit(this);
 
 		this.options = {
@@ -106,10 +108,6 @@ export class BranchNode
 		this.children = undefined;
 	}
 
-	override get id(): string {
-		return this._uniqueId;
-	}
-
 	override toClipboard(): string {
 		return this.branch.name;
 	}

src/views/nodes/branchOrTagFolderNode.ts

@@ -22,10 +22,6 @@ export class BranchOrTagFolderNode extends ViewNode<'branch-tag-folder'> {
 		this._uniqueId = getViewNodeId(`${this.type}+${folderType}+${relativePath ?? folderName}`, this.context);
 	}
 
-	override get id(): string {
-		return this._uniqueId;
-	}
-
 	override toClipboard(): string {
 		return this.folderName;
 	}

src/views/nodes/branchTrackingStatusNode.ts

@@ -56,14 +56,10 @@ export class BranchTrackingStatusNode
 			branchStatusUpstreamType: upstreamType,
 			root: root,
 		});
-		this._uniqueId = getViewNodeId(this.type, this.context);
+		// this._uniqueId = getViewNodeId(this.type, this.context);
 		this.limit = this.view.getNodeLastKnownLimit(this);
 	}
 
-	override get id(): string {
-		return this._uniqueId;
-	}
-
 	get repoPath(): string {
 		return this.uri.repoPath!;
 	}

src/views/nodes/branchesNode.ts

@@ -25,10 +25,6 @@ export class BranchesNode extends CacheableChildrenViewNode<'branches', ViewsWit
 		this._uniqueId = getViewNodeId(this.type, this.context);
 	}
 
-	override get id(): string {
-		return this._uniqueId;
-	}
-
 	get repoPath(): string {
 		return this.repo.path;
 	}

src/views/nodes/codeSuggestionsNode.ts

@@ -20,10 +20,6 @@ export class CodeSuggestionsNode extends CacheableChildrenViewNode<'drafts-code-
 		this._uniqueId = getViewNodeId(this.type, this.context);
 	}
 
-	override get id(): string {
-		return this._uniqueId;
-	}
-
 	async getChildren(): Promise<ViewNode[]> {
 		if (this.children == null) {
 			const drafts = await this.getSuggestedChanges();

src/views/nodes/commitFileNode.ts

@@ -39,11 +39,9 @@ export abstract class CommitFileNodeBase<
 		super(type, GitUri.fromFile(file, commit.repoPath, commit.sha), view, parent, file);
 
 		this.updateContext({ commit: commit, file: file });
-		this._uniqueId = getViewNodeId(type, this.context);
-	}
+		this._uniqueId = `${this.type}(${this.commit.repoPath}|${this.commit.sha}:${this.file.path}+${this.file.status})`;
 
-	override get id(): string {
-		return this._uniqueId;
+		// this._uniqueId = getViewNodeId(type, this.context);
 	}
 
 	override toClipboard(): string {

src/views/nodes/commitNode.ts

@@ -54,10 +54,6 @@ export class CommitNode extends ViewRefNode<'commit', ViewsWithCommits | FileHis
 		this.children = undefined;
 	}
 
-	override get id(): string {
-		return this._uniqueId;
-	}
-
 	override toClipboard(): string {
 		return `${this.commit.shortSha}: ${this.commit.summary}`;
 	}

src/views/nodes/compareResultsNode.ts

@@ -58,10 +58,6 @@ export class CompareResultsNode extends SubscribeableViewNode<
 		}
 	}
 
-	override get id(): string {
-		return this._uniqueId;
-	}
-
 	protected override etag(): number {
 		return this._storedAt;
 	}

src/views/nodes/contributorNode.ts

@@ -39,10 +39,6 @@ export class ContributorNode extends ViewNode<'contributor', ViewsWithContributo
 		this.limit = this.view.getNodeLastKnownLimit(this);
 	}
 
-	override get id(): string {
-		return this._uniqueId;
-	}
-
 	override toClipboard(type?: ClipboardType): string {
 		const text = `${this.contributor.name}${this.contributor.email ? ` <${this.contributor.email}>` : ''}`;
 		switch (type) {

src/views/nodes/contributorsNode.ts

@@ -30,10 +30,6 @@ export class ContributorsNode extends CacheableChildrenViewNode<
 		this._uniqueId = getViewNodeId(this.type, this.context);
 	}
 
-	override get id(): string {
-		return this._uniqueId;
-	}
-
 	get repoPath(): string {
 		return this.repo.path;
 	}

src/views/nodes/draftNode.ts

@@ -22,10 +22,6 @@ export class DraftNode extends ViewNode<'draft', ViewsWithCommits | DraftsView>
 		this._uniqueId = getViewNodeId(this.type, this.context);
 	}
 
-	override get id(): string {
-		return this._uniqueId;
-	}
-
 	override toClipboard(): string {
 		return this.getUrl();
 	}

src/views/nodes/fileHistoryNode.ts

@@ -45,10 +45,6 @@ export class FileHistoryNode
 		this.limit = this.view.getNodeLastKnownLimit(this);
 	}
 
-	override get id(): string {
-		return this._uniqueId;
-	}
-
 	override toClipboard(): string {
 		return this.uri.fileName;
 	}

src/views/nodes/fileRevisionAsCommitNode.ts

@@ -42,6 +42,8 @@ export class FileRevisionAsCommitNode extends ViewRefFileNode<
 		} = {},
 	) {
 		super('file-commit', GitUri.fromFile(file, commit.repoPath, commit.sha), view, parent, file);
+
+		this._uniqueId = `${this.type}(${this.commit.repoPath}|${this.commit.sha}:${this.file.path}+${this.file.status})`;
 	}
 
 	override toClipboard(): string {

src/views/nodes/folderNode.ts

@@ -35,10 +35,6 @@ export class FolderNode extends ViewNode<'folder', ViewsWithCommits | StashesVie
 		this._uniqueId = getViewNodeId(`${this.type}+${relativePath ?? folderName}`, this.context);
 	}
 
-	override get id(): string {
-		return this._uniqueId;
-	}
-
 	override toClipboard(): string {
 		return this.folderName;
 	}

src/views/nodes/lineHistoryNode.ts

@@ -52,10 +52,6 @@ export class LineHistoryNode
 		this.limit = this.view.getNodeLastKnownLimit(this);
 	}
 
-	override get id(): string {
-		return this._uniqueId;
-	}
-
 	override toClipboard(): string {
 		return this.uri.fileName;
 	}

src/views/nodes/pullRequestNode.ts

@@ -53,12 +53,10 @@ export class PullRequestNode extends CacheableChildrenViewNode<'pullrequest', Vi
 		}
 
 		this.updateContext({ pullRequest: pullRequest });
-		this._uniqueId = getViewNodeId(this.type, this.context);
-		this.repoPath = repoPath;
-	}
+		// this._uniqueId = getViewNodeId(this.type, this.context);
+		this._uniqueId = `${this.type}(${this.pullRequest.url})`;
 
-	override get id(): string {
-		return this._uniqueId;
+		this.repoPath = repoPath;
 	}
 
 	override toClipboard(type?: ClipboardType): string {

src/views/nodes/reflogNode.ts

@@ -30,10 +30,6 @@ export class ReflogNode
 		this.limit = this.view.getNodeLastKnownLimit(this);
 	}
 
-	override get id(): string {
-		return this._uniqueId;
-	}
-
 	async getChildren(): Promise<ViewNode[]> {
 		if (this.children === undefined) {
 			const children = [];

src/views/nodes/reflogRecordNode.ts

@@ -27,10 +27,6 @@ export class ReflogRecordNode extends ViewNode<'reflog-record', ViewsWithCommits
 		this.limit = this.view.getNodeLastKnownLimit(this);
 	}
 
-	override get id(): string {
-		return this._uniqueId;
-	}
-
 	async getChildren(): Promise<ViewNode[]> {
 		const log = await this.getLog();
 		if (log === undefined) return [new MessageNode(this.view, this, 'No commits could be found.')];

src/views/nodes/remoteNode.ts

@@ -27,10 +27,6 @@ export class RemoteNode extends ViewNode<'remote', ViewsWithRemotes> {
 		this._uniqueId = getViewNodeId(this.type, this.context);
 	}
 
-	override get id(): string {
-		return this._uniqueId;
-	}
-
 	override toClipboard(): string {
 		return this.remote.name;
 	}