Skip to content

Commit 4d92149

Browse files
committed
Improves start work quick pick choices
1 parent 6caaff1 commit 4d92149

File tree

1 file changed

+37
-14
lines changed

1 file changed

+37
-14
lines changed

src/plus/startWork/startWork.ts

Lines changed: 37 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import type { Issue, IssueShape, SearchedIssue } from '../../git/models/issue';
2929
import { getOrOpenIssueRepository } from '../../git/models/issue';
3030
import type { Repository } from '../../git/models/repository';
3131
import type { QuickPickItemOfT } from '../../quickpicks/items/common';
32-
import { createQuickPickItemOfT } from '../../quickpicks/items/common';
32+
import { createQuickPickItemOfT, createQuickPickSeparator } from '../../quickpicks/items/common';
3333
import type { DirectiveQuickPickItem } from '../../quickpicks/items/directive';
3434
import { createDirectiveQuickPickItem, Directive } from '../../quickpicks/items/directive';
3535
import { getScopedCounter } from '../../system/counter';
@@ -241,20 +241,43 @@ export class StartWorkCommand extends QuickCommand<State> {
241241
state: StepState<State>,
242242
): StepResultGenerator<{ type: StartWorkType; inWorktree?: boolean }> {
243243
const step = createPickStep({
244-
placeholder: 'Start work by creating a new branch',
244+
placeholder: 'Choose how to start work',
245245
items: [
246-
createQuickPickItemOfT<StartWorkTypeItem>('Create a Branch', {
247-
type: 'branch',
248-
}),
249-
createQuickPickItemOfT<StartWorkTypeItem>('Create a Branch in a Worktree', {
250-
type: 'branch-worktree',
251-
inWorktree: true,
252-
}),
253-
createQuickPickItemOfT<StartWorkTypeItem>('Create a Branch from an Issue', { type: 'issue' }),
254-
createQuickPickItemOfT<StartWorkTypeItem>('Create a Branch from an Issue in a Worktree', {
255-
type: 'issue-worktree',
256-
inWorktree: true,
257-
}),
246+
createQuickPickSeparator('Issues'),
247+
createQuickPickItemOfT<StartWorkTypeItem>(
248+
{
249+
label: 'Create Branch from Issue...',
250+
detail: 'Will create a new branch after selecting an issue',
251+
},
252+
{ type: 'issue' },
253+
),
254+
createQuickPickItemOfT<StartWorkTypeItem>(
255+
{
256+
label: 'Create Branch & Worktree from Issue...',
257+
detail: 'Will create a new branch & worktree after selecting an issue',
258+
},
259+
{
260+
type: 'issue-worktree',
261+
inWorktree: true,
262+
},
263+
),
264+
createQuickPickSeparator('References'),
265+
createQuickPickItemOfT<StartWorkTypeItem>(
266+
{ label: 'Create Branch from...', detail: 'Will create a new branch after selecting a reference' },
267+
{
268+
type: 'branch',
269+
},
270+
),
271+
createQuickPickItemOfT<StartWorkTypeItem>(
272+
{
273+
label: 'Create Branch & Worktree from...',
274+
detail: 'Will create a new branch & worktree after selecting a reference',
275+
},
276+
{
277+
type: 'branch-worktree',
278+
inWorktree: true,
279+
},
280+
),
258281
],
259282
});
260283
const selection: StepSelection<typeof step> = yield step;

0 commit comments

Comments
 (0)