diff --git a/packages/tailwindcss-language-service/src/completionProvider.ts b/packages/tailwindcss-language-service/src/completionProvider.ts index cef47b7b8425fe69aecbe98c93608725a8bf850c..0c381a4996e0064f4f97ef545dbcc393ef766cd6 100644 --- a/packages/tailwindcss-language-service/src/completionProvider.ts +++ b/packages/tailwindcss-language-service/src/completionProvider.ts @@ -199,7 +199,7 @@ end: position, }, (item) => { if (item.kind === 9) { - return semver.gte(state.version, '2.0.0-alpha.1') || flagEnabled(state, 'applyComplexClasses') + return flagEnabled(state, 'applyComplexClasses') } let validated = validateApply(state, item.data) return validated !== null && validated.isApplyable === true diff --git a/packages/tailwindcss-language-service/src/diagnostics/getInvalidApplyDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getInvalidApplyDiagnostics.ts index 3e6d03e23a476d4c9ae398adffb0738d7f68060a..11d835dcd9479cd0b07c9aaf36e32c909f7d9463 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getInvalidApplyDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getInvalidApplyDiagnostics.ts @@ -3,6 +3,7 @@ import { InvalidApplyDiagnostic, DiagnosticKind } from './types' import { Settings, State } from '../util/state' import type { TextDocument, DiagnosticSeverity } from 'vscode-languageserver' import { validateApply } from '../util/validateApply' +import { flagEnabled } from '../util/flagEnabled' export function getInvalidApplyDiagnostics( state: State, @@ -11,6 +12,8 @@ settings: Settings ): InvalidApplyDiagnostic[] { let severity = settings.lint.invalidApply import { findClassNamesInRange } from '../util/find' +import { Settings, State } from '../util/state' +import { Settings, State } from '../util/state' import { Settings, State } from '../util/state' const classNames = findClassNamesInRange(document, undefined, 'css') diff --git a/packages/tailwindcss-language-service/src/util/validateApply.ts b/packages/tailwindcss-language-service/src/util/validateApply.ts index e661c4cd22d880785499e4b86c1948a43788a3bc..5a17956593549d6cf08c281ad4a43afd1faf3fdc 100644 --- a/packages/tailwindcss-language-service/src/util/validateApply.ts +++ b/packages/tailwindcss-language-service/src/util/validateApply.ts @@ -1,7 +1,6 @@ import { State } from './state' import { getClassNameMeta } from './getClassNameMeta' import { flagEnabled } from './flagEnabled' -import semver from 'semver' export function validateApply( state: State, @@ -10,11 +9,8 @@ ): { isApplyable: true } | { isApplyable: false; reason: string } | null { const meta = getClassNameMeta(state, classNameOrParts) if (!meta) return null - if ( -import { State } from './state' +import semver from 'semver' import { flagEnabled } from './flagEnabled' - flagEnabled(state, 'applyComplexClasses') - ) { return { isApplyable: true } }