Merge pull request #209 from gonvenience/fix/linter-finding

Fix linter finding with constant format
gonvenience · Jan 7, 2025 · 2a19f16 · 2a19f16
2 parents eeecd0d + 3afe031
commit 2a19f16
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/output.go b/output.go
@@ -81,7 +81,7 @@ func NewOutputProcessor(useIndentLines bool, boldKeys bool, colorSchema *map[str
 	}
 }
 
-// Deprecated: Use colorizef instead
+// TODO Change signature to swap into the right order, color first, text second
 func (p *OutputProcessor) colorize(text string, colorName string) string {
 	if p.colorSchema != nil {
 		if value, ok := (*p.colorSchema)[colorName]; ok {
@@ -93,18 +93,11 @@ func (p *OutputProcessor) colorize(text string, colorName string) string {
 }
 
 func (p *OutputProcessor) colorizef(colorName string, format string, a ...interface{}) string {
-	var text = format
 	if len(a) > 0 {
-		text = fmt.Sprintf(format, a...)
+		return p.colorize(fmt.Sprintf(format, a...), colorName)
 	}
 
-	if p.colorSchema != nil {
-		if value, ok := (*p.colorSchema)[colorName]; ok {
-			return bunt.Style(text, bunt.Foreground(value))
-		}
-	}
-
-	return text
+	return p.colorize(format, colorName)
 }
 
 func (p *OutputProcessor) determineColorByType(obj interface{}) string {

diff --git a/output_yaml.go b/output_yaml.go
@@ -285,7 +285,7 @@ func (p *OutputProcessor) neatYAMLofNode(prefix string, skipIndentOnFirstLine bo
 			if needsQuotes(node) {
 				fmt.Fprint(p.out, p.colorizef(colorName, `"%s"`, node.Value))
 			} else {
-				fmt.Fprint(p.out, p.colorizef(colorName, node.Value))
+				fmt.Fprint(p.out, p.colorize(node.Value, colorName))
 			}
 
 		default: