Refactors quick pick lists

2026-01-14 10:03:15 -05:00 · 2017-02-28 01:58:14 -05:00
parent 41fd06e491
commit 3c8fe9efb8
14 changed files with 452 additions and 466 deletions
--- a/src/quickPicks/commitDetails.ts
+++ b/src/quickPicks/commitDetails.ts
@@ -0,0 +1,146 @@
+'use strict';
+import { Iterables } from '../system';
+import { QuickPickItem, QuickPickOptions, Uri, window } from 'vscode';
+import { Commands } from '../commands';
+import GitProvider, { GitCommit, GitLogCommit, GitUri } from '../gitProvider';
+import { CommitWithFileStatusQuickPickItem } from './gitQuickPicks';
+import { CommandQuickPickItem, getQuickPickIgnoreFocusOut, OpenFileCommandQuickPickItem, OpenFilesCommandQuickPickItem } from './quickPicks';
+import * as moment from 'moment';
+import * as path from 'path';
+
+export { CommandQuickPickItem, CommitWithFileStatusQuickPickItem };
+
+export class OpenCommitFileCommandQuickPickItem extends OpenFileCommandQuickPickItem {
+
+    constructor(commit: GitCommit, item?: QuickPickItem) {
+        const uri = Uri.file(path.resolve(commit.repoPath, commit.fileName));
+        super(uri, item || {
+            label: `$(file-symlink-file) Open Working Tree File`,
+            description: `\u00a0 \u2014 \u00a0\u00a0 ${commit.getFormattedPath()}`
+        });
+    }
+}
+
+export class OpenCommitFilesCommandQuickPickItem extends OpenFilesCommandQuickPickItem {
+
+    constructor(commit: GitLogCommit, item?: QuickPickItem) {
+        const repoPath = commit.repoPath;
+        const uris = commit.fileStatuses.map(_ => Uri.file(path.resolve(repoPath, _.fileName)));
+        super(uris, item || {
+            label: `$(file-symlink-file) Open Working Tree Files`,
+            description: undefined,
+            detail: `Opens all of the files in commit $(git-commit) ${commit.sha}`
+        });
+    }
+}
+
+export class CommitDetailsQuickPick {
+
+    static async show(commit: GitLogCommit, uri: Uri, goBackCommand?: CommandQuickPickItem): Promise<CommitWithFileStatusQuickPickItem | CommandQuickPickItem | undefined> {
+        const items: (CommitWithFileStatusQuickPickItem | CommandQuickPickItem)[] = commit.fileStatuses.map(fs => new CommitWithFileStatusQuickPickItem(commit, fs.fileName, fs.status));
+
+        items.splice(0, 0, new CommandQuickPickItem({
+            label: `$(clippy) Copy Commit Sha to Clipboard`,
+            description: `\u00a0 \u2014 \u00a0\u00a0 $(git-commit) ${commit.sha}`
+        }, Commands.CopyShaToClipboard, [uri, commit.sha]));
+
+        items.splice(1, 0, new CommandQuickPickItem({
+            label: `$(clippy) Copy Commit Message to Clipboard`,
+            description: `\u00a0 \u2014 \u00a0\u00a0 $(git-commit) ${commit.message}`
+        }, Commands.CopyMessageToClipboard, [uri, commit.sha, commit.message]));
+
+        items.splice(2, 0, new OpenCommitFilesCommandQuickPickItem(commit));
+
+        if (goBackCommand) {
+            items.splice(0, 0, goBackCommand);
+        }
+
+        const result = await window.showQuickPick(items, {
+            matchOnDescription: true,
+            matchOnDetail: true,
+            placeHolder: `${commit.sha} \u2022 ${commit.author}, ${moment(commit.date).fromNow()} \u2022 ${commit.message}`,
+            ignoreFocusOut: getQuickPickIgnoreFocusOut()
+            // onDidSelectItem: (item: QuickPickItem) => {
+            //     if (item instanceof FileQuickPickItem) {
+            //         item.preview();
+            //     }
+            // }
+        } as QuickPickOptions);
+
+        return result;
+    }
+}
+
+export class CommitFileDetailsQuickPick {
+
+    static async show(git: GitProvider, commit: GitCommit, workingFileName: string, uri: Uri, currentCommand?: CommandQuickPickItem, goBackCommand?: CommandQuickPickItem, options: { showFileHistory?: boolean } = {}): Promise<CommandQuickPickItem | undefined> {
+        const items: CommandQuickPickItem[] = [];
+
+        const workingName = (workingFileName && path.basename(workingFileName)) || path.basename(commit.fileName);
+
+        const isUncommitted = commit.isUncommitted;
+        if (isUncommitted) {
+            // Since we can't trust the previous sha on an uncommitted commit, find the last commit for this file
+            const log = await git.getLogForFile(commit.uri.fsPath, undefined, undefined, undefined, 2);
+            if (!log) return undefined;
+
+            commit = Iterables.first(log.commits.values());
+        }
+
+        if (commit.previousSha) {
+            items.push(new CommandQuickPickItem({
+                label: `$(git-compare) Compare with Previous Commit`,
+                description: `\u00a0 \u2014 \u00a0\u00a0 $(git-commit) ${commit.previousSha} \u00a0 $(git-compare) \u00a0 $(git-commit) ${commit.sha}`
+            }, Commands.DiffWithPrevious, [commit.uri, commit]));
+        }
+
+        items.push(new CommandQuickPickItem({
+            label: `$(git-compare) Compare with Working Tree`,
+            description: `\u00a0 \u2014 \u00a0\u00a0 $(git-commit) ${commit.sha} \u00a0 $(git-compare) \u00a0 $(file-text) ${workingName}`
+        }, Commands.DiffWithWorking, [uri, commit]));
+
+        items.push(new CommandQuickPickItem({
+            label: `$(diff) Show Changed Files`,
+            description: undefined, //`\u00a0 \u2014 \u00a0\u00a0 $(git-commit) ${commit.sha}`,
+            detail: `Shows all of the changed files in commit $(git-commit) ${commit.sha}`
+        }, Commands.ShowQuickCommitDetails, [new GitUri(commit.uri, commit), commit.sha, undefined, currentCommand]));
+
+        items.push(new CommandQuickPickItem({
+            label: `$(clippy) Copy Commit Sha to Clipboard`,
+            description: `\u00a0 \u2014 \u00a0\u00a0 $(git-commit) ${commit.sha}`
+        }, Commands.CopyShaToClipboard, [uri, commit.sha]));
+
+        items.push(new CommandQuickPickItem({
+            label: `$(clippy) Copy Commit Message to Clipboard`,
+            description: `\u00a0 \u2014 \u00a0\u00a0 $(git-commit) ${commit.message}`
+        }, Commands.CopyMessageToClipboard, [uri, commit.sha, commit.message]));
+
+        items.push(new OpenCommitFileCommandQuickPickItem(commit));
+
+        if (options.showFileHistory) {
+            if (workingFileName) {
+                items.push(new CommandQuickPickItem({
+                    label: `$(history) Show File History`,
+                    description: undefined, //`\u00a0 \u2014 \u00a0\u00a0 ${path.basename(commit.fileName)}`,
+                    detail: `Shows the commit history of the file, starting at the most recent commit`
+                }, Commands.ShowQuickFileHistory, [commit.uri, undefined, undefined, currentCommand]));
+            }
+
+            items.push(new CommandQuickPickItem({
+                label: `$(history) Show Previous File History`,
+                description: undefined, //`\u00a0 \u2014 \u00a0\u00a0 ${path.basename(commit.fileName)}`,
+                detail: `Shows the previous commit history of the file, starting at $(git-commit) ${commit.sha}`
+            }, Commands.ShowQuickFileHistory, [new GitUri(commit.uri, commit), undefined, undefined, currentCommand]));
+        }
+
+        if (goBackCommand) {
+            items.splice(0, 0, goBackCommand);
+        }
+
+        return await window.showQuickPick(items, {
+            matchOnDescription: true,
+            placeHolder: `${commit.getFormattedPath()} \u2022 ${isUncommitted ? 'Uncommitted \u21E8 ' : '' }${commit.sha} \u2022 ${commit.author}, ${moment(commit.date).fromNow()} \u2022 ${commit.message}`,
+            ignoreFocusOut: getQuickPickIgnoreFocusOut()
+        } as QuickPickOptions);
+    }
+}