SCM - fix "Open File" action when viewing a history item in the multi-file diff editor (microsoft#258196)

Author: lszomoru

src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.ts

@@ -483,6 +483,7 @@ class ChatEditingMultiDiffSource implements IResolvedMultiDiffSource {
 						entryDiff.originalURI,
 						entryDiff.modifiedURI,
 						undefined,
+						undefined,
 						{
 							[chatEditingResourceContextKey.key]: entry.entryId,
 						},
@@ -494,6 +495,7 @@ class ChatEditingMultiDiffSource implements IResolvedMultiDiffSource {
 				entry.originalURI,
 				entry.modifiedURI,
 				undefined,
+				undefined,
 				{
 					[chatEditingResourceContextKey.key]: entry.entryId,
 					// [inChatEditingSessionContextKey.key]: true

src/vs/workbench/contrib/multiDiffEditor/browser/actions.ts

@@ -56,6 +56,7 @@ export class GoToFileAction extends Action2 {
 		}
 
 		await editorService.openEditor({
+			label: item?.goToFileEditorTitle,
 			resource: targetUri,
 			options: {
 				selection: selections?.[0],

src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.ts

@@ -36,6 +36,7 @@ export class MultiDiffEditorItem {
 		readonly originalUri: URI | undefined,
 		readonly modifiedUri: URI | undefined,
 		readonly goToFileUri: URI | undefined,
+		readonly goToFileEditorTitle?: string | undefined,
 		readonly contextKeys?: Record<string, ContextKeyValue>
 	) {
 		if (!originalUri && !modifiedUri) {

src/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.ts

@@ -6,6 +6,7 @@
 import { ValueWithChangeEvent } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { observableFromEvent, ValueWithChangeEventFromObservable, waitForState } from '../../../../base/common/observable.js';
+import { basename } from '../../../../base/common/path.js';
 import { URI, UriComponents } from '../../../../base/common/uri.js';
 import { IMultiDiffEditorOptions } from '../../../../editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.js';
 import { localize2 } from '../../../../nls.js';
@@ -89,21 +90,23 @@ interface ScmHistoryItemUriFields {
 	readonly repositoryId: string;
 	readonly historyItemId: string;
 	readonly historyItemParentId?: string;
+	readonly historyItemDisplayId?: string;
 }
 
 export class ScmHistoryItemResolver implements IMultiDiffSourceResolver {
 	static readonly scheme = 'scm-history-item';
 
 	public static getMultiDiffSourceUri(provider: ISCMProvider, historyItem: ISCMHistoryItem): URI {
-		const historyItemParentId = historyItem.parentIds.length > 0 ? historyItem.parentIds[0] : undefined;
-
 		return URI.from({
 			scheme: ScmHistoryItemResolver.scheme,
 			path: provider.rootUri?.fsPath,
 			query: JSON.stringify({
 				repositoryId: provider.id,
 				historyItemId: historyItem.id,
-				historyItemParentId
+				historyItemParentId: historyItem.parentIds.length > 0
+					? historyItem.parentIds[0]
+					: undefined,
+				historyItemDisplayId: historyItem.displayId
 			} satisfies ScmHistoryItemUriFields)
 		}, true);
 	}
@@ -124,13 +127,14 @@ export class ScmHistoryItemResolver implements IMultiDiffSourceResolver {
 			return undefined;
 		}
 
-		const { repositoryId, historyItemId, historyItemParentId } = query;
+		const { repositoryId, historyItemId, historyItemParentId, historyItemDisplayId } = query;
 		if (typeof repositoryId !== 'string' || typeof historyItemId !== 'string' ||
-			(typeof historyItemParentId !== 'string' && historyItemParentId !== undefined)) {
+			(typeof historyItemParentId !== 'string' && historyItemParentId !== undefined) ||
+			(typeof historyItemDisplayId !== 'string' && historyItemDisplayId !== undefined)) {
 			return undefined;
 		}
 
-		return { repositoryId, historyItemId, historyItemParentId };
+		return { repositoryId, historyItemId, historyItemParentId, historyItemDisplayId };
 	}
 
 	constructor(@ISCMService private readonly _scmService: ISCMService) { }
@@ -140,14 +144,21 @@ export class ScmHistoryItemResolver implements IMultiDiffSourceResolver {
 	}
 
 	async resolveDiffSource(uri: URI): Promise<IResolvedMultiDiffSource> {
-		const { repositoryId, historyItemId, historyItemParentId } = ScmHistoryItemResolver.parseUri(uri)!;
+		const { repositoryId, historyItemId, historyItemParentId, historyItemDisplayId } = ScmHistoryItemResolver.parseUri(uri)!;
 
 		const repository = this._scmService.getRepository(repositoryId);
 		const historyProvider = repository?.provider.historyProvider.get();
 		const historyItemChanges = await historyProvider?.provideHistoryItemChanges(historyItemId, historyItemParentId) ?? [];
 
 		const resources = ValueWithChangeEvent.const<readonly MultiDiffEditorItem[]>(
-			historyItemChanges.map(change => new MultiDiffEditorItem(change.originalUri, change.modifiedUri, change.uri)));
+			historyItemChanges.map(change => {
+				const goToFileEditorTitle = change.modifiedUri
+					? `${basename(change.modifiedUri.fsPath)} (${historyItemDisplayId ?? historyItemId})`
+					: undefined;
+
+				return new MultiDiffEditorItem(change.originalUri, change.modifiedUri, change.modifiedUri, goToFileEditorTitle);
+			})
+		);
 
 		return { resources };
 	}

src/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel.ts

@@ -466,7 +466,7 @@ export abstract class NotebookMultiDiffEditorItem extends MultiDiffEditorItem {
 		public kind: 'Cell' | 'Metadata' | 'Output',
 		contextKeys?: Record<string, ContextKeyValue>,
 	) {
-		super(originalUri, modifiedUri, goToFileUri, contextKeys);
+		super(originalUri, modifiedUri, goToFileUri, undefined, contextKeys);
 	}
 }