Improves view revealing

eamodio · eamodio · commit ccf72bbbe090 · 2024-11-06T23:32:11.000-05:00
diff --git a/src/commands/git/remote.ts b/src/commands/git/remote.ts
@@ -326,9 +326,13 @@ export class RemoteGitCommand extends QuickCommand<State> {
 
 			endSteps(state);
 
-			await state.repo.addRemote(state.name, state.url, state.flags.includes('-f') ? { fetch: true } : undefined);
+			const remote = await state.repo.addRemote(
+				state.name,
+				state.url,
+				state.flags.includes('-f') ? { fetch: true } : undefined,
+			);
 			if (state.reveal !== false) {
-				void reveal(undefined, {
+				void reveal(remote, {
 					focus: true,
 					select: true,
 				});
diff --git a/src/git/actions/branch.ts b/src/git/actions/branch.ts
@@ -38,21 +38,13 @@ export function rename(repo?: string | Repository, ref?: GitBranchReference, nam
 	});
 }
 
-export async function reveal(
+export function reveal(
 	branch: GitBranchReference,
 	options?: {
 		select?: boolean;
 		focus?: boolean;
 		expand?: boolean | number;
 	},
 ) {
-	const view = branch.remote ? Container.instance.views.remotes : Container.instance.views.branches;
-	const node = view.canReveal
-		? await view.revealBranch(branch, options)
-		: await Container.instance.views.repositories.revealBranch(branch, options);
-
-	if (node == null) {
-		void view.show({ preserveFocus: !options?.focus });
-	}
-	return node;
+	return Container.instance.views.revealBranch(branch, options);
 }
diff --git a/src/git/actions/commit.ts b/src/git/actions/commit.ts
@@ -770,31 +770,15 @@ export async function restoreFile(file: string | GitFile, revision: GitRevisionR
 	await Container.instance.git.checkout(revision.repoPath, ref, { path: path });
 }
 
-export async function reveal(
+export function reveal(
 	commit: GitRevisionReference,
 	options?: {
 		select?: boolean;
 		focus?: boolean;
 		expand?: boolean | number;
 	},
 ) {
-	const views = [
-		Container.instance.views.commits,
-		Container.instance.views.branches,
-		Container.instance.views.remotes,
-	];
-
-	// TODO@eamodio stop duplicate notifications
-
-	for (const view of views) {
-		const node = view.canReveal
-			? await view.revealCommit(commit, options)
-			: await Container.instance.views.repositories.revealCommit(commit, options);
-		if (node != null) return node;
-	}
-
-	void views[0].show({ preserveFocus: !options?.focus });
-	return undefined;
+	return Container.instance.views.revealCommit(commit, options);
 }
 
 export async function showDetailsQuickPick(commit: GitCommit, uri?: Uri): Promise<void>;
diff --git a/src/git/actions/contributor.ts b/src/git/actions/contributor.ts
@@ -10,20 +10,13 @@ export function addAuthors(repo?: string | Repository, contributors?: GitContrib
 	});
 }
 
-export async function reveal(
+export function reveal(
 	contributor: GitContributor,
 	options?: {
 		select?: boolean;
 		focus?: boolean;
 		expand?: boolean | number;
 	},
 ) {
-	const view = Container.instance.views.contributors;
-	const node = view.canReveal
-		? await view.revealContributor(contributor, options)
-		: await Container.instance.views.repositories.revealContributor(contributor, options);
-	if (node == null) {
-		void view.show({ preserveFocus: !options?.focus });
-	}
-	return node;
+	return Container.instance.views.revealContributor(contributor, options);
 }
diff --git a/src/git/actions/remote.ts b/src/git/actions/remote.ts
@@ -48,23 +48,13 @@ export async function remove(repo: string | Repository, remote: string) {
 	});
 }
 
-export async function reveal(
+export function reveal(
 	remote: GitRemote | undefined,
 	options?: {
 		select?: boolean;
 		focus?: boolean;
 		expand?: boolean | number;
 	},
 ) {
-	const view = Container.instance.views.remotes;
-	const node =
-		remote != null
-			? view.canReveal
-				? await view.revealRemote(remote, options)
-				: await Container.instance.views.repositories.revealRemote(remote, options)
-			: undefined;
-	if (node == null) {
-		void view.show({ preserveFocus: !options?.focus });
-	}
-	return node;
+	return Container.instance.views.revealRemote(remote, options);
 }
diff --git a/src/git/actions/repository.ts b/src/git/actions/repository.ts
@@ -65,7 +65,7 @@ export function switchTo(repos?: string | string[] | Repository | Repository[],
 	});
 }
 
