chore: sync with upstream (#4)

* Bump bundled Tailwind CSS version

* Improve performance in large files (tailwindlabs#1507)

There are two performance improvements here that both come down to
caching:

- We call `indexToPosition` *a lot*. Every time this is called it takes
the string passed in and re-computes the indices every time. There's no
need for this so we have a small, module-level LRU cache to store the
data.

This should eventually be replaced with parsing and storing data up
front when files are edited instead of just doing this whenever we
receive a request. That would negate the need for a module-level cache.

- We call `compile()` and `candidatesToCss` *a lot* as well. This is
expected but 90% of the time the classes passed in have already been
seen. We take the generated CSS and convert to a PostCSS node because a
lot of the implementation uses that internally. There's no need to go
through the whole parse -> serialize -> re-parse routine like we are.

I've opted to store the compiled PostCSS roots on the
`designSystem.storage` object (which will be created when it doesn't
exist on old versions) and we'll return clones of those objects every
time (since they may get mutated).

With this there's only one large-ish block in a left-heavy profile:
`findClassListsInHtmlRange`. That is mostly related to the class
attribute lexer. Fixing it will require us to scan document and store
info about them when they change. We shouldn't need to run the class
attribute lexer if the document hasn't changed. Fixing this will require
some more work though.

Fixes tailwindlabs#1503

---------

Co-authored-by: Jordan Pittman <jordan@cryptica.me>
Co-authored-by: GitHub Action <action@github.com>

Author: 3 people

packages/tailwindcss-language-server/package.json

@@ -89,7 +89,7 @@
     "rimraf": "3.0.2",
     "stack-trace": "0.0.10",
     "tailwindcss": "3.4.18",
-    "tailwindcss-v4": "npm:tailwindcss@4.1.15",
+    "tailwindcss-v4": "npm:tailwindcss@4.1.17",
     "tinyglobby": "^0.2.12",
     "tsconfck": "^3.1.4",
     "tsconfig-paths": "^4.2.0",

packages/tailwindcss-language-server/src/project-locator.test.ts

@@ -455,7 +455,7 @@ testLocator({
   },
   expected: [
     {
-      version: '4.1.15 (bundled)',
+      version: '4.1.17 (bundled)',
       config: '/src/a/b/c/index.css',
       content: [],
     },
@@ -487,12 +487,12 @@ testLocator({
   },
   expected: [
     {
-      version: '4.1.15 (bundled)',
+      version: '4.1.17 (bundled)',
       config: '/index.css',
       content: [],
     },
     {
-      version: '4.1.15 (bundled)',
+      version: '4.1.17 (bundled)',
       config: '/src/vendor/c.css',
       content: [],
     },
@@ -519,12 +519,12 @@ testLocator({
   },
   expected: [
     {
-      version: '4.1.15 (bundled)',
+      version: '4.1.17 (bundled)',
       config: '/src/app.css',
       content: [],
     },
     {
-      version: '4.1.15 (bundled)',
+      version: '4.1.17 (bundled)',
       config: '/a/foo.css',
       content: [],
     },
@@ -554,12 +554,12 @@ testLocator({
   },
   expected: [
     {
-      version: '4.1.15 (bundled)',
+      version: '4.1.17 (bundled)',
       config: '/src/app.css',
       content: [],
     },
     {
-      version: '4.1.15 (bundled)',
+      version: '4.1.17 (bundled)',
       config: '/a/foo.css',
       content: [],
     },
@@ -581,7 +581,7 @@ testLocator({
   },
   expected: [
     {
-      version: '4.1.15 (bundled)',
+      version: '4.1.17 (bundled)',
       config: '/src/app.css',
       content: [],
     },

packages/tailwindcss-language-server/src/util/v4/design-system.ts

@@ -13,6 +13,7 @@ import { plugins } from './plugins'
 
 const HAS_V4_IMPORT = /@import\s*(?:'tailwindcss'|"tailwindcss")/
 const HAS_V4_THEME = /@theme\s*\{/
+const COMPILE_CACHE = Symbol('LSP_COMPILE_CACHE')
 
 export async function isMaybeV4(css: string): Promise<boolean> {
   // Look for:
@@ -215,6 +216,11 @@ export async function loadDesignSystem(
     }),
   })
 
+  // This object doesn't exist in older versions but we can patch it in so it
+  // seems like it always existed.
+  design.storage ??= {}
+  design.storage[COMPILE_CACHE] = {}
+
   // Step 4: Augment the design system with some additional APIs that the LSP needs
   Object.assign(design, {
     dependencies: () => dependencies,
@@ -227,25 +233,42 @@ export async function loadDesignSystem(
     // - Replace `candidatesToCss` with a `candidatesToAst` API
     // First step would be to convert to a PostCSS AST by transforming the nodes directly
     // Then it would be to drop the PostCSS AST representation entirely in all v4 code paths
-    compile(classes: string[]): (postcss.Root | null)[] {
-      let css = design.candidatesToCss(classes)
+    compile(classes: string[]): postcss.Root[] {
+      // 1. Compile any uncached classes
+      let cache = design.storage[COMPILE_CACHE] as Record<string, postcss.Root>
+      let uncached = classes.filter((name) => cache[name] === undefined)
+
+      let css = design.candidatesToCss(uncached)
       let errors: any[] = []
 
-      let roots = css.map((str) => {
-        if (str === null) return postcss.root()
+      for (let [idx, cls] of uncached.entries()) {
+        let str = css[idx]
+
+        if (str === null) {
+          cache[cls] = postcss.root()
+          continue
+        }
 
         try {
-          return postcss.parse(str.trimEnd())
+          cache[cls] = postcss.parse(str.trimEnd())
         } catch (err) {
           errors.push(err)
-          return postcss.root()
+          cache[cls] = postcss.root()
+          continue
         }
-      })
+      }
 
       if (errors.length > 0) {
         console.error(JSON.stringify(errors))
       }
 
+      // 2. Pull all the classes from the cache
+      let roots: postcss.Root[] = []
+
+      for (let cls of classes) {
+        roots.push(cache[cls].clone())
+      }
+
       return roots
     },
 

packages/tailwindcss-language-server/tests/colors/colors.test.js

@@ -349,7 +349,7 @@ defineTest({
 
     expect(c.project).toMatchObject({
       tailwind: {
-        version: '4.1.15',
+        version: '4.1.17',
         isDefaultVersion: true,
       },
     })
@@ -388,7 +388,7 @@ defineTest({
 
     expect(c.project).toMatchObject({
       tailwind: {
-        version: '4.1.15',
+        version: '4.1.17',
         isDefaultVersion: true,
       },
     })

packages/tailwindcss-language-server/tests/diagnostics/diagnostics.test.js

@@ -446,14 +446,6 @@ defineTest({
 defineTest({
   name: 'Shows warning when using non-canonical classes',
   fs: {
-    // TODO: Drop this when the embedded version of tailwindcss is v4.1.15
-    'package.json': json`
-      {
-        "dependencies": {
-          "tailwindcss": "0.0.0-insiders.249bed0"
-        }
-      }
-    `,
     'app.css': css`
       @import 'tailwindcss';
     `,

packages/tailwindcss-language-server/tests/env/v4.test.js

@@ -21,7 +21,7 @@ defineTest({
 
     expect(await client.project()).toMatchObject({
       tailwind: {
-        version: '4.1.15',
+        version: '4.1.17',
         isDefaultVersion: true,
       },
     })
@@ -137,7 +137,7 @@ defineTest({
 
     expect(await client.project()).toMatchObject({
       tailwind: {
-        version: '4.1.15',
+        version: '4.1.17',
         isDefaultVersion: true,
       },
     })
@@ -188,7 +188,7 @@ defineTest({
     'package.json': json`
       {
         "dependencies": {
-          "tailwindcss": "4.1.15"
+          "tailwindcss": "4.1.17"
         }
       }
     `,
@@ -205,7 +205,7 @@ defineTest({
 
     expect(await client.project()).toMatchObject({
       tailwind: {
-        version: '4.1.15',
+        version: '4.1.17',
         isDefaultVersion: false,
       },
     })
@@ -243,7 +243,7 @@ defineTest({
     'package.json': json`
       {
         "dependencies": {
-          "tailwindcss": "4.1.15"
+          "tailwindcss": "4.1.17"
         }
       }
     `,
@@ -270,7 +270,7 @@ defineTest({
 
     expect(await client.project()).toMatchObject({
       tailwind: {
-        version: '4.1.15',
+        version: '4.1.17',
         isDefaultVersion: false,
       },
     })
@@ -322,7 +322,7 @@ defineTest({
 
     expect(await client.project()).toMatchObject({
       tailwind: {
-        version: '4.1.15',
+        version: '4.1.17',
         isDefaultVersion: true,
       },
     })
@@ -354,7 +354,7 @@ defineTest({
     'package.json': json`
       {
         "dependencies": {
-          "tailwindcss": "4.1.15"
+          "tailwindcss": "4.1.17"
         }
       }
     `,
@@ -831,7 +831,7 @@ defineTest({
 
     expect(await client.project()).toMatchObject({
       tailwind: {
-        version: '4.1.15',
+        version: '4.1.17',
         isDefaultVersion: true,
       },
     })

packages/tailwindcss-language-server/tests/fixtures/v4/basic/package-lock.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "tailwindcss": "4.1.15"
+    "tailwindcss": "4.1.17"
   }
 }

packages/tailwindcss-language-server/tests/fixtures/v4/basic/package.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "tailwindcss": "4.1.15"
+    "tailwindcss": "4.1.17"
   }
 }