fix: improve

Signed-off-by: Carlos Alexandro Becker <caarlos0@users.noreply.github.com>

choose/command.go

@@ -80,10 +80,7 @@ func (o Options) Run() error {
 			WithTimeout(o.Timeout).
 			Run()
 		if err != nil {
-			if errors.Is(err, huh.ErrTimeout) {
-				return exit.NewTimeout(o.Timeout)
-			}
-			return err
+			return exit.Handle(err, o.Timeout)
 		}
 		if len(choices) > 0 {
 			s := strings.Join(choices, "\n")
@@ -109,10 +106,7 @@ func (o Options) Run() error {
 		WithShowHelp(o.ShowHelp).
 		Run()
 	if err != nil {
-		if errors.Is(err, huh.ErrTimeout) {
-			return exit.NewTimeout(o.Timeout)
-		}
-		return err
+		return exit.Handle(err, o.Timeout)
 	}
 
 	if term.IsTerminal(os.Stdout.Fd()) {

confirm/command.go

@@ -1,7 +1,6 @@
 package confirm
 
 import (
-	"errors"
 	"os"
 
 	"github.com/charmbracelet/gum/internal/exit"
@@ -32,10 +31,7 @@ func (o Options) Run() error {
 		WithShowHelp(o.ShowHelp).
 		Run()
 	if err != nil {
-		if errors.Is(err, huh.ErrTimeout) {
-			return exit.NewTimeout(o.Timeout)
-		}
-		return err
+		return exit.Handle(err, o.Timeout)
 	}
 
 	if !choice {

file/command.go

@@ -56,12 +56,8 @@ func (o Options) Run() error {
 		WithTheme(theme).
 		Run()
 	if err != nil {
-		if errors.Is(err, huh.ErrTimeout) {
-			return exit.NewTimeout(o.Timeout)
-		}
-		return err
+		return exit.Handle(err, o.Timeout)
 	}
-
 	fmt.Println(path)
 	return nil
 }

input/command.go

@@ -1,7 +1,6 @@
 package input
 
 import (
-	"errors"
 	"fmt"
 	"os"
 
@@ -60,10 +59,7 @@ func (o Options) Run() error {
 		WithProgramOptions(tea.WithOutput(os.Stderr)).
 		Run()
 	if err != nil {
-		if errors.Is(err, huh.ErrTimeout) {
-			return exit.NewTimeout(o.Timeout)
-		}
-		return err
+		return exit.Handle(err, o.Timeout)
 	}
 
 	fmt.Println(value)

internal/exit/exit.go

@@ -1,6 +1,7 @@
 package exit
 
 import (
+	"errors"
 	"fmt"
 	"time"
 
@@ -14,9 +15,12 @@ const StatusTimeout = 124
 const StatusAborted = 130
 
 // ErrAborted is the error to return when a gum command is aborted by Ctrl+C.
-var ErrAborted = fmt.Errorf("aborted")
+var ErrAborted = huh.ErrUserAborted
 
-// NewTimeout returns a new ErrTimeout.
-func NewTimeout(d time.Duration) ErrTimeout {
-	return fmt.Errorf("timed out after %s: %w", d, huh.ErrTimeout
+// Handle handles the error.
+func Handle(err error, d time.Duration) error {
+	if errors.Is(err, huh.ErrTimeout) {
+		return fmt.Errorf("%w after %s", huh.ErrTimeout, d)
+	}
+	return err
 }

main.go

@@ -77,7 +77,7 @@ func main() {
 			fmt.Fprintln(os.Stderr, err)
 			os.Exit(exit.StatusTimeout)
 		}
-		if errors.Is(err, exit.ErrAborted) || errors.Is(err, huh.ErrUserAborted) {
+		if errors.Is(err, huh.ErrUserAborted) {
 			os.Exit(exit.StatusAborted)
 		}
 		fmt.Println(err)