refactor(prompt): extract extra prompt

src/prompt/extra.go

@@ -0,0 +1,107 @@
+package prompt
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/jandedobbeleer/oh-my-posh/src/color"
+	"github.com/jandedobbeleer/oh-my-posh/src/config"
+	"github.com/jandedobbeleer/oh-my-posh/src/shell"
+	"github.com/jandedobbeleer/oh-my-posh/src/template"
+	"github.com/jandedobbeleer/oh-my-posh/src/terminal"
+)
+
+func (e *Engine) ExtraPrompt(promptType ExtraPromptType) string {
+	// populate env with latest context
+	e.Env.LoadTemplateCache()
+	var prompt *config.Segment
+	switch promptType {
+	case Debug:
+		prompt = e.Config.DebugPrompt
+	case Transient:
+		prompt = e.Config.TransientPrompt
+	case Valid:
+		prompt = e.Config.ValidLine
+	case Error:
+		prompt = e.Config.ErrorLine
+	case Secondary:
+		prompt = e.Config.SecondaryPrompt
+	}
+
+	if prompt == nil {
+		prompt = &config.Segment{}
+	}
+
+	getTemplate := func(template string) string {
+		if len(template) != 0 {
+			return template
+		}
+		switch promptType { //nolint: exhaustive
+		case Debug:
+			return "[DBG]: "
+		case Transient:
+			return "{{ .Shell }}> "
+		case Secondary:
+			return "> "
+		default:
+			return ""
+		}
+	}
+
+	tmpl := &template.Text{
+		Template: getTemplate(prompt.Template),
+		Env:      e.Env,
+	}
+
+	promptText, err := tmpl.Render()
+	if err != nil {
+		promptText = err.Error()
+	}
+
+	if promptType == Transient && e.Config.ShellIntegration {
+		exitCode, _ := e.Env.StatusCodes()
+		e.write(terminal.CommandFinished(exitCode, e.Env.Flags().NoExitCode))
+		e.write(terminal.PromptStart())
+	}
+
+	foreground := color.Ansi(prompt.ForegroundTemplates.FirstMatch(nil, e.Env, string(prompt.Foreground)))
+	background := color.Ansi(prompt.BackgroundTemplates.FirstMatch(nil, e.Env, string(prompt.Background)))
+	terminal.SetColors(background, foreground)
+	terminal.Write(background, foreground, promptText)
+
+	str, length := terminal.String()
+	if promptType == Transient {
+		consoleWidth, err := e.Env.TerminalWidth()
+		if err == nil || consoleWidth != 0 {
+			if padText, OK := e.shouldFill(prompt.Filler, consoleWidth, length); OK {
+				str += padText
+			}
+		}
+	}
+
+	if promptType == Transient && e.Config.ShellIntegration {
+		str += terminal.CommandStart()
+	}
+
+	switch e.Env.Shell() {
+	case shell.ZSH:
+		// escape double quotes contained in the prompt
+		if promptType == Transient {
+			prompt := fmt.Sprintf("PS1=\"%s\"", strings.ReplaceAll(str, "\"", "\"\""))
+			// empty RPROMPT
+			prompt += "\nRPROMPT=\"\""
+			return prompt
+		}
+		return str
+	case shell.PWSH, shell.PWSH5:
+		// Return the string and empty our buffer
+		// clear the line afterwards to prevent text from being written on the same line
+		// see https://github.com/JanDeDobbeleer/oh-my-posh/issues/3628
+		return str + terminal.ClearAfter()
+	case shell.CMD, shell.BASH, shell.FISH, shell.NU, shell.GENERIC:
+		// Return the string and empty our buffer
+		return str
+	}
+
+	return ""
+}

src/prompt/primary.go

@@ -4,10 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/jandedobbeleer/oh-my-posh/src/color"
 	"github.com/jandedobbeleer/oh-my-posh/src/config"
 	"github.com/jandedobbeleer/oh-my-posh/src/shell"
-	"github.com/jandedobbeleer/oh-my-posh/src/template"
 	"github.com/jandedobbeleer/oh-my-posh/src/terminal"
 )
 
@@ -120,101 +118,6 @@ func (e *Engine) Primary() string {
 	return e.string()
 }
 
-func (e *Engine) ExtraPrompt(promptType ExtraPromptType) string {
-	// populate env with latest context
-	e.Env.LoadTemplateCache()
-	var prompt *config.Segment
-	switch promptType {
-	case Debug:
-		prompt = e.Config.DebugPrompt
-	case Transient:
-		prompt = e.Config.TransientPrompt
-	case Valid:
-		prompt = e.Config.ValidLine
-	case Error:
-		prompt = e.Config.ErrorLine
-	case Secondary:
-		prompt = e.Config.SecondaryPrompt
-	}
-
-	if prompt == nil {
-		prompt = &config.Segment{}
-	}
-
-	getTemplate := func(template string) string {
-		if len(template) != 0 {
-			return template
-		}
-		switch promptType { //nolint: exhaustive
-		case Debug:
-			return "[DBG]: "
-		case Transient:
-			return "{{ .Shell }}> "
-		case Secondary:
-			return "> "
-		default:
-			return ""
-		}
-	}
-
-	tmpl := &template.Text{
-		Template: getTemplate(prompt.Template),
-		Env:      e.Env,
-	}
-
-	promptText, err := tmpl.Render()
-	if err != nil {
-		promptText = err.Error()
-	}
-
-	if promptType == Transient && e.Config.ShellIntegration {
-		exitCode, _ := e.Env.StatusCodes()
-		e.write(terminal.CommandFinished(exitCode, e.Env.Flags().NoExitCode))
-		e.write(terminal.PromptStart())
-	}
-
-	foreground := color.Ansi(prompt.ForegroundTemplates.FirstMatch(nil, e.Env, string(prompt.Foreground)))
-	background := color.Ansi(prompt.BackgroundTemplates.FirstMatch(nil, e.Env, string(prompt.Background)))
-	terminal.SetColors(background, foreground)
-	terminal.Write(background, foreground, promptText)
-
-	str, length := terminal.String()
-	if promptType == Transient {
-		consoleWidth, err := e.Env.TerminalWidth()
-		if err == nil || consoleWidth != 0 {
-			if padText, OK := e.shouldFill(prompt.Filler, consoleWidth, length); OK {
-				str += padText
-			}
-		}
-	}
-
-	if promptType == Transient && e.Config.ShellIntegration {
-		str += terminal.CommandStart()
-	}
-
-	switch e.Env.Shell() {
-	case shell.ZSH:
-		// escape double quotes contained in the prompt
-		if promptType == Transient {
-			prompt := fmt.Sprintf("PS1=\"%s\"", strings.ReplaceAll(str, "\"", "\"\""))
-			// empty RPROMPT
-			prompt += "\nRPROMPT=\"\""
-			return prompt
-		}
-		return str
-	case shell.PWSH, shell.PWSH5:
-		// Return the string and empty our buffer
-		// clear the line afterwards to prevent text from being written on the same line
-		// see https://github.com/JanDeDobbeleer/oh-my-posh/issues/3628
-		return str + terminal.ClearAfter()
-	case shell.CMD, shell.BASH, shell.FISH, shell.NU, shell.GENERIC:
-		// Return the string and empty our buffer
-		return str
-	}
-
-	return ""
-}
-
 func (e *Engine) RPrompt() string {
 	filterRPromptBlock := func(blocks []*config.Block) *config.Block {
 		for _, block := range blocks {