Fixes issues with hovers on Commit Graph

 - Branch/Tag tips should now show up properly
 - Additions/deletions should show properly if the Changes column is on

Author: eamodio

src/env/node/git/localGitProvider.ts

@@ -2460,6 +2460,7 @@ export class LocalGitProvider implements GitProvider, Disposable {
 		const ids = new Set<string>();
 		const reachableFromHEAD = new Set<string>();
 		const remappedIds = new Map<string, string>();
+		const rowStats: GitGraphRowsStats = new Map<string, GitGraphRowStats>();
 		let total = 0;
 		let iterations = 0;
 		let pendingRowsStatsCount = 0;
@@ -2585,7 +2586,6 @@ export class LocalGitProvider implements GitProvider, Disposable {
 			let remoteBranchId: string;
 			let remoteName: string;
 			let stash: GitStashCommit | undefined;
-			let stats: GitGraphRowsStats | undefined;
 			let tagId: string;
 			let tagName: string;
 			let tip: string;
@@ -2870,10 +2870,7 @@ export class LocalGitProvider implements GitProvider, Disposable {
 				});
 
 				if (commit.stats != null) {
-					if (stats == null) {
-						stats = new Map<string, GitGraphRowStats>();
-					}
-					stats.set(commit.sha, commit.stats);
+					rowStats.set(commit.sha, commit.stats);
 				}
 			}
 
