Refactors quick pick lists

This commit is contained in:
Eric Amodio
2017-02-28 01:58:14 -05:00
parent 41fd06e491
commit 3c8fe9efb8
14 changed files with 452 additions and 466 deletions

View File

@@ -4,8 +4,7 @@ import { commands, TextEditor, Uri, window } from 'vscode';
import { ActiveEditorCommand, Commands } from '../commands';
import GitProvider, { GitCommit, GitLogCommit, GitUri } from '../gitProvider';
import { Logger } from '../logger';
import { CommandQuickPickItem, FileQuickPickItem } from './quickPickItems';
import { CommitQuickPick, CommitFilesQuickPick } from './quickPicks';
import { CommandQuickPickItem, CommitFileDetailsQuickPick, CommitDetailsQuickPick, CommitWithFileStatusQuickPickItem } from '../quickPicks/commitDetails';
export default class ShowQuickCommitDetailsCommand extends ActiveEditorCommand {
@@ -45,7 +44,7 @@ export default class ShowQuickCommitDetailsCommand extends ActiveEditorCommand {
}
try {
let pick: FileQuickPickItem | CommandQuickPickItem;
let pick: CommitWithFileStatusQuickPickItem | CommandQuickPickItem;
let alreadyPickedCommit = !!commit;
let workingFileName: string;
if (!alreadyPickedCommit) {
@@ -54,7 +53,7 @@ export default class ShowQuickCommitDetailsCommand extends ActiveEditorCommand {
commit = Iterables.first(log.commits.values());
pick = await CommitFilesQuickPick.show(commit as GitLogCommit, uri, goBackCommand);
pick = await CommitDetailsQuickPick.show(commit as GitLogCommit, uri, goBackCommand);
if (!pick) return undefined;
if (pick instanceof CommandQuickPickItem) {
@@ -79,7 +78,7 @@ export default class ShowQuickCommitDetailsCommand extends ActiveEditorCommand {
workingFileName = !workingCommit ? commit.fileName : undefined;
}
pick = await CommitQuickPick.show(this.git, commit, workingFileName, uri,
pick = await CommitFileDetailsQuickPick.show(this.git, commit, workingFileName, uri,
// Create a command to get back to where we are right now
new CommandQuickPickItem({
label: `go back \u21A9`,