Преглед на файлове

Fixes unable to go back after show all

main
Eric Amodio преди 7 години
родител
ревизия
76ee2bc85c
променени са 1 файла, в които са добавени 7 реда и са изтрити 5 реда
  1. +7
    -5
      src/commands/showCommitSearch.ts

+ 7
- 5
src/commands/showCommitSearch.ts Целия файл

@ -119,16 +119,18 @@ export class ShowCommitSearchCommand extends ActiveEditorCachedCommand {
if (progressCancellation.token.isCancellationRequested) return undefined;
const goBackCommand = args.goBackCommand || new CommandQuickPickItem({
label: `go back ${GlyphChars.ArrowBack}`,
description: `${Strings.pad(GlyphChars.Dash, 2, 3)} to commit search`
}, Commands.ShowCommitSearch, [uri, originalArgs]);
const pick = await CommitsQuickPick.show(this.git, log, searchLabel!, progressCancellation, {
goBackCommand: new CommandQuickPickItem({
label: `go back ${GlyphChars.ArrowBack}`,
description: `${Strings.pad(GlyphChars.Dash, 2, 3)} to commit search`
}, Commands.ShowCommitSearch, [uri, originalArgs]),
goBackCommand: goBackCommand,
showAllCommand: log !== undefined && log.truncated
? new CommandQuickPickItem({
label: `$(sync) Show All Commits`,
description: `${Strings.pad(GlyphChars.Dash, 2, 3)} this may take a while`
}, Commands.ShowCommitSearch, [uri, { ...args, maxCount: 0 }])
}, Commands.ShowCommitSearch, [uri, { ...args, maxCount: 0, goBackCommand: goBackCommand }])
: undefined,
showInResultsExplorerCommand: log !== undefined
? new ShowCommitsSearchInResultsQuickPickItem(log, searchLabel!)

Зареждане…
Отказ
Запис