SCM - drag and drop change from graph to chat (microsoft#257091)

Author: lszomoru

src/vs/platform/dnd/browser/dnd.ts

@@ -34,6 +34,7 @@ export const CodeDataTransfers = {
 	SYMBOLS: 'application/vnd.code.symbols',
 	MARKERS: 'application/vnd.code.diagnostics',
 	NOTEBOOK_CELL_OUTPUT: 'notebook-cell-output',
+	SCM_HISTORY_ITEM: 'scm-history-item',
 };
 
 export interface IDraggedResourceEditorInput extends IBaseTextResourceEditorInput {

src/vs/workbench/contrib/chat/browser/chatAttachmentResolveService.ts

@@ -25,8 +25,9 @@ import { UntitledTextEditorInput } from '../../../services/untitled/common/untit
 import { createNotebookOutputVariableEntry, NOTEBOOK_CELL_OUTPUT_MIME_TYPE_LIST_FOR_CHAT_CONST } from '../../notebook/browser/contrib/chat/notebookChatUtils.js';
 import { getOutputViewModelFromId } from '../../notebook/browser/controller/cellOutputActions.js';
 import { getNotebookEditorFromEditorPane } from '../../notebook/browser/notebookBrowser.js';
+import { SCMHistoryItemTransferData } from '../../scm/browser/scmHistoryChatContext.js';
 import { CHAT_ATTACHABLE_IMAGE_MIME_TYPES, getAttachableImageExtension } from '../common/chatModel.js';
-import { IChatRequestVariableEntry, OmittedState, IDiagnosticVariableEntry, IDiagnosticVariableEntryFilterData, ISymbolVariableEntry, toPromptFileVariableEntry, PromptFileVariableKind } from '../common/chatVariableEntries.js';
+import { IChatRequestVariableEntry, OmittedState, IDiagnosticVariableEntry, IDiagnosticVariableEntryFilterData, ISymbolVariableEntry, toPromptFileVariableEntry, PromptFileVariableKind, ISCMHistoryItemVariableEntry } from '../common/chatVariableEntries.js';
 import { getPromptsTypeForLanguageId, PromptsType } from '../common/promptSyntax/promptTypes.js';
 import { imageToHash } from './chatPasteProviders.js';
 import { resizeImage } from './imageUtils.js';
@@ -45,6 +46,7 @@ export interface IChatAttachmentResolveService {
 	resolveMarkerAttachContext(markers: MarkerTransferData[]): IDiagnosticVariableEntry[];
 	resolveSymbolsAttachContext(symbols: DocumentSymbolTransferData[]): ISymbolVariableEntry[];
 	resolveNotebookOutputAttachContext(data: NotebookCellOutputTransferData): IChatRequestVariableEntry[];
+	resolveSourceControlHistoryItemAttachContext(data: SCMHistoryItemTransferData[]): ISCMHistoryItemVariableEntry[];
 }
 
 export class ChatAttachmentResolveService implements IChatAttachmentResolveService {
@@ -274,6 +276,21 @@ export class ChatAttachmentResolveService implements IChatAttachmentResolveServi
 
 		return [];
 	}
+
+	// --- SOURCE CONTROL ---
+
+	public resolveSourceControlHistoryItemAttachContext(data: SCMHistoryItemTransferData[]): ISCMHistoryItemVariableEntry[] {
+		return data.map(d => ({
+			id: d.historyItem.id,
+			name: d.name,
+			value: URI.revive(d.resource),
+			historyItem: {
+				...d.historyItem,
+				references: []
+			},
+			kind: 'scmHistoryItem'
+		} satisfies ISCMHistoryItemVariableEntry));
+	}
 }
 
 function symbolId(resource: URI, range?: IRange): string {

src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts

@@ -25,6 +25,7 @@ import { IChatAttachmentResolveService, ImageTransferData } from './chatAttachme
 import { ChatAttachmentModel } from './chatAttachmentModel.js';
 import { IChatInputStyles } from './chatInputPart.js';
 import { convertStringToUInt8Array } from './imageUtils.js';
+import { extractSCMHistoryItemDropData } from '../../scm/browser/scmHistoryChatContext.js';
 
 enum ChatDragAndDropType {
 	FILE_INTERNAL,
@@ -34,7 +35,8 @@ enum ChatDragAndDropType {
 	SYMBOL,
 	HTML,
 	MARKER,
-	NOTEBOOK_CELL_OUTPUT
+	NOTEBOOK_CELL_OUTPUT,
+	SCM_HISTORY_ITEM
 }
 
 const IMAGE_DATA_REGEX = /^data:image\/[a-z]+;base64,/;
@@ -180,6 +182,8 @@ export class ChatDragAndDrop extends Themable {
 		// This is an estimation based on the datatransfer types/items
 		if (containsDragType(e, CodeDataTransfers.NOTEBOOK_CELL_OUTPUT)) {
 			return ChatDragAndDropType.NOTEBOOK_CELL_OUTPUT;
+		} else if (containsDragType(e, CodeDataTransfers.SCM_HISTORY_ITEM)) {
+			return ChatDragAndDropType.SCM_HISTORY_ITEM;
 		} else if (containsImageDragType(e)) {
 			return this.extensionService.extensions.some(ext => isProposedApiEnabled(ext, 'chatReferenceBinaryData')) ? ChatDragAndDropType.IMAGE : undefined;
 		} else if (containsDragType(e, 'text/html')) {
@@ -215,6 +219,7 @@ export class ChatDragAndDrop extends Themable {
 			case ChatDragAndDropType.MARKER: return localize('problem', 'Problem');
 			case ChatDragAndDropType.HTML: return localize('url', 'URL');
 			case ChatDragAndDropType.NOTEBOOK_CELL_OUTPUT: return localize('notebookOutput', 'Output');
+			case ChatDragAndDropType.SCM_HISTORY_ITEM: return localize('scmHistoryItem', 'Change');
 		}
 	}
 
@@ -230,6 +235,13 @@ export class ChatDragAndDrop extends Themable {
 			}
 		}
 
+		if (containsDragType(e, CodeDataTransfers.SCM_HISTORY_ITEM)) {
+			const scmHistoryItemData = extractSCMHistoryItemDropData(e);
+			if (scmHistoryItemData) {
+				return this.chatAttachmentResolveService.resolveSourceControlHistoryItemAttachContext(scmHistoryItemData);
+			}
+		}
+
 		const markerData = extractMarkerDropData(e);
 		if (markerData) {
 			return this.chatAttachmentResolveService.resolveMarkerAttachContext(markerData);

src/vs/workbench/contrib/scm/browser/scmHistoryChatContext.ts

@@ -10,12 +10,13 @@ import { Codicon } from '../../../../base/common/codicons.js';
 import { fromNow } from '../../../../base/common/date.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
-import { URI } from '../../../../base/common/uri.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
 import { ITextModel } from '../../../../editor/common/model.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
 import { ITextModelContentProvider, ITextModelService } from '../../../../editor/common/services/resolverService.js';
 import { localize } from '../../../../nls.js';
 import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { CodeDataTransfers } from '../../../../platform/dnd/browser/dnd.js';
 import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { IViewsService } from '../../../services/views/common/viewsService.js';
@@ -27,6 +28,25 @@ import { ScmHistoryItemResolver } from '../../multiDiffEditor/browser/scmMultiDi
 import { ISCMHistoryItem } from '../common/history.js';
 import { ISCMProvider, ISCMService, ISCMViewService } from '../common/scm.js';
 
+export interface SCMHistoryItemTransferData {
+	readonly name: string;
+	readonly resource: UriComponents;
+	readonly historyItem: ISCMHistoryItem;
+}
+
+export function extractSCMHistoryItemDropData(e: DragEvent): SCMHistoryItemTransferData[] | undefined {
+	if (!e.dataTransfer?.types.includes(CodeDataTransfers.SCM_HISTORY_ITEM)) {
+		return undefined;
+	}
+
+	const data = e.dataTransfer?.getData(CodeDataTransfers.SCM_HISTORY_ITEM);
+	if (!data) {
+		return undefined;
+	}
+
+	return JSON.parse(data) as SCMHistoryItemTransferData[];
+}
+
 export class SCMHistoryItemContextContribution extends Disposable implements IWorkbenchContribution {
 
 	static readonly ID = 'workbench.contrib.chat.scmHistoryItemContextContribution';

src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts

@@ -10,7 +10,7 @@ import { IHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegate.
 import { IconLabel } from '../../../../base/browser/ui/iconLabel/iconLabel.js';
 import { IIdentityProvider, IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
 import { LabelFuzzyScore } from '../../../../base/browser/ui/tree/abstractTree.js';
-import { IAsyncDataSource, ITreeContextMenuEvent, ITreeElementRenderDetails, ITreeNode } from '../../../../base/browser/ui/tree/tree.js';
+import { IAsyncDataSource, ITreeContextMenuEvent, ITreeDragAndDrop, ITreeElementRenderDetails, ITreeNode } from '../../../../base/browser/ui/tree/tree.js';
 import { createMatches, FuzzyScore, IMatch } from '../../../../base/common/filters.js';
 import { combinedDisposable, Disposable, DisposableStore, IDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { autorun, autorunWithStore, derived, IObservable, observableValue, waitForState, constObservable, latestChangedValue, observableFromEvent, runOnChange, observableSignal, ISettableObservable } from '../../../../base/common/observable.js';
@@ -72,6 +72,10 @@ import { ITreeCompressionDelegate } from '../../../../base/browser/ui/tree/async
 import { ICompressibleKeyboardNavigationLabelProvider, ICompressibleTreeRenderer } from '../../../../base/browser/ui/tree/objectTree.js';
 import { ICompressedTreeNode } from '../../../../base/browser/ui/tree/compressedObjectTreeModel.js';
 import { ILabelService } from '../../../../platform/label/common/label.js';
+import { IDragAndDropData } from '../../../../base/browser/dnd.js';
+import { ElementsDragAndDropData, ListViewTargetSector } from '../../../../base/browser/ui/list/listView.js';
+import { CodeDataTransfers } from '../../../../platform/dnd/browser/dnd.js';
+import { SCMHistoryItemTransferData } from './scmHistoryChatContext.js';
 
 const PICK_REPOSITORY_ACTION_ID = 'workbench.scm.action.graph.pickRepository';
 const PICK_HISTORY_ITEM_REFS_ACTION_ID = 'workbench.scm.action.graph.pickHistoryItemRefs';
@@ -946,6 +950,84 @@ class SCMHistoryTreeDataSource extends Disposable implements IAsyncDataSource<SC
 	}
 }
 
+class SCMHistoryTreeDragAndDrop implements ITreeDragAndDrop<TreeElement> {
+	getDragURI(element: TreeElement): string | null {
+		const uri = this._getTreeElementUri(element);
+		return uri ? uri.toString() : null;
+	}
+
+	onDragStart(data: IDragAndDropData, originalEvent: DragEvent): void {
+		if (!originalEvent.dataTransfer) {
+			return;
+		}
+
+		const historyItems = this._getDragAndDropData(data as ElementsDragAndDropData<TreeElement, TreeElement[]>);
+		if (historyItems.length === 0) {
+			return;
+		}
+
+		originalEvent.dataTransfer.setData(CodeDataTransfers.SCM_HISTORY_ITEM, JSON.stringify(historyItems));
+	}
+
+	getDragLabel(elements: TreeElement[], originalEvent: DragEvent): string | undefined {
+		if (elements.length === 1) {
+			const element = elements[0];
+			return this._getTreeElementLabel(element);
+		}
+
+		return String(elements.length);
+	}
+
+	onDragOver(data: IDragAndDropData, targetElement: TreeElement | undefined, targetIndex: number | undefined, targetSector: ListViewTargetSector | undefined, originalEvent: DragEvent): boolean {
+		return false;
+	}
+
+	drop(data: IDragAndDropData, targetElement: TreeElement | undefined, targetIndex: number | undefined, targetSector: ListViewTargetSector | undefined, originalEvent: DragEvent): void { }
+
+	private _getDragAndDropData(data: ElementsDragAndDropData<TreeElement, TreeElement[]>): SCMHistoryItemTransferData[] {
+		const historyItems: SCMHistoryItemTransferData[] = [];
+		for (const element of [...data.context ?? [], ...data.elements]) {
+			if (!isSCMHistoryItemViewModelTreeElement(element)) {
+				continue;
+			}
+
+			const provider = element.repository.provider;
+			const historyItem = element.historyItemViewModel.historyItem;
+			const attachmentName = `$(${Codicon.repo.id})\u00A0${provider.name}\u00A0$(${Codicon.gitCommit.id})\u00A0${historyItem.displayId ?? historyItem.id}`;
+
+			historyItems.push({
+				name: attachmentName,
+				resource: ScmHistoryItemResolver.getMultiDiffSourceUri(provider, historyItem),
+				historyItem: historyItem
+			});
+		}
+
+		return historyItems;
+	}
+
+	private _getTreeElementLabel(element: TreeElement): string | undefined {
+		if (isSCMHistoryItemViewModelTreeElement(element)) {
+			const historyItem = element.historyItemViewModel.historyItem;
+			return getHistoryItemEditorTitle(historyItem);
+		}
+
+		return undefined;
+	}
+
+	private _getTreeElementUri(element: TreeElement): URI | undefined {
+		if (isSCMHistoryItemViewModelTreeElement(element)) {
+			const provider = element.repository.provider;
+			const historyItem = element.historyItemViewModel.historyItem;
+
+			return ScmHistoryItemResolver.getMultiDiffSourceUri(provider, historyItem);
+		}
+
+		return undefined;
+	}
+
+	dispose(): void { }
+}
+
 type HistoryItemRefsFilter = 'all' | 'auto' | string[];
 
 type RepositoryState = {
@@ -1793,6 +1875,7 @@ export class SCMHistoryViewPane extends ViewPane {
 				identityProvider: this._treeIdentityProvider,
 				collapseByDefault: (e: unknown) => !isSCMHistoryItemChangeNode(e),
 				compressionEnabled: compressionEnabled.get(),
+				dnd: new SCMHistoryTreeDragAndDrop(),
 				keyboardNavigationLabelProvider: new SCMHistoryTreeKeyboardNavigationLabelProvider(),
 				horizontalScrolling: false,
 				multipleSelectionSupport: false