-export async function reveal(
+export function reveal(
 	repoPath: string,
 	view?: ViewsWithRepositoryFolders,
 	options?: {
@@ -74,11 +74,5 @@ export async function reveal(
 		expand?: boolean | number;
 	},
 ) {
-	const node = view?.canReveal
-		? await view.revealRepository(repoPath, options)
-		: await Container.instance.views.repositories.revealRepository(repoPath, options);
-	if (node == null) {
-		void (view ?? Container.instance.views.repositories).show({ preserveFocus: !options?.focus });
-	}
-	return node;
+	return Container.instance.views.revealRepository(repoPath, view, options);
 }
diff --git a/src/git/actions/stash.ts b/src/git/actions/stash.ts
@@ -60,22 +60,15 @@ export function push(
 	});
 }
 
-export async function reveal(
+export function reveal(
 	stash: GitStashReference,
 	options?: {
 		select?: boolean;
 		focus?: boolean;
 		expand?: boolean | number;
 	},
 ) {
-	const view = Container.instance.views.stashes;
-	const node = view.canReveal
-		? await view.revealStash(stash, options)
-		: await Container.instance.views.repositories.revealStash(stash, options);
-	if (node == null) {
-		void view.show({ preserveFocus: !options?.focus });
-	}
-	return node;
+	return Container.instance.views.revealStash(stash, options);
 }
 
 export function showDetailsView(
diff --git a/src/git/actions/tag.ts b/src/git/actions/tag.ts
@@ -26,20 +26,13 @@ export function remove(repo?: string | Repository, refs?: GitTagReference | GitT
 	});
 }
 
-export async function reveal(
+export function reveal(
 	tag: GitTagReference,
 	options?: {
 		select?: boolean;
 		focus?: boolean;
 		expand?: boolean | number;
 	},
 ) {
-	const view = Container.instance.views.tags;
-	const node = view.canReveal
-		? await view.revealTag(tag, options)
-		: await Container.instance.views.repositories.revealTag(tag, options);
-	if (node == null) {
-		void view.show({ preserveFocus: !options?.focus });
-	}
-	return node;
+	return Container.instance.views.revealTag(tag, options);
 }
diff --git a/src/git/actions/worktree.ts b/src/git/actions/worktree.ts
@@ -76,21 +76,11 @@ export function remove(repo?: string | Repository, uris?: Uri[]) {
 	});
 }
 
