Skip to content

Commit 6bac2e3

Browse files
committed
cleanup: simplified theme detection priority code
1 parent 7b2e83e commit 6bac2e3

File tree

1 file changed

+20
-11
lines changed

1 file changed

+20
-11
lines changed

cli/src/utils/theme-system.ts

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -702,17 +702,26 @@ export const detectSystemTheme = (): ThemeName => {
702702
return normalizedEnv
703703
}
704704

705-
const terminalOverrideTheme = detectTerminalOverrides()
706-
707-
// Priority: Terminal override > IDE > OSC > Platform > Default
708-
const ideTheme = detectIDETheme()
709-
const platformTheme = detectPlatformTheme()
710-
const preferredTheme =
711-
terminalOverrideTheme ??
712-
ideTheme ??
713-
oscDetectedTheme ??
714-
platformTheme ??
715-
'dark'
705+
// Helper to detect theme with priority: Terminal override > IDE > OSC > Platform > Default
706+
const detectPreferredTheme = (): ThemeName => {
707+
const terminalOverrideTheme = detectTerminalOverrides()
708+
if (terminalOverrideTheme) {
709+
return terminalOverrideTheme
710+
}
711+
712+
const ideTheme = detectIDETheme()
713+
if (ideTheme) {
714+
return ideTheme
715+
}
716+
717+
if (oscDetectedTheme) {
718+
return oscDetectedTheme
719+
}
720+
721+
return detectPlatformTheme()
722+
}
723+
724+
const preferredTheme = detectPreferredTheme()
716725

717726
if (normalizedEnv === 'opposite') {
718727
return preferredTheme === 'dark' ? 'light' : 'dark'

0 commit comments

Comments
 (0)