Skip to content

Commit 3f9762e

Browse files
RobinMalfaitbradlc
andauthored
Handle the DEFAULT case for matchVariant (#635)
* handle the `DEFAULT` case * Prettier Co-authored-by: Brad Cornes <hello@bradley.dev>
1 parent a12e3ae commit 3f9762e

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

packages/tailwindcss-language-service/src/completionProvider.ts

+7-2
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,10 @@ export function completionsFromClassList(
216216
.filter((value) => !existingVariants.includes(`${variant.name}-${value}`))
217217
.map((value) =>
218218
variantItem({
219-
label: `${variant.name}${variant.hasDash ? '-' : ''}${value}${sep}`,
219+
label:
220+
value === 'DEFAULT'
221+
? `${variant.name}${sep}`
222+
: `${variant.name}${variant.hasDash ? '-' : ''}${value}${sep}`,
220223
detail: variant.selectors({ value }).join(', '),
221224
})
222225
)
@@ -845,7 +848,9 @@ function provideVariantsDirectiveCompletions(
845848

846849
let possibleVariants = state.variants.flatMap((variant) => {
847850
if (variant.values.length) {
848-
return variant.values.map((value) => `${variant.name}${variant.hasDash ? '-' : ''}${value}`)
851+
return variant.values.map((value) =>
852+
value === 'DEFAULT' ? variant.name : `${variant.name}${variant.hasDash ? '-' : ''}${value}`
853+
)
849854
}
850855
return [variant.name]
851856
})

packages/tailwindcss-language-service/src/diagnostics/getInvalidVariantDiagnostics.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ export function getInvalidVariantDiagnostics(
3434

3535
let possibleVariants = state.variants.flatMap((variant) => {
3636
if (variant.values.length) {
37-
return variant.values.map((value) => `${variant.name}${variant.hasDash ? '-' : ''}${value}`)
37+
return variant.values.map((value) =>
38+
value === 'DEFAULT' ? variant.name : `${variant.name}${variant.hasDash ? '-' : ''}${value}`
39+
)
3840
}
3941
return [variant.name]
4042
})

packages/tailwindcss-language-service/src/util/getVariantsFromClassName.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ export function getVariantsFromClassName(
77
): { variants: string[]; offset: number } {
88
let allVariants = state.variants.flatMap((variant) => {
99
if (variant.values.length) {
10-
return variant.values.map((value) => `${variant.name}${variant.hasDash ? '-' : ''}${value}`)
10+
return variant.values.map((value) =>
11+
value === 'DEFAULT' ? variant.name : `${variant.name}${variant.hasDash ? '-' : ''}${value}`
12+
)
1113
}
1214
return [variant.name]
1315
})

0 commit comments

Comments
 (0)