Skip to content

add DnD for SCM history items into terminal, editor and external #273628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −2
Open

add DnD for SCM history items into terminal, editor and external #273628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ 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 { DataTransfers, 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';
Expand Down Expand Up @@ -953,6 +953,8 @@ class SCMHistoryTreeDragAndDrop implements ITreeDragAndDrop<TreeElement> {
return;
}

originalEvent.dataTransfer.setData(DataTransfers.TEXT, historyItems.map(hi => hi.historyItem.id).join(' '));

originalEvent.dataTransfer.setData(CodeDataTransfers.SCM_HISTORY_ITEM, JSON.stringify(historyItems));
}

Expand Down
15 changes: 14 additions & 1 deletion src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ import type { IProgressState } from '@xterm/addon-progress';
import { refreshShellIntegrationInfoStatus } from './terminalTooltip.js';
import { generateUuid } from '../../../../base/common/uuid.js';
import { PromptInputState } from '../../../../platform/terminal/common/capabilities/commandDetection/promptInputModel.js';
import { extractSCMHistoryItemDropData, SCMHistoryItemTransferData } from '../../scm/browser/scmHistoryChatContext.js';

const enum Constants {
/**
Expand Down Expand Up @@ -1204,6 +1205,10 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
this.focus();
await this.sendPath(path, false);
}));
store.add(dndController.onDropSCMHistoryItem(commitHash => {
this.focus();
this.sendText(commitHash.historyItem.id, false);
}));
store.add(new dom.DragAndDropObserver(container, dndController));
this._dndObserver.value = store;
}
Expand Down Expand Up @@ -2428,6 +2433,8 @@ class TerminalInstanceDragAndDropController extends Disposable implements dom.ID
get onDropFile(): Event<string | URI> { return this._onDropFile.event; }
private readonly _onDropTerminal = this._register(new Emitter<IRequestAddInstanceToGroupEvent>());
get onDropTerminal(): Event<IRequestAddInstanceToGroupEvent> { return this._onDropTerminal.event; }
private readonly _onDropSCMHistoryItem = this._register(new Emitter<SCMHistoryItemTransferData>());
get onDropSCMHistoryItem(): Event<SCMHistoryItemTransferData> { return this._onDropSCMHistoryItem.event; }

constructor(
private readonly _container: HTMLElement,
Expand All @@ -2444,7 +2451,7 @@ class TerminalInstanceDragAndDropController extends Disposable implements dom.ID
}

onDragEnter(e: DragEvent) {
if (!containsDragType(e, DataTransfers.FILES, DataTransfers.RESOURCES, TerminalDataTransfers.Terminals, CodeDataTransfers.FILES)) {
if (!containsDragType(e, DataTransfers.FILES, DataTransfers.RESOURCES, TerminalDataTransfers.Terminals, CodeDataTransfers.FILES, CodeDataTransfers.SCM_HISTORY_ITEM)) {
return;
}

Expand Down Expand Up @@ -2520,6 +2527,12 @@ class TerminalInstanceDragAndDropController extends Disposable implements dom.ID
path = URI.file(getPathForFile(e.dataTransfer.files[0])!);
}

const commitHashes = extractSCMHistoryItemDropData(e);
if (!path && commitHashes?.length) {
this._onDropSCMHistoryItem.fire(commitHashes[0]);
return;
}

if (!path) {
return;
}
Expand Down