fixup! Add runCommand function to Go template syntax

Share the "runCommand" handler.

Author: stefanhaller

pkg/commands/git_commands/custom.go

@@ -1,6 +1,11 @@
 package git_commands
 
-import "github.com/mgutz/str"
+import (
+	"fmt"
+	"strings"
+
+	"github.com/mgutz/str"
+)
 
 type CustomCommands struct {
 	*GitCommon
@@ -18,3 +23,18 @@ func NewCustomCommands(gitCommon *GitCommon) *CustomCommands {
 func (self *CustomCommands) RunWithOutput(cmdStr string) (string, error) {
 	return self.cmd.New(str.ToArgv(cmdStr)).RunWithOutput()
 }
+
+// A function that can be used as a "runCommand" entry in the template.FuncMap of templates.
+func (self *CustomCommands) TemplateFunctionRunCommand(cmdStr string) (string, error) {
+	output, err := self.RunWithOutput(cmdStr)
+	if err != nil {
+		return "", err
+	}
+	output = strings.TrimRight(output, "\r\n")
+
+	if strings.Contains(output, "\r\n") {
+		return "", fmt.Errorf("command output contains newlines: %s", output)
+	}
+
+	return output, nil
+}

pkg/gui/controllers/helpers/refs_helper.go

@@ -333,24 +333,12 @@ func (self *RefsHelper) NewBranch(from string, fromFormattedName string, suggest
 		var err error
 
 		suggestedBranchName, err = utils.ResolveTemplate(self.c.UserConfig().Git.BranchPrefix, nil, template.FuncMap{
-			"runCommand": func(command string) (string, error) {
-				output, err := self.c.Git().Custom.RunWithOutput(command)
-				if err != nil {
-					return "", err
-				}
-
-				output = strings.TrimRight(output, "\r\n")
-
-				if strings.ContainsAny(output, "\r\n\t ") {
-					return "", fmt.Errorf("command output contains whitespace characters: %s", output)
-				}
-
-				return output, nil
-			},
+			"runCommand": self.c.Git().Custom.TemplateFunctionRunCommand,
 		})
 		if err != nil {
 			return err
 		}
+		suggestedBranchName = strings.ReplaceAll(suggestedBranchName, "\t", " ")
 	}
 
 	refresh := func() error {

pkg/gui/services/custom_commands/handler_creator.go

@@ -246,20 +246,8 @@ func (self *HandlerCreator) getResolveTemplateFn(form map[string]string, promptR
 	}
 
 	funcs := template.FuncMap{
-		"quote": self.c.OS().Quote,
-		"runCommand": func(command string) (string, error) {
-			output, err := self.c.Git().Custom.RunWithOutput(command)
-			if err != nil {
-				return "", err
-			}
-			output = strings.TrimRight(output, "\r\n")
-
-			if strings.Contains(output, "\r\n") {
-				return "", fmt.Errorf("command output contains newlines: %s", output)
-			}
-
-			return output, nil
-		},
+		"quote":      self.c.OS().Quote,
+		"runCommand": self.c.Git().Custom.TemplateFunctionRunCommand,
 	}
 
 	return func(templateStr string) (string, error) { return utils.ResolveTemplate(templateStr, objects, funcs) }