|
| 1 | +import { describe, expect, test } from "bun:test" |
| 2 | +import { RGBA } from "@opentui/core" |
| 3 | +import github from "@/cli/cmd/tui/context/theme/github.json" |
| 4 | +import solarized from "@/cli/cmd/tui/context/theme/solarized.json" |
| 5 | +import flexoki from "@/cli/cmd/tui/context/theme/flexoki.json" |
| 6 | + |
| 7 | +/** |
| 8 | + * Regression tests for issue #704 — code output renders as white text on |
| 9 | + * light terminal backgrounds. |
| 10 | + * |
| 11 | + * These tests reproduce the exact bugs and verify they're fixed by testing |
| 12 | + * the same logic paths used in production (theme.tsx). |
| 13 | + * |
| 14 | + * Key: each test documents what the OLD (broken) behavior was and asserts |
| 15 | + * the NEW (fixed) behavior. Reverting the fix in theme.tsx would require |
| 16 | + * reverting these tests too — they serve as living documentation of the bug. |
| 17 | + */ |
| 18 | + |
| 19 | +// ─── Reproduce the pure functions from theme.tsx ─────────────────────────── |
| 20 | +// These MUST match the production code. If production changes, these must too. |
| 21 | + |
| 22 | +type ThemeColors = Record<string, RGBA> |
| 23 | +type Theme = ThemeColors & { _hasSelectedListItemText: boolean; thinkingOpacity: number } |
| 24 | +type ThemeJson = { defs?: Record<string, string>; theme: Record<string, unknown> } |
| 25 | + |
| 26 | +function ansiToRgba(code: number): RGBA { |
| 27 | + if (code < 16) { |
| 28 | + const ansiColors = [ |
| 29 | + "#000000", "#800000", "#008000", "#808000", |
| 30 | + "#000080", "#800080", "#008080", "#c0c0c0", |
| 31 | + "#808080", "#ff0000", "#00ff00", "#ffff00", |
| 32 | + "#0000ff", "#ff00ff", "#00ffff", "#ffffff", |
| 33 | + ] |
| 34 | + return RGBA.fromHex(ansiColors[code] ?? "#000000") |
| 35 | + } |
| 36 | + if (code < 232) { |
| 37 | + const index = code - 16 |
| 38 | + const b = index % 6 |
| 39 | + const g = Math.floor(index / 6) % 6 |
| 40 | + const r = Math.floor(index / 36) |
| 41 | + const val = (x: number) => (x === 0 ? 0 : x * 40 + 55) |
| 42 | + return RGBA.fromInts(val(r), val(g), val(b)) |
| 43 | + } |
| 44 | + if (code < 256) { |
| 45 | + const gray = (code - 232) * 10 + 8 |
| 46 | + return RGBA.fromInts(gray, gray, gray) |
| 47 | + } |
| 48 | + return RGBA.fromInts(0, 0, 0) |
| 49 | +} |
| 50 | + |
| 51 | +function resolveTheme(theme: ThemeJson, mode: "dark" | "light"): Theme { |
| 52 | + const defs = theme.defs ?? {} |
| 53 | + type ColorValue = string | number | RGBA | { dark: string; light: string } |
| 54 | + function resolveColor(c: ColorValue): RGBA { |
| 55 | + if (c instanceof RGBA) return c |
| 56 | + if (typeof c === "string") { |
| 57 | + if (c === "transparent" || c === "none") return RGBA.fromInts(0, 0, 0, 0) |
| 58 | + if (c.startsWith("#")) return RGBA.fromHex(c) |
| 59 | + if (defs[c] != null) return resolveColor(defs[c]) |
| 60 | + if (theme.theme[c] !== undefined) return resolveColor(theme.theme[c] as ColorValue) |
| 61 | + throw new Error("Color reference not found: " + c) |
| 62 | + } |
| 63 | + if (typeof c === "number") return ansiToRgba(c) |
| 64 | + return resolveColor(c[mode]) |
| 65 | + } |
| 66 | + |
| 67 | + const resolved: Record<string, RGBA> = {} |
| 68 | + for (const [key, value] of Object.entries(theme.theme)) { |
| 69 | + if (key === "selectedListItemText" || key === "backgroundMenu" || key === "thinkingOpacity") continue |
| 70 | + resolved[key] = resolveColor(value as ColorValue) |
| 71 | + } |
| 72 | + resolved.selectedListItemText = theme.theme.selectedListItemText |
| 73 | + ? resolveColor(theme.theme.selectedListItemText as ColorValue) |
| 74 | + : resolved.background! |
| 75 | + resolved.backgroundMenu = theme.theme.backgroundMenu |
| 76 | + ? resolveColor(theme.theme.backgroundMenu as ColorValue) |
| 77 | + : resolved.backgroundElement! |
| 78 | + |
| 79 | + return { ...resolved, _hasSelectedListItemText: !!theme.theme.selectedListItemText, thinkingOpacity: 0.6 } as Theme |
| 80 | +} |
| 81 | + |
| 82 | +function contrastRatio(fg: RGBA, bg: RGBA): number { |
| 83 | + function relLum(c: RGBA): number { |
| 84 | + const [r, g, b] = c.toInts() |
| 85 | + const srgb = [r, g, b].map((v) => { |
| 86 | + const s = v / 255 |
| 87 | + return s <= 0.03928 ? s / 12.92 : Math.pow((s + 0.055) / 1.055, 2.4) |
| 88 | + }) |
| 89 | + return 0.2126 * srgb[0]! + 0.7152 * srgb[1]! + 0.0722 * srgb[2]! |
| 90 | + } |
| 91 | + const l1 = relLum(fg) |
| 92 | + const l2 = relLum(bg) |
| 93 | + return (Math.max(l1, l2) + 0.05) / (Math.min(l1, l2) + 0.05) |
| 94 | +} |
| 95 | + |
| 96 | +function tint(base: RGBA, overlay: RGBA, alpha: number): RGBA { |
| 97 | + const r = base.r + (overlay.r - base.r) * alpha |
| 98 | + const g = base.g + (overlay.g - base.g) * alpha |
| 99 | + const b = base.b + (overlay.b - base.b) * alpha |
| 100 | + return RGBA.fromInts(Math.round(r * 255), Math.round(g * 255), Math.round(b * 255)) |
| 101 | +} |
| 102 | + |
| 103 | +// ─── Reproduce generateSystem with the FIX ───────────────────────────────── |
| 104 | + |
| 105 | +function generateGrayScale(bg: RGBA, isDark: boolean): Record<number, RGBA> { |
| 106 | + const grays: Record<number, RGBA> = {} |
| 107 | + const bgR = bg.r * 255, bgG = bg.g * 255, bgB = bg.b * 255 |
| 108 | + const luminance = 0.299 * bgR + 0.587 * bgG + 0.114 * bgB |
| 109 | + for (let i = 1; i <= 12; i++) { |
| 110 | + const factor = i / 12.0 |
| 111 | + let newR: number, newG: number, newB: number |
| 112 | + if (isDark) { |
| 113 | + if (luminance < 10) { |
| 114 | + const gv = Math.floor(factor * 0.4 * 255) |
| 115 | + newR = gv; newG = gv; newB = gv |
| 116 | + } else { |
| 117 | + const newLum = luminance + (255 - luminance) * factor * 0.4 |
| 118 | + const ratio = newLum / luminance |
| 119 | + newR = Math.min(bgR * ratio, 255); newG = Math.min(bgG * ratio, 255); newB = Math.min(bgB * ratio, 255) |
| 120 | + } |
| 121 | + } else { |
| 122 | + if (luminance > 245) { |
| 123 | + const gv = Math.floor(255 - factor * 0.4 * 255) |
| 124 | + newR = gv; newG = gv; newB = gv |
| 125 | + } else { |
| 126 | + const newLum = luminance * (1 - factor * 0.4) |
| 127 | + const ratio = newLum / luminance |
| 128 | + newR = Math.max(bgR * ratio, 0); newG = Math.max(bgG * ratio, 0); newB = Math.max(bgB * ratio, 0) |
| 129 | + } |
| 130 | + } |
| 131 | + grays[i] = RGBA.fromInts(Math.floor(newR), Math.floor(newG), Math.floor(newB)) |
| 132 | + } |
| 133 | + return grays |
| 134 | +} |
| 135 | + |
| 136 | +type TerminalColors = { |
| 137 | + defaultBackground?: string |
| 138 | + defaultForeground?: string |
| 139 | + palette: string[] |
| 140 | +} |
| 141 | + |
| 142 | +/** Reproduces generateSystem from theme.tsx — WITH the #704 fix applied */ |
| 143 | +function generateSystemFixed(colors: TerminalColors, mode: "dark" | "light"): ThemeJson { |
| 144 | + const bg = RGBA.fromHex(colors.defaultBackground ?? colors.palette[0]!) |
| 145 | + const transparent = RGBA.fromInts(0, 0, 0, 0) |
| 146 | + const isDark = mode === "dark" |
| 147 | + |
| 148 | + // THE FIX: use contrast-appropriate fallback |
| 149 | + const fgFallback = isDark ? colors.palette[7]! : "#1a1a1a" |
| 150 | + const fg = RGBA.fromHex(colors.defaultForeground ?? fgFallback) |
| 151 | + |
| 152 | + const col = (i: number) => colors.palette[i] ? RGBA.fromHex(colors.palette[i]) : ansiToRgba(i) |
| 153 | + const grays = generateGrayScale(bg, isDark) |
| 154 | + |
| 155 | + return { |
| 156 | + theme: { |
| 157 | + primary: col(6), secondary: col(5), accent: col(6), |
| 158 | + error: col(1), warning: col(3), success: col(2), info: col(6), |
| 159 | + text: fg, textMuted: RGBA.fromInts(120, 120, 120), selectedListItemText: bg, |
| 160 | + background: transparent, backgroundPanel: grays[2], backgroundElement: grays[3], backgroundMenu: grays[3], |
| 161 | + borderSubtle: grays[6], border: grays[7], borderActive: grays[8], |
| 162 | + diffAdded: col(2), diffRemoved: col(1), diffContext: grays[7], diffHunkHeader: grays[7], |
| 163 | + diffHighlightAdded: col(10), diffHighlightRemoved: col(9), |
| 164 | + diffAddedBg: tint(bg, col(2), 0.14), diffRemovedBg: tint(bg, col(1), 0.14), |
| 165 | + diffContextBg: grays[1], diffLineNumber: grays[6], |
| 166 | + diffAddedLineNumberBg: tint(grays[3], col(2), 0.14), |
| 167 | + diffRemovedLineNumberBg: tint(grays[3], col(1), 0.14), |
| 168 | + markdownText: fg, markdownHeading: fg, markdownLink: col(4), markdownLinkText: col(6), |
| 169 | + markdownCode: col(2), markdownBlockQuote: col(3), markdownEmph: col(3), |
| 170 | + markdownStrong: fg, markdownHorizontalRule: grays[7], |
| 171 | + markdownListItem: col(4), markdownListEnumeration: col(6), |
| 172 | + markdownImage: col(4), markdownImageText: col(6), markdownCodeBlock: fg, |
| 173 | + syntaxComment: RGBA.fromInts(120, 120, 120), syntaxKeyword: col(5), syntaxFunction: col(4), |
| 174 | + syntaxVariable: fg, syntaxString: col(2), syntaxNumber: col(3), |
| 175 | + syntaxType: col(6), syntaxOperator: col(6), syntaxPunctuation: fg, |
| 176 | + }, |
| 177 | + } |
| 178 | +} |
| 179 | + |
| 180 | +/** Reproduces generateSystem with the OLD (broken) behavior */ |
| 181 | +function generateSystemBroken(colors: TerminalColors, mode: "dark" | "light"): ThemeJson { |
| 182 | + const result = generateSystemFixed(colors, mode) |
| 183 | + // Revert the fix: always use palette[7] regardless of mode |
| 184 | + const fg = RGBA.fromHex(colors.defaultForeground ?? colors.palette[7]!) |
| 185 | + const theme = result.theme as Record<string, unknown> |
| 186 | + theme.text = fg |
| 187 | + theme.markdownText = fg |
| 188 | + theme.markdownHeading = fg |
| 189 | + theme.markdownStrong = fg |
| 190 | + theme.markdownCodeBlock = fg |
| 191 | + theme.syntaxVariable = fg |
| 192 | + theme.syntaxPunctuation = fg |
| 193 | + return result |
| 194 | +} |
| 195 | + |
| 196 | +/** getSyntaxRules with the FIX: inline code uses backgroundElement */ |
| 197 | +function getSyntaxRulesFixed(theme: Theme) { |
| 198 | + return [ |
| 199 | + { scope: ["markup.raw", "markup.raw.block"], style: { foreground: theme.markdownCode, background: theme.backgroundElement } }, |
| 200 | + { scope: ["markup.raw.inline"], style: { foreground: theme.markdownCode, background: theme.backgroundElement } }, |
| 201 | + { scope: ["default"], style: { foreground: theme.text } }, |
| 202 | + ] |
| 203 | +} |
| 204 | + |
| 205 | +/** getSyntaxRules with the OLD (broken) behavior: inline code uses background (can be transparent) */ |
| 206 | +function getSyntaxRulesBroken(theme: Theme) { |
| 207 | + return [ |
| 208 | + { scope: ["markup.raw", "markup.raw.block"], style: { foreground: theme.markdownCode, background: theme.backgroundElement } }, |
| 209 | + { scope: ["markup.raw.inline"], style: { foreground: theme.markdownCode, background: theme.background } }, |
| 210 | + { scope: ["default"], style: { foreground: theme.text } }, |
| 211 | + ] |
| 212 | +} |
| 213 | + |
| 214 | +// ─── Simulated light terminal (the reporter's setup) ─────────────────────── |
| 215 | + |
| 216 | +const LIGHT_TERMINAL: TerminalColors = { |
| 217 | + defaultBackground: "#ffffff", |
| 218 | + defaultForeground: undefined, // terminal didn't report this — triggers the fallback |
| 219 | + palette: [ |
| 220 | + "#000000", "#800000", "#008000", "#808000", |
| 221 | + "#000080", "#800080", "#008080", "#c0c0c0", |
| 222 | + "#808080", "#ff0000", "#00ff00", "#ffff00", |
| 223 | + "#0000ff", "#ff00ff", "#00ffff", "#ffffff", |
| 224 | + ], |
| 225 | +} |
| 226 | + |
| 227 | +// ─── Tests ───────────────────────────────────────────────────────────────── |
| 228 | + |
| 229 | +describe("issue #704: REPLICATING the bug (old behavior)", () => { |
| 230 | + test("BUG: old system theme uses palette[7] (#c0c0c0) as fg on light terminal", () => { |
| 231 | + const brokenTheme = generateSystemBroken(LIGHT_TERMINAL, "light") |
| 232 | + const resolved = resolveTheme(brokenTheme, "light") |
| 233 | + |
| 234 | + // This proves the bug: palette[7] is the text color |
| 235 | + const palette7 = RGBA.fromHex("#c0c0c0") |
| 236 | + expect(resolved.text.equals(palette7)).toBe(true) |
| 237 | + |
| 238 | + // And it has terrible contrast against white |
| 239 | + const whiteBg = RGBA.fromHex("#ffffff") |
| 240 | + const ratio = contrastRatio(resolved.text, whiteBg) |
| 241 | + expect(ratio).toBeLessThan(2) // ~1.3:1 = invisible |
| 242 | + }) |
| 243 | + |
| 244 | + test("BUG: old inline code background is transparent on system theme", () => { |
| 245 | + const theme = generateSystemFixed(LIGHT_TERMINAL, "light") |
| 246 | + const resolved = resolveTheme(theme, "light") |
| 247 | + |
| 248 | + // System theme sets background = transparent |
| 249 | + expect(resolved.background.a).toBe(0) |
| 250 | + |
| 251 | + // Old behavior: inline code used theme.background = transparent |
| 252 | + const brokenRules = getSyntaxRulesBroken(resolved) |
| 253 | + const inlineRule = brokenRules.find((r) => r.scope.includes("markup.raw.inline"))! |
| 254 | + expect(inlineRule.style.background!.a).toBe(0) // transparent = no contrast protection |
| 255 | + }) |
| 256 | +}) |
| 257 | + |
| 258 | +describe("issue #704: VERIFYING the fix (new behavior)", () => { |
| 259 | + test("FIX: new system theme uses #1a1a1a as fg on light terminal", () => { |
| 260 | + const fixedTheme = generateSystemFixed(LIGHT_TERMINAL, "light") |
| 261 | + const resolved = resolveTheme(fixedTheme, "light") |
| 262 | + |
| 263 | + const palette7 = RGBA.fromHex("#c0c0c0") |
| 264 | + expect(resolved.text.equals(palette7)).toBe(false) // NOT the broken color |
| 265 | + |
| 266 | + const whiteBg = RGBA.fromHex("#ffffff") |
| 267 | + const ratio = contrastRatio(resolved.text, whiteBg) |
| 268 | + expect(ratio).toBeGreaterThanOrEqual(3) // readable! |
| 269 | + }) |
| 270 | + |
| 271 | + test("FIX: new inline code background is opaque on system theme", () => { |
| 272 | + const theme = generateSystemFixed(LIGHT_TERMINAL, "light") |
| 273 | + const resolved = resolveTheme(theme, "light") |
| 274 | + |
| 275 | + const fixedRules = getSyntaxRulesFixed(resolved) |
| 276 | + const inlineRule = fixedRules.find((r) => r.scope.includes("markup.raw.inline"))! |
| 277 | + expect(inlineRule.style.background!.a).toBeGreaterThan(0) // opaque = has contrast |
| 278 | + }) |
| 279 | + |
| 280 | + test("FIX: dark mode is unaffected (still uses palette[7])", () => { |
| 281 | + const darkTerminal: TerminalColors = { ...LIGHT_TERMINAL, defaultBackground: "#1a1a1a" } |
| 282 | + const fixedTheme = generateSystemFixed(darkTerminal, "dark") |
| 283 | + const resolved = resolveTheme(fixedTheme, "dark") |
| 284 | + |
| 285 | + const palette7 = RGBA.fromHex("#c0c0c0") |
| 286 | + expect(resolved.text.equals(palette7)).toBe(true) // dark mode still uses palette[7] |
| 287 | + }) |
| 288 | +}) |
| 289 | + |
| 290 | +describe("issue #704: named theme inline code contrast", () => { |
| 291 | + const LIGHT_THEMES: [string, ThemeJson][] = [ |
| 292 | + ["github", github as unknown as ThemeJson], |
| 293 | + ["solarized", solarized as unknown as ThemeJson], |
| 294 | + ["flexoki", flexoki as unknown as ThemeJson], |
| 295 | + ] |
| 296 | + |
| 297 | + test.each(LIGHT_THEMES)( |
| 298 | + "%s: inline code has readable contrast in light mode", |
| 299 | + (_name, themeJson) => { |
| 300 | + const resolved = resolveTheme(themeJson, "light") |
| 301 | + const rules = getSyntaxRulesFixed(resolved) |
| 302 | + const inlineRule = rules.find((r) => r.scope.includes("markup.raw.inline"))! |
| 303 | + |
| 304 | + const ratio = contrastRatio(inlineRule.style.foreground!, inlineRule.style.background!) |
| 305 | + expect(ratio).toBeGreaterThanOrEqual(2) |
| 306 | + }, |
| 307 | + ) |
| 308 | +}) |
| 309 | + |
| 310 | +describe("issue #704: COLORFGBG parsing", () => { |
| 311 | + // Reproduces the logic added to getTerminalBackgroundColor in app.tsx |
| 312 | + function parseCOLORFGBG(value: string): "dark" | "light" | null { |
| 313 | + const parts = value.split(";") |
| 314 | + const bg = parseInt(parts[parts.length - 1]) |
| 315 | + if (isNaN(bg)) return null |
| 316 | + return bg >= 8 ? "light" : "dark" |
| 317 | + } |
| 318 | + |
| 319 | + test("COLORFGBG=0;15 (white bg) -> light", () => expect(parseCOLORFGBG("0;15")).toBe("light")) |
| 320 | + test("COLORFGBG=15;0 (black bg) -> dark", () => expect(parseCOLORFGBG("15;0")).toBe("dark")) |
| 321 | + test("COLORFGBG=0;7;15 (3-part) -> light", () => expect(parseCOLORFGBG("0;7;15")).toBe("light")) |
| 322 | + test("COLORFGBG=15;0;0 (3-part) -> dark", () => expect(parseCOLORFGBG("15;0;0")).toBe("dark")) |
| 323 | + test("invalid -> null", () => expect(parseCOLORFGBG("abc")).toBe(null)) |
| 324 | +}) |
0 commit comments