Merge branch 'main' into feat/improved-utility-completion-details

Author: thecrypticace

.github/workflows/ci.yml

@@ -27,19 +27,13 @@ jobs:
         run: pnpm install
 
       - name: Run syntax tests
-        run: |
-          cd packages/tailwindcss-language-syntax &&
-          pnpm run build &&
-          pnpm run test
+        working-directory: packages/tailwindcss-language-syntax
+        run: pnpm run build && pnpm run test
 
       - name: Run service tests
-        run: |
-          cd packages/tailwindcss-language-service &&
-          pnpm run build &&
-          pnpm run test
+        working-directory: packages/tailwindcss-language-service
+        run: pnpm run build && pnpm run test
 
-      - name: Run tests
-        run: |
-          cd packages/tailwindcss-language-server &&
-          pnpm run build &&
-          pnpm run test
+      - name: Run server tests
+        working-directory: packages/tailwindcss-language-server
+        run: pnpm run build && pnpm run test

package.json

@@ -5,7 +5,7 @@
     "@npmcli/package-json": "^5.0.0",
     "@types/culori": "^2.1.0",
     "culori": "^4.0.1",
-    "esbuild": "^0.25.0",
+    "esbuild": "^0.25.5",
     "minimist": "^1.2.8",
     "prettier": "^3.2.5",
     "semver": "^7.7.1"

packages/tailwindcss-language-server/package.json

@@ -74,7 +74,7 @@
     "dlv": "1.1.3",
     "dset": "3.1.4",
     "enhanced-resolve": "^5.16.1",
-    "esbuild": "^0.25.0",
+    "esbuild": "^0.25.5",
     "find-up": "5.0.0",
     "jiti": "^2.3.3",
     "klona": "2.0.4",
@@ -83,7 +83,7 @@
     "normalize-path": "3.0.0",
     "picomatch": "^4.0.1",
     "pkg-up": "3.1.0",
-    "postcss": "8.4.31",
+    "postcss": "8.5.4",
     "postcss-import": "^16.1.0",
     "postcss-load-config": "3.0.1",
     "postcss-selector-parser": "6.0.2",
@@ -96,8 +96,9 @@
     "tsconfck": "^3.1.4",
     "tsconfig-paths": "^4.2.0",
     "typescript": "5.8.3",
-    "vite-tsconfig-paths": "^4.3.1",
-    "vitest": "^3.0.9",
+    "vite": "^6.3.5",
+    "vite-tsconfig-paths": "^5.1.4",
+    "vitest": "^3.2.1",
     "vscode-css-languageservice": "6.3.6",
     "vscode-jsonrpc": "8.2.0",
     "vscode-languageclient": "8.1.0",

packages/tailwindcss-language-server/src/tw.ts

@@ -122,32 +122,68 @@ export class TW {
     await this.initPromise
   }
 
+  private validateFolderUri(uri: URI): boolean {
+    if (uri.scheme !== 'file') {
+      console.warn(
+        `The workspace folder [${uri.toString()}] will be ignored: it does not use the file scheme.`,
+      )
+      return false
+    }
+
+    if (uri.fsPath === '/' || uri.fsPath === '\\\\') {
+      console.warn(
+        `The workspace folder [${uri.toString()}] will be ignored: it starts at the root of the filesystem which is most likely an error.`,
+      )
+      return false
+    }
+
+    return true
+  }
+
   private getWorkspaceFolders(): WorkspaceFolder[] {
     if (this.initializeParams.workspaceFolders?.length) {
-      return this.initializeParams.workspaceFolders.map((folder) => ({
-        uri: URI.parse(folder.uri).fsPath,
-        name: folder.name,
-      }))
+      return this.initializeParams.workspaceFolders.flatMap((folder) => {
+        let uri = URI.parse(folder.uri)
+
+        if (!this.validateFolderUri(uri)) return []
+
+        return [
+          {
+            uri: uri.fsPath,
+            name: folder.name,
+          },
+        ]
+      })
     }
 
     if (this.initializeParams.rootUri) {
+      let uri = URI.parse(this.initializeParams.rootUri)
+
+      if (!this.validateFolderUri(uri)) return []
+
       return [
         {
-          uri: URI.parse(this.initializeParams.rootUri).fsPath,
+          uri: uri.fsPath,
           name: 'Root',
         },
       ]
     }
 
     if (this.initializeParams.rootPath) {
+      let uri = URI.file(this.initializeParams.rootPath)
+
+      if (!this.validateFolderUri(uri)) return []
+
       return [
         {
-          uri: URI.file(this.initializeParams.rootPath).fsPath,
+          uri: uri.fsPath,
           name: 'Root',
         },
       ]
     }
 
+    console.warn(`No workspace folders detected`)
+
     return []
   }
 
