1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32

diff --git a/packages/tailwindcss-language-service/src/util/jit.ts b/packages/tailwindcss-language-service/src/util/jit.ts
index 311319d0faf6ef7152d73644c767a32ef8c4f225..482dcf8284386389be6c230a14fc8f350250e2d4 100644
--- a/packages/tailwindcss-language-service/src/util/jit.ts
+++ b/packages/tailwindcss-language-service/src/util/jit.ts
@@ -13,20 +13,16 @@   let rules: [bigint, Rule][] = state.modules.jit.generateRules
     .module(new Set(classNames), state.jitContext)
     .sort(([a], [z]) => bigSign(a - z))
 
-  let actualRules: Rule[] = []
+  let root = state.modules.postcss.module.root({ nodes: rules.map(([, rule]) => rule) })
+  state.modules.jit.expandApplyAtRules.module(state.jitContext)(root)
 
-  for (let [, rule] of rules) {
-    if (rule.type === 'rule') {
-      actualRules.push(rule)
-    } else if (rule.walkRules) {
-      rule.walkRules((subRule) => {
-        actualRules.push(subRule)
-      })
-    }
-  }
+  let actualRules: Rule[] = []
+  root.walkRules((subRule) => {
+    actualRules.push(subRule)
+  })
 
   return {
-    root: state.modules.postcss.module.root({ nodes: rules.map(([, rule]) => rule) }),
+    root,
     rules: actualRules,
   }
 }

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17

diff --git a/packages/tailwindcss-language-service/src/util/state.ts b/packages/tailwindcss-language-service/src/util/state.ts
index 8ff1a3c66f895cc068da9a437820728937a4512c..826d50ee6e9e4a97439e98c8b153565416028c49 100644
--- a/packages/tailwindcss-language-service/src/util/state.ts
+++ b/packages/tailwindcss-language-service/src/util/state.ts
@@ -76,7 +76,11 @@     tailwindcss?: { version: string; module: any }
     postcss?: { version: string; module: Postcss }
     postcssSelectorParser?: { module: any }
     resolveConfig?: { module: any }
-    jit?: { generateRules: { module: any }; setupContext: { module: any } }
+    jit?: {
+      generateRules: { module: any }
+      setupContext: { module: any }
+      expandApplyAtRules: { module: any }
+    }
   }
   browserslist?: string[]
   featureFlags?: FeatureFlags

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69

diff --git a/src/server.ts b/src/server.ts
index 0a928f527f0cadbe8419bef46fd8e648818a989e..6f6e317c70a8a7e62409a8cb12c222afd3bbc61c 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -445,6 +445,11 @@             module: __non_webpack_require__(
               resolveFrom(configDir, 'tailwindcss/lib/jit/lib/setupContext')
             ).default,
           },
+          expandApplyAtRules: {
+            module: __non_webpack_require__(
+              resolveFrom(configDir, 'tailwindcss/lib/jit/lib/expandApplyAtRules')
+            ).default,
+          },
         }
       } catch (_) {
         try {
@@ -457,6 +462,11 @@             },
             setupContext: {
               module: __non_webpack_require__(
                 resolveFrom(configDir, 'tailwindcss/jit/lib/setupContext')
+              ),
+            },
+            expandApplyAtRules: {
+              module: __non_webpack_require__(
+                resolveFrom(configDir, 'tailwindcss/jit/lib/expandApplyAtRules')
               ),
             },
           }
@@ -491,6 +501,10 @@
     if (applyComplexClasses && !applyComplexClasses.default.__patched) {
       let _applyComplexClasses = applyComplexClasses.default
       applyComplexClasses.default = (config, ...args) => {
+        if (state.jit) {
+          return state.modules.jit.expandApplyAtRules.module(state.jitContext)
+        }
+
         let configClone = klona(config)
         configClone.separator = typeof state.separator === 'undefined' ? ':' : state.separator
 
@@ -629,6 +643,15 @@       hook.unhook()
       throw error
     }
 
+    if (state.jit) {
+      state.jitContext = state.modules.jit.setupContext.module(state.configPath)(
+        { opts: {}, messages: [] },
+        state.modules.postcss.module.root()
+      )
+      state.jitContext.tailwindConfig.separator =
+        typeof userSeperator === 'undefined' ? ':' : userSeperator
+    }
+
     let postcssResult: Result
     try {
       postcssResult = await postcss
@@ -689,13 +712,6 @@     state.config = resolveConfig.module(config)
     state.separator = typeof userSeperator === 'string' ? userSeperator : ':'
     state.plugins = await getPlugins(config)
     state.classNames = (await extractClassNames(postcssResult.root)) as ClassNames
-
-    if (state.jit) {
-      state.jitContext = state.modules.jit.setupContext.module(state.configPath)(
-        { opts: {}, messages: [] },
-        state.modules.postcss.module.root()
-      )
-    }
 
     state.variants = getVariants(state)