From 245a82dcae204530ecf6dd9b74610c4491cc1627 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Sat, 24 Oct 2020 02:40:03 -0400 Subject: [PATCH] Fixes git cmd palette not closing after cmd pick --- src/commands/git/show.ts | 5 ++++- src/commands/git/status.ts | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/commands/git/show.ts b/src/commands/git/show.ts index 16fdbe9..710eae7 100644 --- a/src/commands/git/show.ts +++ b/src/commands/git/show.ts @@ -149,8 +149,11 @@ export class ShowGitCommand extends QuickCommand { if (result === StepResult.Break) continue; if (result instanceof GitCommandQuickPickItem) { - yield* result.executeSteps(this.pickedVia); + const r = yield* result.executeSteps(this.pickedVia); state.counter--; + if (r === StepResult.Break) { + QuickCommand.endSteps(state); + } continue; } diff --git a/src/commands/git/status.ts b/src/commands/git/status.ts index 609baa1..92fc0d9 100644 --- a/src/commands/git/status.ts +++ b/src/commands/git/status.ts @@ -107,8 +107,11 @@ export class StatusGitCommand extends QuickCommand { } if (result instanceof GitCommandQuickPickItem) { - yield* result.executeSteps(this.pickedVia); + const r = yield* result.executeSteps(this.pickedVia); state.counter--; + if (r === StepResult.Break) { + QuickCommand.endSteps(state); + } continue; }