Replaces ensureRevealNode with revealDeep

Author: eamodio

src/views/branchesView.ts

@@ -307,7 +307,7 @@ export class BranchesView extends ViewBase<'branches', BranchesViewNode, Branche
 				const node = await this.findBranch(branch, token);
 				if (node == null) return undefined;
 
-				await this.ensureRevealNode(node, options);
+				await this.revealDeep(node, options);
 
 				return node;
 			},
@@ -336,7 +336,7 @@ export class BranchesView extends ViewBase<'branches', BranchesViewNode, Branche
 				const node = await this.findCommit(commit, token);
 				if (node == null) return undefined;
 
-				await this.ensureRevealNode(node, options);
+				await this.revealDeep(node, options);
 
 				return node;
 			},

src/views/commitsView.ts

@@ -419,7 +419,7 @@ export class CommitsView extends ViewBase<'commits', CommitsViewNode, CommitsVie
 				const node = await this.findCommit(commit, token);
 				if (node == null) return undefined;
 
-				await this.ensureRevealNode(node, options);
+				await this.revealDeep(node, options);
 
 				return node;
 			},

src/views/contributorsView.ts

@@ -305,7 +305,7 @@ export class ContributorsView extends ViewBase<'contributors', ContributorsViewN
 				const node = await this.findContributor(contributor, token);
 				if (node == null) return undefined;
 
-				await this.ensureRevealNode(node, options);
+				await this.revealDeep(node, options);
 
 				return node;
 			},

src/views/draftsView.ts

@@ -192,7 +192,7 @@ export class DraftsView extends ViewBase<'drafts', DraftsViewNode, DraftsViewCon
 		const node = await this.findDraft(draft);
 		if (node == null) return undefined;
 
-		await this.ensureRevealNode(node, options);
+		await this.revealDeep(node, options);
 
 		return node;
 	}

src/views/remotesView.ts

@@ -301,7 +301,7 @@ export class RemotesView extends ViewBase<'remotes', RemotesViewNode, RemotesVie
 				const node = await this.findBranch(branch, token);
 				if (node == null) return undefined;
 
-				await this.ensureRevealNode(node, options);
+				await this.revealDeep(node, options);
 
 				return node;
 			},
@@ -330,7 +330,7 @@ export class RemotesView extends ViewBase<'remotes', RemotesViewNode, RemotesVie
 				const node = await this.findCommit(commit, token);
 				if (node == null) return undefined;
 
-				await this.ensureRevealNode(node, options);
+				await this.revealDeep(node, options);
 
 				return node;
 			},
@@ -356,7 +356,7 @@ export class RemotesView extends ViewBase<'remotes', RemotesViewNode, RemotesVie
 				const node = await this.findRemote(remote, token);
 				if (node == null) return undefined;
 
-				await this.ensureRevealNode(node, options);
+				await this.revealDeep(node, options);
 
 				return node;
 			},

src/views/repositoriesView.ts

@@ -535,7 +535,7 @@ export class RepositoriesView extends ViewBase<'repositories', RepositoriesNode,
 				const node = await this.findBranch(branch, token);
 				if (node == null) return undefined;
 
-				await this.ensureRevealNode(node, options);
+				await this.revealDeep(node, options);
 
 				return node;
 			},
@@ -594,7 +594,7 @@ export class RepositoriesView extends ViewBase<'repositories', RepositoriesNode,
 				const node = await this.findCommit(commit, token);
 				if (node == null) return undefined;
 
-				await this.ensureRevealNode(node, options);
+				await this.revealDeep(node, options);
 
 				return node;
 			},
@@ -620,7 +620,7 @@ export class RepositoriesView extends ViewBase<'repositories', RepositoriesNode,
 				const node = await this.findContributor(contributor, token);
 				if (node == null) return undefined;
 
-				await this.ensureRevealNode(node, options);
+				await this.revealDeep(node, options);
 
 				return node;
 			},
@@ -646,7 +646,7 @@ export class RepositoriesView extends ViewBase<'repositories', RepositoriesNode,
 				const node = await this.findRemote(remote, token);
 				if (node == null) return undefined;
 
-				await this.ensureRevealNode(node, options);
+				await this.revealDeep(node, options);
 
 				return node;
 			},
