fix error when using @​apply in plugins (#255)

Author: bradlc

package-lock.json

@@ -197,6 +197,7 @@
     "glob-exec": "^0.1.1",
     "import-from": "^3.0.0",
     "jest": "^25.5.4",
+    "klona": "^2.0.4",
     "mitt": "^1.2.0",
     "normalize-path": "^3.0.0",
     "pkg-up": "^3.1.0",

packages/tailwindcss-intellisense/package-lock.json

@@ -44,93 +44,100 @@ function getClassNamesFromSelector(selector) {
   return classNames
 }
 
-async function process(groups) {
+async function process(root) {
   const tree = {}
   const commonContext = {}
 
-  groups.forEach((group) => {
-    group.root.walkRules((rule) => {
-      const classNames = getClassNamesFromSelector(rule.selector)
-
-      const decls = {}
-      rule.walkDecls((decl) => {
-        if (decls[decl.prop]) {
-          decls[decl.prop] = [
-            ...(Array.isArray(decls[decl.prop])
-              ? decls[decl.prop]
-              : [decls[decl.prop]]),
-            decl.value,
-          ]
+  let layer
+
+  root.walk((node) => {
+    if (node.type === 'comment') {
+      let match = node.text.trim().match(/^__tw_intellisense_layer_([a-z]+)__$/)
+      if (match === null) return
+      layer = match[1]
+      node.remove()
+      return
+    }
+
+    if (node.type !== 'rule') return
+
+    const rule = node
+    const classNames = getClassNamesFromSelector(rule.selector)
+
+    const decls = {}
+    rule.walkDecls((decl) => {
+      if (decls[decl.prop]) {
+        decls[decl.prop] = [
+          ...(Array.isArray(decls[decl.prop])
+            ? decls[decl.prop]
+            : [decls[decl.prop]]),
+          decl.value,
+        ]
+      } else {
+        decls[decl.prop] = decl.value
+      }
+    })
+
+    let p = rule
+    const keys = []
+    while (p.parent.type !== 'root') {
+      p = p.parent
+      if (p.type === 'atrule') {
+        keys.push(`@${p.name} ${p.params}`)
+      }
+    }
+
+    for (let i = 0; i < classNames.length; i++) {
+      const context = keys.concat([])
+      const baseKeys = classNames[i].className.split(/__TWSEP__.*?__TWSEP__/)
+      const contextKeys = baseKeys.slice(0, baseKeys.length - 1)
+      const index = []
+
+      const existing = dlv(tree, [...baseKeys, '__info'])
+      if (typeof existing !== 'undefined') {
+        if (Array.isArray(existing)) {
+          index.push(existing.length)
         } else {
-          decls[decl.prop] = decl.value
-        }
-      })
-
-      let p = rule
-      const keys = []
-      while (p.parent.type !== 'root') {
-        p = p.parent
-        if (p.type === 'atrule') {
-          keys.push(`@${p.name} ${p.params}`)
+          dset(tree, [...baseKeys, '__info'], [existing])
+          index.push(1)
         }
       }
+      if (classNames[i].__rule) {
+        dset(tree, [...baseKeys, '__info', ...index, '__rule'], true)
+        dset(tree, [...baseKeys, '__info', ...index, '__source'], layer)
 
-      for (let i = 0; i < classNames.length; i++) {
-        const context = keys.concat([])
-        const baseKeys = classNames[i].className.split('__TAILWIND_SEPARATOR__')
-        const contextKeys = baseKeys.slice(0, baseKeys.length - 1)
-        const index = []
-
-        const existing = dlv(tree, [...baseKeys, '__info'])
-        if (typeof existing !== 'undefined') {
-          if (Array.isArray(existing)) {
-            index.push(existing.length)
-          } else {
-            dset(tree, [...baseKeys, '__info'], [existing])
-            index.push(1)
-          }
-        }
-        if (classNames[i].__rule) {
-          dset(tree, [...baseKeys, '__info', ...index, '__rule'], true)
-          dset(
-            tree,
-            [...baseKeys, '__info', ...index, '__source'],
-            group.source
+        dsetEach(tree, [...baseKeys, '__info', ...index], decls)
+      }
+      dset(
+        tree,
+        [...baseKeys, '__info', ...index, '__pseudo'],
+        classNames[i].__pseudo
+      )
+      dset(
+        tree,
+        [...baseKeys, '__info', ...index, '__scope'],
+        classNames[i].scope
+      )
+      dset(
+        tree,
+        [...baseKeys, '__info', ...index, '__context'],
+        context.concat([]).reverse()
+      )
+
+      // common context
+      context.push(...classNames[i].__pseudo.map((x) => `&${x}`))
+
+      for (let i = 0; i < contextKeys.length; i++) {
+        if (typeof commonContext[contextKeys[i]] === 'undefined') {
+          commonContext[contextKeys[i]] = context
+        } else {
+          commonContext[contextKeys[i]] = intersection(
+            commonContext[contextKeys[i]],
+            context
           )
-
-          dsetEach(tree, [...baseKeys, '__info', ...index], decls)
-        }
-        dset(
-          tree,
-          [...baseKeys, '__info', ...index, '__pseudo'],
-          classNames[i].__pseudo
-        )
-        dset(
-          tree,
-          [...baseKeys, '__info', ...index, '__scope'],
-          classNames[i].scope
-        )
-        dset(
-          tree,
-          [...baseKeys, '__info', ...index, '__context'],
-          context.concat([]).reverse()
-        )
-
-        // common context
-        context.push(...classNames[i].__pseudo.map((x) => `&${x}`))
-
-        for (let i = 0; i < contextKeys.length; i++) {
-          if (typeof commonContext[contextKeys[i]] === 'undefined') {
-            commonContext[contextKeys[i]] = context
-          } else {
-            commonContext[contextKeys[i]] = intersection(
-              commonContext[contextKeys[i]],
-              context
-            )
-          }
         }
       }
-    })
+    }
   })
 
   return { classNames: tree, context: commonContext }