Fixes graph search issues with stashes

 - Ensures remapped results are updated when new rows are loaded

Author: eamodio

src/env/node/git/sub-providers/graph.ts

@@ -438,7 +438,9 @@ export class GraphGitSubProvider implements GitGraphSubProvider {
 						// Remap the "index commit" (e.g. contains staged files) of the stash
 						remappedIds.set(parents[1], commit.sha);
 						// Remap the "untracked commit" (e.g. contains untracked files) of the stash
-						remappedIds.set(parents[2], commit.sha);
+						if (parents.length > 2) {
+							remappedIds.set(parents[2], commit.sha);
+						}
 						parents.splice(1, 2);
 					}
 

src/webviews/apps/plus/graph/stateProvider.ts

@@ -282,6 +282,9 @@ export class GraphStateProvider implements StateProvider<State> {
 						updates.rowsStats = { ...this._state.rowsStats, ...msg.params.rowsStats };
 					}
 					updates.rowsStatsLoading = msg.params.rowsStatsLoading;
+					if (msg.params.searchResults != null) {
+						updates.searchResults = msg.params.searchResults;
+					}
 					if (msg.params.selectedRows != null) {
 						updates.selectedRows = msg.params.selectedRows;
 					}

src/webviews/plus/graph/graphWebview.ts

@@ -1514,7 +1514,6 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 
 		try {
 			results = await this.getSearchResults(msg.params);
-
 			void this.host.respond(requestType, msg, results);
 		} catch (ex) {
 			exception = ex;
@@ -1548,24 +1547,15 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 
 		let search: GitGraphSearch | undefined = this._search;
 
+		const graph = this._graph!;
+
 		if (e.more && search?.more != null && search.comparisonKey === getSearchQueryComparisonKey(e.search)) {
 			search = await search.more(e.limit ?? configuration.get('graph.searchItemLimit') ?? 100);
 			if (search != null) {
 				this._search = search;
-				void (await this.ensureSearchStartsInRange(this._graph!, search));
-
-				return {
-					results:
-						search.results.size > 0
-							? {
-									ids: Object.fromEntries(
-										map(search.results, ([k, v]) => [this._graph?.remappedIds?.get(k) ?? k, v]),
-									),
-									count: search.results.size,
-									paging: { hasMore: search.paging?.hasMore ?? false },
-							  }
-							: undefined,
-				};
+				void (await this.ensureSearchStartsInRange(graph, search));
+
+				return { results: this.getRemappedSearchResults(graph, search) };
 			}
 
 			return { results: undefined };
@@ -1601,7 +1591,7 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 			search = this._search!;
 		}
 
-		const firstResult = await this.ensureSearchStartsInRange(this._graph!, search);
+		const firstResult = await this.ensureSearchStartsInRange(graph, search);
 
 		let sendSelectedRows = false;
 		if (firstResult != null) {
@@ -1610,19 +1600,26 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 		}
 
 		return {
-			results: !search.results.size
-				? { count: 0 }
-				: {
-						ids: Object.fromEntries(
-							map(search.results, ([k, v]) => [this._graph?.remappedIds?.get(k) ?? k, v]),
-						),
-						count: search.results.size,
-						paging: { hasMore: search.paging?.hasMore ?? false },
-				  },
+			results: !search.results.size ? { count: 0 } : this.getRemappedSearchResults(graph, search),
 			selectedRows: sendSelectedRows ? this._selectedRows : undefined,
 		};
 	}
 
+	/** Remaps search results SHA for stashes to the root stash SHA */
+	private getRemappedSearchResults(graph: GitGraph, search: GitGraphSearch) {
+		if (!search.results.size) return undefined;
+
+		return {
+			ids: Object.fromEntries(
+				graph.remappedIds?.size
+					? map(search.results, ([k, v]) => [graph.remappedIds!.get(k) ?? k, v])
+					: search.results,
+			),
+			count: search.results.size,
+			paging: { hasMore: search.paging?.hasMore ?? false },
+		};
+	}
+
 	private onSearchOpenInView(e: SearchOpenInViewParams) {
 		if (this.repository == null) return;
 
@@ -1926,6 +1923,13 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 		if (this._graph == null) return;
 
 		const graph = this._graph;
+		const search = this._search;
+
+		let searchResults: GraphSearchResults | undefined;
+		if (search?.results.size && graph.remappedIds?.size) {
+			searchResults = this.getRemappedSearchResults(graph, search);
+		}
+
 		return this.host.notify(
 			DidChangeRowsNotification,
 			{
@@ -1936,6 +1940,8 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 				rowsStats: graph.rowsStats?.size ? Object.fromEntries(graph.rowsStats) : undefined,
 				rowsStatsLoading:
 					graph.rowsStatsDeferred?.isLoaded != null ? !graph.rowsStatsDeferred.isLoaded() : false,
+
+				searchResults: searchResults,
 				selectedRows: sendSelectedRows ? this._selectedRows : undefined,
 				paging: {
 					startingCursor: graph.paging?.startingCursor,
@@ -3110,8 +3116,6 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 		search?: GitGraphSearch,
 		cancellation?: CancellationToken,
 	) {
-		console.warn('##### updateGraphWithMoreRows', id, search);
-
 		const { defaultItemLimit, pageItemLimit } = configuration.get('graph');
 		const updatedGraph = await graph.more?.(pageItemLimit ?? defaultItemLimit, id ?? undefined, cancellation);
 		if (updatedGraph != null) {

src/webviews/plus/graph/protocol.ts

@@ -473,6 +473,7 @@ export interface DidChangeRowsParams {
 	refsMetadata?: GraphRefsMetadata | null;
 	rowsStats?: Record<string, GraphRowStats>;
 	rowsStatsLoading: boolean;
+	searchResults?: GraphSearchResults;
 	selectedRows?: GraphSelectedRows;
 }
 export const DidChangeRowsNotification = new IpcNotification<DidChangeRowsParams>(