Avoid the issue/pr recovery mechanism handling Ctrl-C keypress in prompts

mislav · mislav · commit 3efa76430576 · 2021-02-23T20:09:03.000+01:00
Either InterruptErr or SilentErr will be present when the user has
chosen "Cancel" or pressed Ctrl-C in prompts. We don't want the recovery
mechanism to kick in these cases because the cancellation was likely
willingly initiated by the user.
diff --git a/pkg/cmd/issue/create/create.go b/pkg/cmd/issue/create/create.go
@@ -249,8 +249,8 @@ func createRun(opts *CreateOptions) (err error) {
 
 		if action == prShared.CancelAction {
 			fmt.Fprintln(opts.IO.ErrOut, "Discarding.")
-			err = nil // avoid triggering PreserveInput
-			return cmdutil.SilentError
+			err = cmdutil.SilentError
+			return
 		}
 	} else {
 		if tb.Title == "" {
diff --git a/pkg/cmd/pr/create/create.go b/pkg/cmd/pr/create/create.go
@@ -299,8 +299,8 @@ func createRun(opts *CreateOptions) (err error) {
 
 	if action == shared.CancelAction {
 		fmt.Fprintln(opts.IO.ErrOut, "Discarding.")
-		err = nil // avoid triggering PreserveInput
-		return cmdutil.SilentError
+		err = cmdutil.SilentError
+		return
 	}
 
 	err = handlePush(*opts, *ctx)
diff --git a/pkg/cmd/pr/shared/preserve.go b/pkg/cmd/pr/shared/preserve.go
@@ -2,9 +2,12 @@ package shared
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"os"
 
+	"github.com/AlecAivazis/survey/v2/terminal"
+	"github.com/cli/cli/pkg/cmdutil"
 	"github.com/cli/cli/pkg/iostreams"
 )
 
@@ -18,6 +21,11 @@ func PreserveInput(io *iostreams.IOStreams, state *IssueMetadataState, createErr
 			return
 		}
 
+		if errors.Is(*createErr, cmdutil.SilentError) || errors.Is(*createErr, terminal.InterruptErr) {
+			// these errors are user-initiated cancellations
+			return
+		}
+
 		out := io.ErrOut
 
 		// this extra newline guards against appending to the end of a survey line

Original file line number	Diff line number	Diff line change
`@@ -299,8 +299,8 @@ func createRun(opts *CreateOptions) (err error) {`
`299`	`299`
`300`	`300`	`if action == shared.CancelAction {`
`301`	`301`	`fmt.Fprintln(opts.IO.ErrOut, "Discarding.")`
`302`		`- err = nil // avoid triggering PreserveInput`
`303`		`- return cmdutil.SilentError`
	`302`	`+ err = cmdutil.SilentError`
	`303`	`+ return`
`304`	`304`	`}`
`305`	`305`
`306`	`306`	`err = handlePush(opts, ctx)`