From c25bfbb5afd545de76cb387743719b4dc9810681 Mon Sep 17 00:00:00 2001 From: arimu1 <19286898+arimu1@users.noreply.github.com> Date: Sun, 19 Jul 2026 09:32:49 +0700 Subject: [PATCH] fix(tui): respect --style / config over GLAMOUR_STYLE env When GLAMOUR_STYLE was set to a valid value such as auto or dark, the TUI ignored -s / style from flags and config. Prefer an explicit non-auto style, then fall back to the env value (#953). --- main.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index b31ca15..cd7b3bd 100644 --- a/main.go +++ b/main.go @@ -353,8 +353,13 @@ func runTUI(path string, content string) error { return fmt.Errorf("error parsing config: %v", err) } - // use style set in env, or auto if unset - if err := validateStyle(cfg.GlamourStyle); err != nil { + // Prefer CLI/config style (resolved in validateOptions) when it is not + // the default "auto". Otherwise fall back to GLAMOUR_STYLE from the + // environment, then to auto. Previously an env value such as "auto" or + // "dark" silently ignored `-s light` / config `style` in TUI mode (#953). + if style != styles.AutoStyle { + cfg.GlamourStyle = style + } else if err := validateStyle(cfg.GlamourStyle); err != nil || cfg.GlamourStyle == "" { cfg.GlamourStyle = style }