Dynamic width terminal calculation for help (#815)

* feat: remove panic output * feat: remove panic output
cloudposse · Dec 12, 2024 · 22c9b28 · 22c9b28
1 parent b144ba2
commit 22c9b28
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/internal/tui/templates/help_printer.go b/internal/tui/templates/help_printer.go
@@ -23,12 +23,12 @@ type HelpFlagPrinter struct {
 	maxFlagLen int
 }
 
-func NewHelpFlagPrinter(out io.Writer, wrapLimit uint, flags *pflag.FlagSet) *HelpFlagPrinter {
+func NewHelpFlagPrinter(out io.Writer, wrapLimit uint, flags *pflag.FlagSet) (*HelpFlagPrinter, error) {
 	if out == nil {
-		panic("output writer cannot be nil")
+		return nil, fmt.Errorf("invalid argument: output writer cannot be nil")
 	}
 	if flags == nil {
-		panic("flag set cannot be nil")
+		return nil, fmt.Errorf("invalid argument: flag set cannot be nil")
 	}
 
 	if wrapLimit < minWidth {
@@ -39,7 +39,7 @@ func NewHelpFlagPrinter(out io.Writer, wrapLimit uint, flags *pflag.FlagSet) *He
 		wrapLimit:  wrapLimit,
 		out:        out,
 		maxFlagLen: calculateMaxFlagLength(flags),
-	}
+	}, nil
 }
 
 func calculateMaxFlagLength(flags *pflag.FlagSet) int {

diff --git a/internal/tui/templates/templater.go b/internal/tui/templates/templater.go
@@ -120,7 +120,12 @@ Use "{{.CommandPath}} [command] --help" for more information about a command.{{e
 func WrappedFlagUsages(f *pflag.FlagSet) string {
 	var builder strings.Builder
 	width := getTerminalWidth()
-	printer := NewHelpFlagPrinter(&builder, uint(width), f)
+	printer, err := NewHelpFlagPrinter(&builder, uint(width), f)
+	if err != nil {
+		// If we can't create the printer, return empty string
+		// This is unlikely to happen since we're using a strings.Builder
+		return ""
+	}
 
 	printer.maxFlagLen = calculateMaxFlagLength(f)