Fix urfave#1293

Fix issue by adding custom replaceAll function and replacing all newlines by newlines+spaces in command usage description
kchugalinskiy · Aug 17, 2021 · 11a6082 · 11a6082
1 parent 58d113d
commit 11a6082
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/help.go b/help.go
@@ -273,6 +273,7 @@ func printHelpCustom(out io.Writer, templ string, data interface{}, customFuncs
 		"indent":  indent,
 		"nindent": nindent,
 		"trim":    strings.TrimSpace,
+		"replaceAll": strings.ReplaceAll,
 	}
 	for key, value := range customFuncs {
 		funcMap[key] = value

diff --git a/template.go b/template.go
@@ -21,8 +21,8 @@ AUTHOR{{with $length := len .Authors}}{{if ne 1 $length}}S{{end}}{{end}}:
 
 COMMANDS:{{range .VisibleCategories}}{{if .Name}}
    {{.Name}}:{{range .VisibleCommands}}
-     {{join .Names ", "}}{{"\t"}}{{.Usage}}{{end}}{{else}}{{range .VisibleCommands}}
-   {{join .Names ", "}}{{"\t"}}{{.Usage}}{{end}}{{end}}{{end}}{{end}}{{if .VisibleFlags}}
+     {{join .Names ", "}}{{"\t"}}{{replaceAll .Usage "\n" "\n     "}}{{end}}{{else}}{{range .VisibleCommands}}
+   {{join .Names ", "}}{{"\t"}}{{replaceAll .Usage "\n" "\n   "}}{{end}}{{end}}{{end}}{{end}}{{if .VisibleFlags}}
 
 GLOBAL OPTIONS:
    {{range $index, $option := .VisibleFlags}}{{if $index}}
@@ -66,8 +66,8 @@ DESCRIPTION:
 
 COMMANDS:{{range .VisibleCategories}}{{if .Name}}
    {{.Name}}:{{range .VisibleCommands}}
-     {{join .Names ", "}}{{"\t"}}{{.Usage}}{{end}}{{else}}{{range .VisibleCommands}}
-   {{join .Names ", "}}{{"\t"}}{{.Usage}}{{end}}{{end}}{{end}}{{if .VisibleFlags}}
+     {{join .Names ", "}}{{"\t"}}{{replaceAll .Usage "\n" "\n     "}}{{end}}{{else}}{{range .VisibleCommands}}
+   {{join .Names ", "}}{{"\t"}}{{replaceAll .Usage "\n" "\n   "}}{{end}}{{end}}{{end}}{{if .VisibleFlags}}
 
 OPTIONS:
    {{range .VisibleFlags}}{{.}}