Have TerminalTheme invoke DetectTerminalTheme if necessary

mislav · mislav · commit 659eed777da0 · 2022-01-14T15:42:02.000+01:00
diff --git a/pkg/iostreams/iostreams.go b/pkg/iostreams/iostreams.go
@@ -69,35 +69,37 @@ func (s *IOStreams) HasTrueColor() bool {
 	return s.hasTrueColor
 }
 
-func (s *IOStreams) DetectTerminalTheme() string {
+// DetectTerminalTheme is a utility to call before starting the output pager so that the terminal background
+// can be reliably detected.
+func (s *IOStreams) DetectTerminalTheme() {
 	if !s.ColorEnabled() {
 		s.terminalTheme = "none"
-		return "none"
+		return
 	}
 
 	if s.pagerProcess != nil {
 		s.terminalTheme = "none"
-		return "none"
+		return
 	}
 
 	style := os.Getenv("GLAMOUR_STYLE")
 	if style != "" && style != "auto" {
 		s.terminalTheme = "none"
-		return "none"
+		return
 	}
 
 	if termenv.HasDarkBackground() {
 		s.terminalTheme = "dark"
-		return "dark"
+		return
 	}
 
 	s.terminalTheme = "light"
-	return "light"
 }
 
+// TerminalTheme returns "light", "dark", or "none" depending on the background color of the terminal.
 func (s *IOStreams) TerminalTheme() string {
 	if s.terminalTheme == "" {
-		return "none"
+		s.DetectTerminalTheme()
 	}
 
 	return s.terminalTheme

Original file line number	Diff line number	Diff line change
`@@ -69,35 +69,37 @@ func (s *IOStreams) HasTrueColor() bool {`
`69`	`69`	`return s.hasTrueColor`
`70`	`70`	`}`
`71`	`71`
`72`		`-func (s *IOStreams) DetectTerminalTheme() string {`
	`72`	`+// DetectTerminalTheme is a utility to call before starting the output pager so that the terminal background`
	`73`	`+// can be reliably detected.`
	`74`	`+func (s *IOStreams) DetectTerminalTheme() {`
`73`	`75`	`if !s.ColorEnabled() {`
`74`	`76`	`s.terminalTheme = "none"`
`75`		`- return "none"`
	`77`	`+ return`
`76`	`78`	`}`
`77`	`79`
`78`	`80`	`if s.pagerProcess != nil {`
`79`	`81`	`s.terminalTheme = "none"`
`80`		`- return "none"`
	`82`	`+ return`
`81`	`83`	`}`
`82`	`84`
`83`	`85`	`style := os.Getenv("GLAMOUR_STYLE")`
`84`	`86`	`if style != "" && style != "auto" {`
`85`	`87`	`s.terminalTheme = "none"`
`86`		`- return "none"`
	`88`	`+ return`
`87`	`89`	`}`
`88`	`90`
`89`	`91`	`if termenv.HasDarkBackground() {`
`90`	`92`	`s.terminalTheme = "dark"`
`91`		`- return "dark"`
	`93`	`+ return`
`92`	`94`	`}`
`93`	`95`
`94`	`96`	`s.terminalTheme = "light"`
`95`		`- return "light"`
`96`	`97`	`}`
`97`	`98`
	`99`	`+// TerminalTheme returns "light", "dark", or "none" depending on the background color of the terminal.`
`98`	`100`	`func (s *IOStreams) TerminalTheme() string {`
`99`	`101`	`if s.terminalTheme == "" {`
`100`		`- return "none"`
	`102`	`+ s.DetectTerminalTheme()`
`101`	`103`	`}`
`102`	`104`
`103`	`105`	`return s.terminalTheme`