@@ -2890,9 +2887,6 @@ export class LocalGitProvider implements GitProvider, Disposable {
 			let rowsStatsDeferred: GitGraph['rowsStatsDeferred'];
 
 			if (deferStats) {
-				if (stats == null) {
-					stats = new Map<string, GitGraphRowStats>();
-				}
 				pendingRowsStatsCount++;
 
 				// eslint-disable-next-line no-async-promise-executor
@@ -2910,7 +2904,7 @@ export class LocalGitProvider implements GitProvider, Disposable {
 						if (statsData) {
 							const commitStats = statsParser.parse(statsData);
 							for (const stat of commitStats) {
-								stats!.set(stat.sha, stat.stats);
+								rowStats.set(stat.sha, stat.stats);
 							}
 						}
 					} finally {
@@ -2939,7 +2933,7 @@ export class LocalGitProvider implements GitProvider, Disposable {
 				worktreesByBranch: worktreesByBranch,
 				rows: rows,
 				id: sha,
-				rowsStats: stats,
+				rowsStats: rowStats,
 				rowsStatsDeferred: rowsStatsDeferred,
 
 				paging: {

src/plus/integrations/providers/github/githubGitProvider.ts

@@ -58,7 +58,6 @@ import type {
 	GitGraphRowContexts,
 	GitGraphRowHead,
 	GitGraphRowRemoteHead,
-	GitGraphRowsStats,
 	GitGraphRowStats,
 	GitGraphRowTag,
 } from '../../../../git/models/graph';
@@ -1301,7 +1300,7 @@ export class GitHubGitProvider implements GitProvider, Disposable {
 		const ids = new Set<string>();
 		const remote = getSettledValue(remotesResult)![0];
 		const remoteMap = remote != null ? new Map([[remote.name, remote]]) : new Map<string, GitRemote>();
-
+		const rowStats = new Map<string, GitGraphRowStats>();
 		const tagTips = new Map<string, string[]>();
 		const tags = getSettledValue(tagsResult)?.values;
 		if (tags != null) {
@@ -1326,6 +1325,7 @@ export class GitHubGitProvider implements GitProvider, Disposable {
 			branchTips,
 			remote,
 			remoteMap,
+			rowStats,
 			tagTips,
 			getSettledValue(currentUserResult),
 			avatars,
@@ -1346,6 +1346,7 @@ export class GitHubGitProvider implements GitProvider, Disposable {
 		branchTips: Map<string, string[]>,
 		remote: GitRemote,
 		remoteMap: Map<string, GitRemote>,
+		rowStats: Map<string, GitGraphRowStats>,
 		tagTips: Map<string, string[]>,
 		currentUser: GitUser | undefined,
 		avatars: Map<string, string>,
@@ -1411,7 +1412,6 @@ export class GitHubGitProvider implements GitProvider, Disposable {
 		let refRemoteHeads: GitGraphRowRemoteHead[];
 		let refTags: GitGraphRowTag[];
 		let remoteBranchId: string;
-		let stats: GitGraphRowsStats | undefined;
 		let tagId: string;
 
 		const headRefUpstreamName = headBranch.upstream?.name;
@@ -1615,10 +1615,7 @@ export class GitHubGitProvider implements GitProvider, Disposable {
 			});
 
 			if (commit.stats != null) {
-				if (stats == null) {
-					stats = new Map<string, GitGraphRowStats>();
-				}
-				stats.set(commit.sha, {
+				rowStats.set(commit.sha, {
 					files: getChangedFilesCount(commit.stats.changedFiles),
 					additions: commit.stats.additions,
 					deletions: commit.stats.deletions,
@@ -1662,6 +1659,7 @@ export class GitHubGitProvider implements GitProvider, Disposable {
 					branchTips,
 					remote,
 					remoteMap,
+					rowStats,
 					tagTips,
 					currentUser,
 					avatars,

src/plus/webviews/graph/graphWebview.ts

@@ -62,7 +62,6 @@ import { isStash } from '../../../git/models/commit';
 import { uncommitted } from '../../../git/models/constants';
 import { GitContributor } from '../../../git/models/contributor';
 import type { GitGraph, GitGraphRowType } from '../../../git/models/graph';
-import { getGkProviderThemeIconString } from '../../../git/models/graph';
 import type { PullRequest } from '../../../git/models/pullRequest';
 import {
 	getComparisonRefsForPullRequest,
@@ -283,6 +282,9 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 	private _etagSubscription?: number;
 	private _etagRepository?: number;
 	private _firstSelection = true;
+	private _getBranchesAndTagsTips:
+		| ((sha: string, options?: { compact?: boolean; icons?: boolean }) => string | undefined)
+		| undefined;
 	private _graph?: GitGraph;
 	private _hoverCache = new Map<string, Promise<string>>();
 
@@ -1180,10 +1182,12 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 			template = configuration.get('views.formats.commits.tooltip');
 		}
 
+		this._getBranchesAndTagsTips ??= await this.container.git.getBranchesAndTagsTipsLookup(commit.repoPath);
+
 		const tooltip = await CommitFormatter.fromTemplateAsync(template, commit, {
 			enrichedAutolinks: enrichedAutolinks,
 			dateFormat: configuration.get('defaultDateFormat'),
-			getBranchAndTagTips: this.getBranchAndTagTips.bind(this),
+			getBranchAndTagTips: this._getBranchesAndTagsTips,
 			messageAutolinks: true,
 			messageIndent: 4,
 			pullRequest: pr,
@@ -1195,32 +1199,6 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 		return tooltip;
 	}
 
-	private getBranchAndTagTips(sha: string, options?: { compact?: boolean; icons?: boolean }): string | undefined {
-		if (this._graph == null) return undefined;
-
-		const row = this._graph.rows.find(r => r.sha === sha);
-		if (row == null) return undefined;
-
-		const tips = [];
-		if (row.heads?.length) {
-			tips.push(...row.heads.map(h => (options?.icons ? `$(git-branch) ${h.name}` : h.name)));
-		}
-
-		if (row.remotes?.length) {
-			tips.push(
-				...row.remotes.map(h => {
-					const name = `${h.owner ? `${h.owner}/` : ''}${h.name}`;
-					return options?.icons ? `$(${getGkProviderThemeIconString(h.hostingServiceType)}) ${name}` : name;
-				}),
-			);
-		}
-		if (row.tags?.length) {
-			tips.push(...row.tags.map(h => (options?.icons ? `$(tag) ${h.name}` : h.name)));
-		}
-
-		return tips.join(', ') || undefined;
-	}
-
 	@debug()
 	private async onEnsureRowRequest<T extends typeof EnsureRowRequest>(requestType: T, msg: IpcCallMessageType<T>) {
 		if (this._graph == null) return;
@@ -2949,6 +2927,7 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 	}
 
 	private resetRepositoryState() {
+		this._getBranchesAndTagsTips = undefined;
 		this.setGraph(undefined);
 		this.setSelectedRows(undefined);
 	}

src/webviews/apps/plus/graph/GraphWrapper.tsx

@@ -355,6 +355,7 @@ export function GraphWrapper({
 				setIsLoading(state.loading);
 				break;
 			case DidChangeRowsStatsNotification:
+				hover.current?.reset();
 				setRowsStats(state.rowsStats);
 				setRowsStatsLoading(state.rowsStatsLoading);
 				break;