@@ -976,6 +1012,15 @@ export class TW {
     let matchedPriority: number = Infinity
 
     let uri = URI.parse(document.uri)
+
+    if (uri.scheme !== 'file') {
+      console.debug(`Cannot get project for a non-file document. They are unsupported.`, {
+        uri: uri.toString(),
+      })
+
+      return null
+    }
+
     let fsPath = uri.fsPath
     let normalPath = uri.path
 

packages/tailwindcss-language-server/vitest.config.mts

@@ -0,0 +1,23 @@
+import { defineConfig } from 'vitest/config'
+import tsconfigPaths from 'vite-tsconfig-paths'
+
+export default defineConfig({
+  test: {
+    testTimeout: 15000,
+    css: true,
+    silent: 'passed-only',
+  },
+
+  plugins: [
+    tsconfigPaths(),
+    {
+      name: 'force-inline-css',
+      enforce: 'pre',
+      resolveId(id) {
+        if (!id.includes('index.css')) return
+        if (id.includes('?raw')) return
+        return this.resolve(`${id}?raw`)
+      },
+    },
+  ],
+})

packages/tailwindcss-language-server/vitest.config.ts

@@ -29,7 +29,7 @@
     "dset": "3.1.4",
     "line-column": "1.0.2",
     "moo": "0.5.1",
-    "postcss": "8.4.31",
+    "postcss": "8.5.4",
     "postcss-selector-parser": "6.0.2",
     "postcss-value-parser": "4.2.0",
     "semver": "7.7.1",
@@ -48,11 +48,12 @@
     "@types/node": "^18.19.33",
     "@types/stringify-object": "^4.0.5",
     "dedent": "^1.5.3",
-    "esbuild": "^0.25.0",
+    "esbuild": "^0.25.5",
     "esbuild-node-externals": "^1.9.0",
     "minimist": "^1.2.8",
     "tslib": "2.2.0",
     "typescript": "^5.8.3",
-    "vitest": "^3.0.9"
+    "vite": "^6.3.5",
+    "vitest": "^3.2.1"
   }
 }

packages/tailwindcss-language-service/package.json

@@ -2362,7 +2362,7 @@ export async function resolveCompletionItem(
           decls = decls.filter(isOtherDecl)
         }
 
-        item.detail = await jit.stringifyDecls(state, postcss.rule({ nodes: decls }))
+        item.detail = await jit.stringifyDecls(state, postcss.rule({ selectors: [], nodes: decls }))
       } else {
         item.detail = `${rules.length} rules`
       }

packages/tailwindcss-language-service/src/completionProvider.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/index.test.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
     },

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

@@ -3,5 +3,6 @@ import { defineConfig } from 'vitest/config'
 export default defineConfig({
   test: {
     testTimeout: 15000,
+    silent: 'passed-only',
   },
 })

packages/tailwindcss-language-service/vitest.config.ts renamed to packages/tailwindcss-language-service/vitest.config.mts

@@ -9,7 +9,7 @@
   "devDependencies": {
     "@types/node": "^18.19.33",
     "dedent": "^1.5.3",
-    "vitest": "^3.1.4",
+    "vitest": "^3.2.1",
     "vscode-oniguruma": "^2.0.1",
     "vscode-textmate": "^9.2.0"
   }

packages/tailwindcss-language-syntax/package.json

@@ -3,5 +3,6 @@ import { defineConfig } from 'vitest/config'
 export default defineConfig({
   test: {
     testTimeout: 15000,
+    silent: 'passed-only',
   },
 })

packages/tailwindcss-language-syntax/vitest.config.ts renamed to packages/tailwindcss-language-syntax/vitest.config.mts

@@ -3,6 +3,7 @@
 ## Prerelease
 
 - Bump bundled CSS language service ([#1395](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1395))
+- Fix infinite loop when resolving completion details with recursive theme keys ([#1400](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1400))
 - Simplify completion details for more utilities ([#1397](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1397))
 
 ## 0.14.20

packages/vscode-tailwindcss/CHANGELOG.md

@@ -382,8 +382,8 @@
     "@vscode/vsce": "2.21.1",
     "braces": "3.0.3",
     "color-name": "1.1.4",
-    "concurrently": "7.0.0",
-    "esbuild": "^0.25.0",
+    "concurrently": "9.1.2",
+    "esbuild": "^0.25.5",
     "minimist": "^1.2.8",
     "move-file-cli": "3.0.0",
     "normalize-path": "3.0.0",