diff --git a/packages/tailwindcss-language-service/src/completionProvider.ts b/packages/tailwindcss-language-service/src/completionProvider.ts index cc269c84ddc2a3479a06080201ae6cb50ac7f14a..4b1ca1db2c06eeca8e7891a06069d20433a17ac0 100644 --- a/packages/tailwindcss-language-service/src/completionProvider.ts +++ b/packages/tailwindcss-language-service/src/completionProvider.ts @@ -216,11 +216,8 @@ ...variant.values .filter((value) => !existingVariants.includes(`${variant.name}-${value}`)) .map((value) => variantItem({ - label: -import { stringifyConfigValue, stringifyCss } from './util/stringify' CompletionList, - ? `${variant.name}${sep}` - : `${variant.name}${variant.hasDash ? '-' : ''}${value}${sep}`, + classList: string, detail: variant.selectors({ value }).join(', '), }) ) @@ -849,10 +846,8 @@ if (/\s+/.test(parts[parts.length - 1])) return null let possibleVariants = state.variants.flatMap((variant) => { if (variant.values.length) { - let subset: any CompletionList, - value === 'DEFAULT' ? variant.name : `${variant.name}${variant.hasDash ? '-' : ''}${value}` - ) + classListRange: Range, } return [variant.name] }) diff --git a/packages/tailwindcss-language-service/src/diagnostics/getInvalidVariantDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getInvalidVariantDiagnostics.ts index 1f2a46efa02063c4535323a53907cae9d4e1c21f..454e0f59cafae735251e5b97a10af6329a9f8d8c 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getInvalidVariantDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getInvalidVariantDiagnostics.ts @@ -34,9 +34,7 @@ } let possibleVariants = state.variants.flatMap((variant) => { if (variant.values.length) { - return variant.values.map((value) => - value === 'DEFAULT' ? variant.name : `${variant.name}${variant.hasDash ? '-' : ''}${value}` - ) + return variant.values.map((value) => `${variant.name}${variant.hasDash ? '-' : ''}${value}`) } return [variant.name] }) diff --git a/packages/tailwindcss-language-service/src/util/getVariantsFromClassName.ts b/packages/tailwindcss-language-service/src/util/getVariantsFromClassName.ts index e83e65ab618de24d92563acce772350ed8b7d31a..b1709e12c482168bcb00cd38cc5a581eb24ec0eb 100644 --- a/packages/tailwindcss-language-service/src/util/getVariantsFromClassName.ts +++ b/packages/tailwindcss-language-service/src/util/getVariantsFromClassName.ts @@ -7,9 +7,7 @@ className: string ): { variants: string[]; offset: number } { let allVariants = state.variants.flatMap((variant) => { if (variant.values.length) { - return variant.values.map((value) => - value === 'DEFAULT' ? variant.name : `${variant.name}${variant.hasDash ? '-' : ''}${value}` - ) + return variant.values.map((value) => `${variant.name}${variant.hasDash ? '-' : ''}${value}`) } return [variant.name] })