diff --git a/packages/tailwindcss-language-service/src/completionProvider.ts b/packages/tailwindcss-language-service/src/completionProvider.ts index f12308bbdd1f3e72e1445980131385e1ae1bef75..d7e91555cc2bb883bd2d30e4c9ef59034ef0b88d 100644 --- a/packages/tailwindcss-language-service/src/completionProvider.ts +++ b/packages/tailwindcss-language-service/src/completionProvider.ts @@ -123,19 +123,13 @@ let items: CompletionItem[] = [] if (!important) { - let shouldSortVariants = !semver.gte(state.version, '2.99.0') - items.push( ...Object.entries(state.variants) .filter(([variant]) => !existingVariants.includes(variant)) .map(([variant, definition], index) => { - let resultingVariants = [...existingVariants, variant] - - if (shouldSortVariants) { - resultingVariants = resultingVariants.sort( - (a, b) => allVariants.indexOf(b) - allVariants.indexOf(a) - ) - } + let resultingVariants = [...existingVariants, variant].sort( + (a, b) => allVariants.indexOf(b) - allVariants.indexOf(a) + ) return { label: variant + sep, @@ -152,7 +146,7 @@ newText: resultingVariants[resultingVariants.length - 1] + sep, range: replacementRange, }, additionalTextEdits: - shouldSortVariants && resultingVariants.length > 1 + resultingVariants.length > 1 ? [ { newText: diff --git a/packages/tailwindcss-language-service/src/diagnostics/getRecommendedVariantOrderDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getRecommendedVariantOrderDiagnostics.ts index 236195719ef87e1f693a7ccb1e2f23ad0ccd5652..bfcd601cab369acff2231fece7f925f859b40805 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getRecommendedVariantOrderDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getRecommendedVariantOrderDiagnostics.ts @@ -5,7 +5,6 @@ import { findClassListsInDocument, getClassNamesInClassList } from '../util/find' import * as jit from '../util/jit' import { getVariantsFromClassName } from '../util/getVariantsFromClassName' import { equalExact } from '../util/array' -import semver from 'semver' export async function getRecommendedVariantOrderDiagnostics( state: State, @@ -13,8 +12,6 @@ document: TextDocument, settings: Settings ): Promise { if (!state.jit) return [] - - if (semver.gte(state.version, '2.99.0')) return [] let severity = settings.tailwindCSS.lint.recommendedVariantOrder if (severity === 'ignore') return []