-export async function reveal(
-	worktree: GitWorktree | undefined,
+export function reveal(
+	worktree: GitWorktree,
 	options?: { select?: boolean; focus?: boolean; expand?: boolean | number },
 ) {
-	const view = Container.instance.views.worktrees;
-	const node =
-		worktree != null
-			? view.canReveal
-				? await view.revealWorktree(worktree, options)
-				: await Container.instance.views.repositories.revealWorktree(worktree, options)
-			: undefined;
-	if (node == null) {
-		void view.show({ preserveFocus: !options?.focus });
-	}
-	return node;
+	return Container.instance.views.revealWorktree(worktree, options);
 }
 
 type OpenFlags = Extract<
diff --git a/src/views/viewBase.ts b/src/views/viewBase.ts
@@ -720,7 +720,16 @@ export abstract class ViewBase<
 		const scope = getLogScope();
 
 		try {
-			void (await executeCoreCommand(`${this.id}.focus`, options));
+			const command = `${this.id}.focus` as const;
+			// If we haven't been initialized, the focus command will show the view, but won't focus it, so wait until it's initialized and then focus again
+			if (!this.initialized) {
+				void executeCoreCommand(command, options);
+				await new Promise<void>(resolve => {
+					void once(this._onDidInitialize.event)(() => resolve(), this);
+				});
+			}
+
+			void (await executeCoreCommand(command, options));
 		} catch (ex) {
 			Logger.error(ex, scope);
 		}
diff --git a/src/views/views.ts b/src/views/views.ts
@@ -1,5 +1,14 @@
 import { Disposable } from 'vscode';
 import type { Container } from '../container';
+import type { GitContributor } from '../git/models/contributor';
+import type {
+	GitBranchReference,
+	GitRevisionReference,
+	GitStashReference,
+	GitTagReference,
+} from '../git/models/reference';
+import type { GitRemote } from '../git/models/remote';
+import type { GitWorktree } from '../git/models/worktree';
 import type { GraphWebviewShowingArgs } from '../plus/webviews/graph/registration';
 import { registerGraphWebviewView } from '../plus/webviews/graph/registration';
 import type { PatchDetailsWebviewShowingArgs } from '../plus/webviews/patchDetails/registration';
@@ -27,6 +36,7 @@ import { RepositoriesView } from './repositoriesView';
 import { SearchAndCompareView } from './searchAndCompareView';
 import { StashesView } from './stashesView';
 import { TagsView } from './tagsView';
+import type { ViewsWithRepositoryFolders } from './viewBase';
 import { ViewCommands } from './viewCommands';
 import { WorkspacesView } from './workspacesView';
 import { WorktreesView } from './worktreesView';
@@ -185,4 +195,132 @@ export class Views implements Disposable {
 	get workspaces(): WorkspacesView {
 		return this._workspacesView;
 	}
+
+	async revealBranch(
+		branch: GitBranchReference,
+		options?: {
+			select?: boolean;
+			focus?: boolean;
+			expand?: boolean | number;
+		},
+	) {
+		const branches = branch.remote ? this.remotes : this.branches;
+		const view = branches.canReveal ? branches : this.repositories;
+
+		const node = await view.revealBranch(branch, options);
+		await view.show({ preserveFocus: !options?.focus });
+		return node;
+	}
+
+	async revealCommit(
+		commit: GitRevisionReference,
+		options?: {
+			select?: boolean;
+			focus?: boolean;
+			expand?: boolean | number;
+		},
+	) {
+		const { commits } = this;
+		const view = commits.canReveal ? commits : this.repositories;
+
+		const node = await view.revealCommit(commit, options);
+		await view.show({ preserveFocus: !options?.focus });
+		return node;
+	}
+
+	async revealContributor(
+		contributor: GitContributor,
+		options?: {
+			select?: boolean;
+			focus?: boolean;
+			expand?: boolean | number;
+		},
+	) {
+		const { contributors } = this;
+		const view = contributors.canReveal ? contributors : this.repositories;
+
+		const node = await view.revealContributor(contributor, options);
+		await view.show({ preserveFocus: !options?.focus });
+		return node;
+	}
+
+	async revealRemote(
+		remote: GitRemote | undefined,
+		options?: {
+			select?: boolean;
+			focus?: boolean;
+			expand?: boolean | number;
+		},
+	) {
+		const { remotes } = this;
+		const view = remotes.canReveal ? remotes : this.repositories;
+
+		const node = remote != null ? await view.revealRemote(remote, options) : undefined;
+		await view.show({ preserveFocus: !options?.focus });
+		return node;
+	}
+
+	async revealRepository(
+		repoPath: string,
+		useView?: ViewsWithRepositoryFolders,
+		options?: {
+			select?: boolean;
+			focus?: boolean;
+			expand?: boolean | number;
+		},
+	) {
+		const view = useView == null || useView.canReveal === false ? this.repositories : useView;
+
+		const node = await view.revealRepository(repoPath, options);
+		await view.show({ preserveFocus: !options?.focus });
+		return node;
+	}
+
+	async revealStash(
+		stash: GitStashReference,
+		options?: {
+			select?: boolean;
+			focus?: boolean;
+			expand?: boolean | number;
+		},
+	) {
+		const { stashes } = this;
+		const view = stashes.canReveal ? stashes : this.repositories;
+
+		const node = await view.revealStash(stash, options);
+		await view.show({ preserveFocus: !options?.focus });
+		return node;
+	}
+
+	async revealTag(
+		tag: GitTagReference,
+		options?: {
+			select?: boolean;
+			focus?: boolean;
+			expand?: boolean | number;
+		},
+	) {
+		const { tags } = this;
+		const view = tags.canReveal ? tags : this.repositories;
+
+		const node = await view.revealTag(tag, options);
+		await view.show({ preserveFocus: !options?.focus });
+		return node;
+	}
+
+	async revealWorktree(
+		worktree: GitWorktree,
+		options?: {
+			select?: boolean;
+			focus?: boolean;
+			expand?: boolean | number;
+		},
+	) {
+		const { worktrees } = this;
+		const view = worktrees.canReveal ? worktrees : this.repositories;
+
+		const node = await view.revealWorktree(worktree, options);
+		await view.show({ preserveFocus: !options?.focus });
+		return node;
+	}
 }
