Skip to content

Commit ad1ee00

Browse files
committed
Add next and close buttons to the commit message generation input flow
- to the right of 'accept' button, place 'close' button - if there are more steps in the flow, 'accept' should be replaced by 'next' (arrow right)
1 parent af1d97d commit ad1ee00

2 files changed

Lines changed: 48 additions & 15 deletions

File tree

‎apps/editor/src/commands/generate-commit-message-command/generate-commit-message-command.ts‎

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ export const generate_commit_message_command = (
273273
}
274274
)
275275

276-
if (answer === undefined || answer === 'back') {
276+
if (answer === undefined || answer == 'back') {
277277
return answer
278278
}
279279

@@ -303,8 +303,8 @@ export const generate_commit_message_command = (
303303
let is_cancelled = false
304304
let go_back = false
305305

306-
while (step !== 'finish') {
307-
if (step === 'edit_message') {
306+
while (step != 'finish') {
307+
if (step == 'edit_message') {
308308
const edited = await new Promise<string | 'back' | undefined>(
309309
(resolve) => {
310310
const input_box = vscode.window.createInputBox()
@@ -315,23 +315,38 @@ export const generate_commit_message_command = (
315315
)
316316
input_box.ignoreFocusOut = true
317317

318+
const has_more_steps = relevant_prompts.length > 0
318319
const accept_button = {
319-
iconPath: new vscode.ThemeIcon('check'),
320-
tooltip: t('command.generate-commit-message.input.accept')
320+
iconPath: new vscode.ThemeIcon(
321+
has_more_steps ? 'arrow-right' : 'check'
322+
),
323+
tooltip: has_more_steps
324+
? t('common.next')
325+
: t('command.generate-commit-message.input.accept')
321326
}
322327

323-
input_box.buttons = [accept_button, vscode.QuickInputButtons.Back]
328+
const close_button = {
329+
iconPath: new vscode.ThemeIcon('close'),
330+
tooltip: t('common.close')
331+
}
332+
333+
input_box.buttons = [
334+
accept_button,
335+
close_button,
336+
vscode.QuickInputButtons.Back
337+
]
324338

325339
let is_resolved = false
326340

327341
input_box.onDidTriggerButton((button) => {
328-
if (
329-
button.tooltip ==
330-
t('command.generate-commit-message.input.accept')
331-
) {
342+
if (button === accept_button) {
332343
is_resolved = true
333344
resolve(input_box.value)
334345
input_box.hide()
346+
} else if (button === close_button) {
347+
is_resolved = true
348+
resolve(undefined)
349+
input_box.hide()
335350
} else if (button === vscode.QuickInputButtons.Back) {
336351
is_resolved = true
337352
resolve('back')
@@ -356,7 +371,7 @@ export const generate_commit_message_command = (
356371
}
357372
)
358373

359-
if (edited === 'back') {
374+
if (edited == 'back') {
360375
go_back = true
361376
break
362377
} else if (edited === undefined) {
@@ -367,7 +382,7 @@ export const generate_commit_message_command = (
367382
step =
368383
relevant_prompts.length > 0 ? 'select_prompts' : 'attach_tree'
369384
}
370-
} else if (step === 'select_prompts') {
385+
} else if (step == 'select_prompts') {
371386
const picked = await new Promise<
372387
typeof relevant_prompts | undefined | 'back'
373388
>((resolve) => {
@@ -414,7 +429,7 @@ export const generate_commit_message_command = (
414429
quick_pick.show()
415430
})
416431

417-
if (picked === 'back') {
432+
if (picked == 'back') {
418433
step = 'edit_message'
419434
} else if (picked === undefined) {
420435
is_cancelled = true
@@ -423,9 +438,9 @@ export const generate_commit_message_command = (
423438
selected_prompts = picked
424439
step = 'attach_tree'
425440
}
426-
} else if (step === 'attach_tree') {
441+
} else if (step == 'attach_tree') {
427442
const result = await get_tree_text_if_applicable(selected_prompts)
428-
if (result === 'back') {
443+
if (result == 'back') {
429444
if (params.should_commit) {
430445
step =
431446
relevant_prompts.length > 0 ? 'select_prompts' : 'edit_message'

‎apps/editor/src/i18n/translations/common.ts‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,5 +304,23 @@ export const translations = {
304304
cs: 'Hledat ve výsledcích',
305305
hu: 'Keresés az eredményekben',
306306
bg: 'Търсене в резултатите'
307+
},
308+
'common.next': {
309+
en: 'Next',
310+
pl: 'Dalej',
311+
'zh-cn': '下一步',
312+
ja: '次へ',
313+
'zh-tw': '下一步',
314+
de: 'Weiter',
315+
es: 'Siguiente',
316+
fr: 'Suivant',
317+
'pt-br': 'Próximo',
318+
ru: 'Далее',
319+
ko: '다음',
320+
it: 'Avanti',
321+
tr: 'İleri',
322+
cs: 'Další',
323+
hu: 'Következő',
324+
bg: 'Напред'
307325
}
308326
} as const

0 commit comments

Comments
 (0)