Browse Source

Fixes #2354 avoids disabling quickpick

VS Code made a change (or a new bug) that focuses the quickpick container rather than the input if the quick pick is disabled when it is shown
main
Eric Amodio 2 years ago
parent
commit
2ad0de95ed
7 changed files with 4 additions and 18 deletions
  1. +4
    -0
      CHANGELOG.md
  2. +0
    -2
      src/commands/git/pull.ts
  3. +0
    -2
      src/commands/git/push.ts
  4. +0
    -2
      src/commands/gitCommands.ts
  5. +0
    -4
      src/commands/quickCommand.steps.ts
  6. +0
    -6
      src/quickpicks/commitPicker.ts
  7. +0
    -2
      src/quickpicks/referencePicker.ts

+ 4
- 0
CHANGELOG.md View File

@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
## [Unreleased]
### Fixed
- Fixes [#2354](https://github.com/gitkraken/vscode-gitlens/issues/2354) - 'GitLens: Compare working three with...' Not able to select branch using keyboard
## [13.1.0] - 2022-11-17
### Added

+ 0
- 2
src/commands/git/pull.ts View File

@ -232,14 +232,12 @@ export class PullGitCommand extends QuickCommand {
}`;
quickpick.busy = true;
quickpick.enabled = false;
try {
await repo.fetch({ progress: true });
// Signal that the step should be retried
return true;
} finally {
quickpick.busy = false;
quickpick.enabled = true;
}
},
},

+ 0
- 2
src/commands/git/push.ts View File

@ -396,14 +396,12 @@ export class PushGitCommand extends QuickCommand {
}`;
quickpick.busy = true;
quickpick.enabled = false;
try {
await repo.fetch({ progress: true });
// Signal that the step should be retried
return true;
} finally {
quickpick.busy = false;
quickpick.enabled = true;
}
};
}

+ 0
- 2
src/commands/gitCommands.ts View File

@ -457,7 +457,6 @@ export class GitCommandsCommand extends Command {
if (step.onDidLoadMore == null) return;
quickpick.busy = true;
quickpick.enabled = false;
try {
const items = await step.onDidLoadMore?.(quickpick);
@ -480,7 +479,6 @@ export class GitCommandsCommand extends Command {
}
} finally {
quickpick.busy = false;
quickpick.enabled = true;
}
}

+ 0
- 4
src/commands/quickCommand.steps.ts View File

@ -714,7 +714,6 @@ export async function* pickBranchOrTagStep<
onDidClickButton: async (quickpick, button) => {
if (button === showTagsButton) {
quickpick.busy = true;
quickpick.enabled = false;
try {
context.showTags = !context.showTags;
@ -730,7 +729,6 @@ export async function* pickBranchOrTagStep<
quickpick.items = branchesAndOrTags;
} finally {
quickpick.busy = false;
quickpick.enabled = true;
}
}
},
@ -823,7 +821,6 @@ export async function* pickBranchOrTagStepMultiRepo<
onDidClickButton: async (quickpick, button) => {
if (button === showTagsButton) {
quickpick.busy = true;
quickpick.enabled = false;
try {
context.showTags = !context.showTags;
@ -845,7 +842,6 @@ export async function* pickBranchOrTagStepMultiRepo<
quickpick.items = branchesAndOrTags;
} finally {
quickpick.busy = false;
quickpick.enabled = true;
}
}
},

+ 0
- 6
src/quickpicks/commitPicker.ts View File

@ -35,7 +35,6 @@ export namespace CommitPicker {
if (isPromise(log)) {
quickpick.busy = true;
quickpick.enabled = false;
quickpick.show();
log = await log;
@ -68,7 +67,6 @@ export namespace CommitPicker {
async function loadMore() {
quickpick.busy = true;
quickpick.enabled = false;
try {
log = await (await log)?.more?.(configuration.get('advanced.maxListItems'));
@ -92,7 +90,6 @@ export namespace CommitPicker {
}
} finally {
quickpick.busy = false;
quickpick.enabled = true;
}
}
@ -162,7 +159,6 @@ export namespace CommitPicker {
);
quickpick.busy = false;
quickpick.enabled = true;
quickpick.show();
});
@ -208,7 +204,6 @@ export namespace StashPicker {
if (isPromise(stash)) {
quickpick.busy = true;
quickpick.enabled = false;
quickpick.show();
stash = await stash;
@ -296,7 +291,6 @@ export namespace StashPicker {
);
quickpick.busy = false;
quickpick.enabled = true;
quickpick.show();
});

+ 0
- 2
src/quickpicks/referencePicker.ts View File

@ -89,7 +89,6 @@ export namespace ReferencePicker {
}
quickpick.busy = true;
quickpick.enabled = false;
quickpick.show();
@ -104,7 +103,6 @@ export namespace ReferencePicker {
quickpick.items = await items;
quickpick.busy = false;
quickpick.enabled = true;
try {
let pick = await new Promise<ReferencesQuickPickItem | undefined>(resolve => {

Loading…
Cancel
Save