diff --git a/packages/tailwindcss-language-server/src/server.ts b/packages/tailwindcss-language-server/src/server.ts index 426a1c697b31df5f5d3d29861f4e88460be2300c..9fbdd0b2090c24e3971d230f6fb902d436b91442 100644 --- a/packages/tailwindcss-language-server/src/server.ts +++ b/packages/tailwindcss-language-server/src/server.ts @@ -39,7 +39,7 @@ import chokidar, { FSWatcher } from 'chokidar' import findUp from 'find-up' import minimatch from 'minimatch' import resolveFrom, { setPnpApi } from './util/resolveFrom' -import { /*postcssFallback,*/ AtRule, Container, Node, Result } from 'postcss' +import { /*postcssFallback,*/ Result } from 'postcss' // import tailwindcssFallback from 'tailwindcss' // import resolveConfigFallback from 'tailwindcss/resolveConfig' import Module from 'module' @@ -1096,10 +1096,6 @@ }) } catch (_) {} } -function isAtRule(node: Node): node is AtRule { - return node.type === 'atrule' -} - function getVariants(state: State): Record { if (state.jit) { function escape(className: string): string { @@ -1157,36 +1153,18 @@ let definitions = [] for (let fn of fns) { - let definition: string let container = root.clone() - let returnValue = fn({ + fn({ container, separator: state.separator, modifySelectors, - format: (def: string) => { - definition = def.replace(/:merge\(([^)]+)\)/g, '$1') - }, - wrap: (rule: Container) => { - if (isAtRule(rule)) { - definition = `@${rule.name} ${rule.params}` - } - }, }) - if (!definition) { - definition = returnValue - } - - if (definition) { - definitions.push(definition) - continue - } - container.walkDecls((decl) => { decl.remove() }) - definition = container + let definition = container .toString() .replace(`.${escape(`${variantName}:${placeholder}`)}`, '&') .replace(/(?