clear interactive selector on interrupt

Author: skarim

cmd/checkout.go

@@ -361,6 +361,7 @@ func handleCompositionConflict(
 	selected, err := p.Select("How would you like to resolve this?", "", options)
 	if err != nil {
 		if isInterruptError(err) {
+			clearSelectPrompt(cfg, len(options))
 			printInterrupt(cfg)
 			return nil, errInterrupt
 		}
@@ -551,6 +552,7 @@ func interactiveStackPicker(cfg *config.Config, sf *stack.StackFile) (*stack.Sta
 	)
 	if err != nil {
 		if isInterruptError(err) {
+			clearSelectPrompt(cfg, len(options))
 			printInterrupt(cfg)
 			return nil, errInterrupt
 		}

cmd/push.go

@@ -145,6 +145,7 @@ func pickRemote(cfg *config.Config, branch, remoteOverride string) (string, erro
 	selected, promptErr := p.Select("Multiple remotes found. Which remote should be used?", "", multi.Remotes)
 	if promptErr != nil {
 		if isInterruptError(promptErr) {
+			clearSelectPrompt(cfg, len(multi.Remotes))
 			printInterrupt(cfg)
 			return "", errInterrupt
 		}

cmd/utils.go

@@ -65,6 +65,23 @@ func printInterrupt(cfg *config.Config) {
 	cfg.Infof("Received interrupt, aborting operation")
 }
 
+// selectPromptPageSize matches the PageSize used by the go-gh prompter.
+const selectPromptPageSize = 20
+
+// clearSelectPrompt erases the rendered Select prompt from the terminal.
+// survey/v2 does not call Cleanup on interrupt, leaving the question and
+// option lines visible. This function moves the cursor up past those lines
+// and clears to the end of the screen.
+func clearSelectPrompt(cfg *config.Config, numOptions int) {
+	visible := numOptions
+	if visible > selectPromptPageSize {
+		visible = selectPromptPageSize
+	}
+	// 1 line for the question/filter + visible option lines
+	lines := 1 + visible
+	fmt.Fprintf(cfg.Err, "\033[%dA\033[J", lines)
+}
+
 // loadStackResult holds everything returned by loadStack.
 type loadStackResult struct {
 	GitDir        string
@@ -186,6 +203,7 @@ func resolveStack(sf *stack.StackFile, branch string, cfg *config.Config) (*stac
 	selected, err := p.Select("Which stack would you like to use?", "", options)
 	if err != nil {
 		if isInterruptError(err) {
+			clearSelectPrompt(cfg, len(options))
 			printInterrupt(cfg)
 			return nil, errInterrupt
 		}