Merge 5c027db556 into e5cb757278

utils/utils.go

@@ -101,7 +101,7 @@ func GlamourStyle(style string, isCode bool) glamour.TermRendererOption {
 	case styles.DraculaStyle:
 		styleConfig = styles.DraculaStyleConfig
 	case styles.TokyoNightStyle:
-		styleConfig = styles.DraculaStyleConfig
+		styleConfig = styles.TokyoNightStyleConfig
 	default:
 		return glamour.WithStylesFromJSONFile(style)
 	}

utils/utils_test.go

@@ -0,0 +1,36 @@
+package utils
+
+import (
+	"testing"
+
+	"github.com/charmbracelet/glamour"
+	"github.com/charmbracelet/glamour/styles"
+)
+
+// renderCode renders a fenced code block with the given style in code mode.
+func renderCode(t *testing.T, style string) string {
+	t.Helper()
+	r, err := glamour.NewTermRenderer(GlamourStyle(style, true))
+	if err != nil {
+		t.Fatalf("new renderer for %q: %v", style, err)
+	}
+	out, err := r.Render("```go\nfmt.Println(\"hello\")\n```\n")
+	if err != nil {
+		t.Fatalf("render with %q: %v", style, err)
+	}
+	return out
+}
+
+// TestGlamourStyleTokyoNightCodeDistinctFromDracula guards against the
+// tokyo-night code style being mapped to the dracula StyleConfig. The two
+// themes use different colors, so their rendered code output must differ.
+func TestGlamourStyleTokyoNightCodeDistinctFromDracula(t *testing.T) {
+	t.Setenv("CLICOLOR_FORCE", "1") // force ANSI color so styles are distinguishable
+
+	tokyo := renderCode(t, styles.TokyoNightStyle)
+	dracula := renderCode(t, styles.DraculaStyle)
+
+	if tokyo == dracula {
+		t.Errorf("tokyo-night code rendering is identical to dracula; GlamourStyle must use TokyoNightStyleConfig")
+	}
+}