From 8670ede0325a024ad0d8eeefd0e14896c70e944e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 29 Jun 2023 07:39:42 +0530
Subject: [PATCH] DRYer

---
 kittens/hints/main.go  | 12 ++++--------
 tools/tui/ui_kitten.go | 10 +++-------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/kittens/hints/main.go b/kittens/hints/main.go
index 19fe591fa..b1928add8 100644
--- a/kittens/hints/main.go
+++ b/kittens/hints/main.go
@@ -113,23 +113,19 @@ func decode_hint(x string, alphabet string) (ans int) {
 func main(_ *cli.Command, o *Options, args []string) (rc int, err error) {
 	output := tui.KittenOutputSerializer()
 	if tty.IsTerminal(os.Stdin.Fd()) {
-		tui.ReportError(fmt.Errorf("You must pass the text to be hinted on STDIN"))
-		return 1, nil
+		return 1, fmt.Errorf("You must pass the text to be hinted on STDIN")
 	}
 	stdin, err := io.ReadAll(os.Stdin)
 	if err != nil {
-		tui.ReportError(fmt.Errorf("Failed to read from STDIN with error: %w", err))
-		return 1, nil
+		return 1, fmt.Errorf("Failed to read from STDIN with error: %w", err)
 	}
 	if len(args) > 0 && o.CustomizeProcessing == "" && o.Type != "linenum" {
-		tui.ReportError(fmt.Errorf("Extra command line arguments present: %s", strings.Join(args, " ")))
-		return 1, nil
+		return 1, fmt.Errorf("Extra command line arguments present: %s", strings.Join(args, " "))
 	}
 	input_text := parse_input(utils.UnsafeBytesToString(stdin))
 	text, all_marks, index_map, err := find_marks(input_text, o, os.Args[2:]...)
 	if err != nil {
-		tui.ReportError(err)
-		return 1, nil
+		return 1, err
 	}
 
 	result := Result{
diff --git a/tools/tui/ui_kitten.go b/tools/tui/ui_kitten.go
index 2029c3a77..7070d764c 100644
--- a/tools/tui/ui_kitten.go
+++ b/tools/tui/ui_kitten.go
@@ -23,7 +23,9 @@ var RunningAsUI = utils.Once(func() bool {
 func PrepareRootCmd(root *cli.Command) {
 	if RunningAsUI() {
 		root.CallbackOnError = func(cmd *cli.Command, err error, during_parsing bool, exit_code int) int {
-			ReportError(err)
+			cli.ShowError(err)
+			os.Stdout.WriteString("\x1bP@kitty-overlay-ready|\x1b\\")
+			HoldTillEnter(true)
 			return exit_code
 		}
 	}
@@ -51,9 +53,3 @@ func KittenOutputSerializer() func(any) (string, error) {
 		return utils.UnsafeBytesToString(data), nil
 	}
 }
-
-func ReportError(err error) {
-	cli.ShowError(err)
-	os.Stdout.WriteString("\x1bP@kitty-overlay-ready|\x1b\\")
-	HoldTillEnter(false)
-}