@@ -755,7 +755,7 @@ export class RepositoriesView extends ViewBase<'repositories', RepositoriesNode,
 				const node = await this.findTag(tag, token);
 				if (node == null) return undefined;
 
-				await this.ensureRevealNode(node, options);
+				await this.revealDeep(node, options);
 
 				return node;
 			},
@@ -811,7 +811,7 @@ export class RepositoriesView extends ViewBase<'repositories', RepositoriesNode,
 				const node = await this.findWorktree(worktree, token);
 				if (node == null) return undefined;
 
-				await this.ensureRevealNode(node, options);
+				await this.revealDeep(node, options);
 
 				return node;
 			},

src/views/stashesView.ts

@@ -216,7 +216,7 @@ export class StashesView extends ViewBase<'stashes', StashesViewNode, StashesVie
 				const node = await this.findStash(stash, token);
 				if (node == null) return undefined;
 
-				await this.ensureRevealNode(node, options);
+				await this.revealDeep(node, options);
 
 				return node;
 			},

src/views/tagsView.ts

@@ -223,7 +223,7 @@ export class TagsView extends ViewBase<'tags', TagsViewNode, TagsViewConfig> {
 				const node = await this.findTag(tag, token);
 				if (node == null) return undefined;
 
-				await this.ensureRevealNode(node, options);
+				await this.revealDeep(node, options);
 
 				return node;
 			},

src/views/viewBase.ts

@@ -732,34 +732,6 @@ export abstract class ViewBase<
 		return undefined;
 	}
 
-	protected async ensureRevealNode(
-		node: ViewNode,
-		options?: {
-			select?: boolean;
-			focus?: boolean;
-			expand?: boolean | number;
-		},
-	): Promise<void> {
-		// Not sure why I need to reveal each parent, but without it the node won't be revealed
-		const nodes: ViewNode[] = [];
-
-		let parent: ViewNode | undefined = node;
-		while (parent != null) {
-			nodes.push(parent);
-			parent = parent.getParent();
-		}
-
-		if (nodes.length > 1) {
-			nodes.pop();
-		}
-
-		for (const n of nodes.reverse()) {
-			try {
-				await this.reveal(n, options);
-			} catch {}
-		}
-	}
-
 	@debug()
 	async refresh(reset: boolean = false): Promise<void> {
 		// If we are resetting, make sure to clear any saved node state
@@ -792,21 +764,43 @@ export abstract class ViewBase<
 		return this.revealCore(node, undefined, options);
 	}
 
+	async revealDeep(
+		node: ViewNode,
+		options?: { expand?: boolean | number; focus?: boolean; select?: boolean },
+	): Promise<void>;
+	async revealDeep(
+		node: ViewNode,
+		parents: ViewNode[],
+		options?: { expand?: boolean | number; focus?: boolean; select?: boolean },
+	): Promise<void>;
 	@log<ViewBase<Type, RootNode, ViewConfig>['revealDeep']>({
 		args: {
 			0: n => n.toString(),
-			1: n => n.length,
+			1: false,
 		},
 	})
 	async revealDeep(
 		node: ViewNode,
-		parents: ViewNode[],
+		parents: ViewNode[] | { expand?: boolean | number; focus?: boolean; select?: boolean } | undefined,
 		options?: { expand?: boolean | number; focus?: boolean; select?: boolean },
 	): Promise<void> {
 		if (this.initialized.pending) {
 			await this.initialized.promise;
 		}
 
+		if (!Array.isArray(parents)) {
+			options = parents;
+			parents = [];
+
+			let parent: ViewNode | undefined = node;
+			while (parent != null) {
+				parent = parent.getParent();
+				if (parent == null) break;
+
+				parents.unshift(parent);
+			}
+		}
+
 		let root: ViewNode = this.ensureRoot();
 		for (const node of parents) {
 			await this.revealCore(node, root, { expand: true, focus: false, select: false });

src/views/workspacesView.ts

@@ -140,7 +140,7 @@ export class WorkspacesView extends ViewBase<'workspaces', WorkspacesViewNode, W
 				const node = await this.findWorkspaceNode(workspaceId, token);
 				if (node == null) return undefined;
 
-				await this.ensureRevealNode(node, options);
+				await this.revealDeep(node, options);
 
 				return node;
 			},