Fix infinite loop when resolving completion details

Author: thecrypticace

packages/tailwindcss-language-service/src/util/rewriting/index.test.ts

@@ -2,6 +2,7 @@ import { expect, test } from 'vitest'
 import {
   addThemeValues,
   evaluateExpression,
+  inlineThemeValues,
   replaceCssCalc,
   replaceCssVarsWithFallbacks,
 } from './index'
@@ -124,6 +125,42 @@ test('recursive theme replacements', () => {
   )
 })
 
+test('recursive theme replacements (inlined)', () => {
+  let map = new Map<string, string>([
+    ['--color-a', 'var(--color-a)'],
+    ['--color-b', 'rgb(var(--color-b))'],
+    ['--color-c', 'rgb(var(--channel) var(--channel) var(--channel))'],
+    ['--channel', '255'],
+
+    ['--color-d', 'rgb(var(--indirect) var(--indirect) var(--indirect))'],
+    ['--indirect', 'var(--channel)'],
+    ['--channel', '255'],
+
+    ['--mutual-a', 'calc(var(--mutual-b) * 1)'],
+    ['--mutual-b', 'calc(var(--mutual-a) + 1)'],
+  ])
+
+  let state: State = {
+    enabled: true,
+    designSystem: {
+      theme: { prefix: null } as any,
+      resolveThemeValue: (name) => map.get(name) ?? null,
+    } as DesignSystem,
+  }
+
+  expect(inlineThemeValues('var(--color-a)', state)).toBe('var(--color-a)')
+  expect(inlineThemeValues('var(--color-b)', state)).toBe('rgb(var(--color-b))')
+  expect(inlineThemeValues('var(--color-c)', state)).toBe('rgb(255 255 255)')
+
+  // This one is wrong but fixing it without breaking the infinite recursion guard is complex
+  expect(inlineThemeValues('var(--color-d)', state)).toBe(
+    'rgb(255 var(--indirect) var(--indirect))',
+  )
+
+  expect(inlineThemeValues('var(--mutual-a)', state)).toBe('calc(calc(var(--mutual-a) + 1) * 1)')
+  expect(inlineThemeValues('var(--mutual-b)', state)).toBe('calc(calc(var(--mutual-b) * 1) + 1)')
+})
+
 test('Evaluating CSS calc expressions', () => {
   expect(replaceCssCalc('calc(1px + 1px)', (node) => evaluateExpression(node.value))).toBe('2px')
   expect(replaceCssCalc('calc(1px * 4)', (node) => evaluateExpression(node.value))).toBe('4px')

packages/tailwindcss-language-service/src/util/rewriting/inline-theme-values.ts

@@ -7,13 +7,20 @@ import { replaceCssVars, replaceCssCalc } from './replacements'
 export function inlineThemeValues(css: string, state: State): string {
   if (!state.designSystem) return css
 
+  let seen = new Set<string>()
+
   css = replaceCssCalc(css, (expr) => {
     let inlined = replaceCssVars(expr.value, {
       replace({ name, fallback }) {
         if (!name.startsWith('--')) return null
 
+        // TODO: This isn't quite right as we might skip expanding a variable
+        // that should be expanded
+        if (seen.has(name)) return null
+
         let value = resolveVariableValue(state.designSystem, name)
         if (value === null) return fallback
+        if (value.includes('var(')) seen.add(name)
 
         return value
       },
@@ -26,8 +33,13 @@ export function inlineThemeValues(css: string, state: State): string {
     replace({ name, fallback }) {
       if (!name.startsWith('--')) return null
 
+      // TODO: This isn't quite right as we might skip expanding a variable
+      // that should be expanded
+      if (seen.has(name)) return null
+
       let value = resolveVariableValue(state.designSystem, name)
       if (value === null) return fallback
+      if (value.includes('var(')) seen.add(name)
 
       return value
     },