From cd65409328e578e2249ce7f365ec121389c55b94 Mon Sep 17 00:00:00 2001 From: Nate Smith Date: Mon, 7 Aug 2023 17:12:46 -0700 Subject: [PATCH] switch to Prompter.MultiSelect --- pkg/cmd/repo/edit/edit.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkg/cmd/repo/edit/edit.go b/pkg/cmd/repo/edit/edit.go index bbbd94dd5..64df48aa7 100644 --- a/pkg/cmd/repo/edit/edit.go +++ b/pkg/cmd/repo/edit/edit.go @@ -441,15 +441,17 @@ func interactiveRepoEdit(opts *EditOptions, r *api.Repository) error { if r.RebaseMergeAllowed { defaultMergeOptions = append(defaultMergeOptions, allowRebaseMerge) } - //nolint:staticcheck // SA1019: prompt.SurveyAskOne is deprecated: use Prompter - err = prompt.SurveyAskOne(&survey.MultiSelect{ - Message: "Allowed merge strategies", - Default: defaultMergeOptions, - Options: []string{allowMergeCommits, allowSquashMerge, allowRebaseMerge}, - }, &selectedMergeOptions) + mergeOpts := []string{allowMergeCommits, allowSquashMerge, allowRebaseMerge} + selected, err := opts.Prompter.MultiSelect( + "Allowed merge strategies", + defaultMergeOptions, + mergeOpts) if err != nil { return err } + for _, i := range selected { + selectedMergeOptions = append(selectedMergeOptions, mergeOpts[i]) + } enableMergeCommit := isIncluded(allowMergeCommits, selectedMergeOptions) opts.Edits.EnableMergeCommit = &enableMergeCommit enableSquashMerge := isIncluded(allowSquashMerge, selectedMergeOptions)