Skip to content

Commit 4e8918a

Browse files
committed
Disable variant order linting and sorting for tailwindcss v3
1 parent ddabfe9 commit 4e8918a

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,19 @@ export function completionsFromClassList(
123123
let items: CompletionItem[] = []
124124

125125
if (!important) {
126+
let shouldSortVariants = !semver.gte(state.version, '2.99.0')
127+
126128
items.push(
127129
...Object.entries(state.variants)
128130
.filter(([variant]) => !existingVariants.includes(variant))
129131
.map(([variant, definition], index) => {
130-
let resultingVariants = [...existingVariants, variant].sort(
131-
(a, b) => allVariants.indexOf(b) - allVariants.indexOf(a)
132-
)
132+
let resultingVariants = [...existingVariants, variant]
133+
134+
if (shouldSortVariants) {
135+
resultingVariants = resultingVariants.sort(
136+
(a, b) => allVariants.indexOf(b) - allVariants.indexOf(a)
137+
)
138+
}
133139

134140
return {
135141
label: variant + sep,
@@ -146,7 +152,7 @@ export function completionsFromClassList(
146152
range: replacementRange,
147153
},
148154
additionalTextEdits:
149-
resultingVariants.length > 1
155+
shouldSortVariants && resultingVariants.length > 1
150156
? [
151157
{
152158
newText:

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { findClassListsInDocument, getClassNamesInClassList } from '../util/find
55
import * as jit from '../util/jit'
66
import { getVariantsFromClassName } from '../util/getVariantsFromClassName'
77
import { equalExact } from '../util/array'
8+
import semver from 'semver'
89

910
export async function getRecommendedVariantOrderDiagnostics(
1011
state: State,
@@ -13,6 +14,8 @@ export async function getRecommendedVariantOrderDiagnostics(
1314
): Promise<RecommendedVariantOrderDiagnostic[]> {
1415
if (!state.jit) return []
1516

17+
if (semver.gte(state.version, '2.99.0')) return []
18+
1619
let severity = settings.tailwindCSS.lint.recommendedVariantOrder
1720
if (severity === 'ignore') return []
1821

0 commit comments

Comments
 (0)