From 61bcd704f85d9052c0c85cea4065049777b86ba8 Mon Sep 17 00:00:00 2001 From: Robin Malfait Date: Wed, 19 Oct 2022 13:32:05 +0200 Subject: [PATCH 1/2] handle the `DEFAULT` case --- .../tailwindcss-language-service/src/completionProvider.ts | 4 ++-- .../src/diagnostics/getInvalidVariantDiagnostics.ts | 2 +- .../src/util/getVariantsFromClassName.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/tailwindcss-language-service/src/completionProvider.ts b/packages/tailwindcss-language-service/src/completionProvider.ts index 4b1ca1db..504f4f66 100644 --- a/packages/tailwindcss-language-service/src/completionProvider.ts +++ b/packages/tailwindcss-language-service/src/completionProvider.ts @@ -216,7 +216,7 @@ export function completionsFromClassList( .filter((value) => !existingVariants.includes(`${variant.name}-${value}`)) .map((value) => variantItem({ - label: `${variant.name}${variant.hasDash ? '-' : ''}${value}${sep}`, + label: value === 'DEFAULT'? `${variant.name}${sep}` : `${variant.name}${variant.hasDash ? '-' : ''}${value}${sep}`, detail: variant.selectors({ value }).join(', '), }) ) @@ -845,7 +845,7 @@ function provideVariantsDirectiveCompletions( let possibleVariants = state.variants.flatMap((variant) => { if (variant.values.length) { - return variant.values.map((value) => `${variant.name}${variant.hasDash ? '-' : ''}${value}`) + return variant.values.map((value) => value === 'DEFAULT'? variant.name : `${variant.name}${variant.hasDash ? '-' : ''}${value}`) } return [variant.name] }) diff --git a/packages/tailwindcss-language-service/src/diagnostics/getInvalidVariantDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getInvalidVariantDiagnostics.ts index 454e0f59..87a86785 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getInvalidVariantDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getInvalidVariantDiagnostics.ts @@ -34,7 +34,7 @@ export function getInvalidVariantDiagnostics( let possibleVariants = state.variants.flatMap((variant) => { if (variant.values.length) { - return variant.values.map((value) => `${variant.name}${variant.hasDash ? '-' : ''}${value}`) + return variant.values.map((value) => value === 'DEFAULT'? variant.name : `${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 b1709e12..06fc7d97 100644 --- a/packages/tailwindcss-language-service/src/util/getVariantsFromClassName.ts +++ b/packages/tailwindcss-language-service/src/util/getVariantsFromClassName.ts @@ -7,7 +7,7 @@ export function getVariantsFromClassName( ): { variants: string[]; offset: number } { let allVariants = state.variants.flatMap((variant) => { if (variant.values.length) { - return variant.values.map((value) => `${variant.name}${variant.hasDash ? '-' : ''}${value}`) + return variant.values.map((value) => value === 'DEFAULT'? variant.name : `${variant.name}${variant.hasDash ? '-' : ''}${value}`) } return [variant.name] }) From 3e7890bb9bcee2a7ae5c27ffd0d9e95acca24dd3 Mon Sep 17 00:00:00 2001 From: Brad Cornes Date: Wed, 19 Oct 2022 18:16:56 +0100 Subject: [PATCH 2/2] Prettier --- .../src/completionProvider.ts | 9 +++++++-- .../src/diagnostics/getInvalidVariantDiagnostics.ts | 4 +++- .../src/util/getVariantsFromClassName.ts | 4 +++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/packages/tailwindcss-language-service/src/completionProvider.ts b/packages/tailwindcss-language-service/src/completionProvider.ts index 504f4f66..cc269c84 100644 --- a/packages/tailwindcss-language-service/src/completionProvider.ts +++ b/packages/tailwindcss-language-service/src/completionProvider.ts @@ -216,7 +216,10 @@ export function completionsFromClassList( .filter((value) => !existingVariants.includes(`${variant.name}-${value}`)) .map((value) => variantItem({ - label: value === 'DEFAULT'? `${variant.name}${sep}` : `${variant.name}${variant.hasDash ? '-' : ''}${value}${sep}`, + label: + value === 'DEFAULT' + ? `${variant.name}${sep}` + : `${variant.name}${variant.hasDash ? '-' : ''}${value}${sep}`, detail: variant.selectors({ value }).join(', '), }) ) @@ -845,7 +848,9 @@ function provideVariantsDirectiveCompletions( 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) => + value === 'DEFAULT' ? variant.name : `${variant.name}${variant.hasDash ? '-' : ''}${value}` + ) } return [variant.name] }) diff --git a/packages/tailwindcss-language-service/src/diagnostics/getInvalidVariantDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getInvalidVariantDiagnostics.ts index 87a86785..1f2a46ef 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getInvalidVariantDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getInvalidVariantDiagnostics.ts @@ -34,7 +34,9 @@ export function getInvalidVariantDiagnostics( 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) => + value === 'DEFAULT' ? variant.name : `${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 06fc7d97..e83e65ab 100644 --- a/packages/tailwindcss-language-service/src/util/getVariantsFromClassName.ts +++ b/packages/tailwindcss-language-service/src/util/getVariantsFromClassName.ts @@ -7,7 +7,9 @@ export function getVariantsFromClassName( ): { 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) => + value === 'DEFAULT' ? variant.name : `${variant.name}${variant.hasDash ? '-' : ''}${value}` + ) } return [variant.name] })