Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Git - 💄 show busy state while populating refs #202513

Merged
merged 1 commit into from
Jan 15, 2024
+14 −6
Merged

Git - 💄 show busy state while populating refs #202513

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 14 additions & 6 deletions extensions/git/src/commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2450,6 +2450,7 @@ export class CommandCenter {
const disposables: Disposable[] = [];
const quickPick = window.createQuickPick();
quickPick.busy = true;
quickPick.sortByLabel = false;
quickPick.placeholder = opts?.detached
? l10n.t('Select a branch to checkout in detached mode')
: l10n.t('Select a branch or tag to checkout');
Expand All @@ -2459,7 +2460,6 @@ export class CommandCenter {
picks.push(... await createCheckoutItems(repository, opts?.detached));
quickPick.items = picks;
quickPick.busy = false;
quickPick.sortByLabel = false;

const choice = await new Promise<QuickPickItem | undefined>(c => {
disposables.push(quickPick.onDidHide(() => c(undefined)));
Expand Down Expand Up @@ -2660,18 +2660,26 @@ export class CommandCenter {
}

private async pickRef<T extends QuickPickItem>(items: Promise<T[]>, placeHolder: string): Promise<T | undefined> {
const listeners: Disposable[] = [];
const disposables: Disposable[] = [];
const quickPick = window.createQuickPick<T>();

quickPick.placeholder = placeHolder;
quickPick.sortByLabel = false;
quickPick.items = await items;
quickPick.busy = true;

quickPick.show();

quickPick.items = await items;
quickPick.busy = false;

const choice = await new Promise<T | undefined>(resolve => {
listeners.push(quickPick.onDidHide(() => resolve(undefined)));
listeners.push(quickPick.onDidAccept(() => resolve(quickPick.activeItems[0])));
disposables.push(quickPick.onDidHide(() => resolve(undefined)));
disposables.push(quickPick.onDidAccept(() => resolve(quickPick.activeItems[0])));
});

dispose(disposables);
quickPick.dispose();
listeners.forEach(d => d.dispose());

return choice;
}

Expand Down