1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
|
diff --git a/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts
index c061ec4735282c4738456f4ddf331d0961e52435..4459d249bed274dee0a18fe58c3db84f9574acf2 100644
--- a/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts
+++ b/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts
@@ -25,42 +25,40 @@
classNames.forEach((className, index) => {
if (state.jit) {
let { rules } = jit.generateRules(state, [className.className])
- if (rules.length !== 1) {
+ if (rules.length === 0) {
return
}
- let rule = rules[0]
- let context: string[]
- let properties = []
- rule.walkDecls(({ prop }) => {
- properties.push(prop)
+
+ let info: Array<{ context: string[]; properties: string[] }> = rules.map((rule) => {
+ let properties: string[] = []
+ rule.walkDecls(({ prop }) => {
+ properties.push(prop)
+ })
+ let context = jit.getRuleContext(state, rule, className.className)
+ return { context, properties }
})
let otherClassNames = classNames.filter((_className, i) => i !== index)
let conflictingClassNames = otherClassNames.filter((otherClassName) => {
- let { rules } = jit.generateRules(state, [otherClassName.className])
- if (rules.length !== 1) {
- return false
- }
-
- let otherRule = rules[0]
-
- let otherProperties = []
- otherRule.walkDecls(({ prop }) => {
- otherProperties.push(prop)
- })
-
- if (!equal(properties, otherProperties)) {
+ let { rules: otherRules } = jit.generateRules(state, [otherClassName.className])
+ if (otherRules.length !== rules.length) {
return false
}
- if (!context) {
- context = jit.getRuleContext(state, rule, className.className)
- }
- let otherContext = jit.getRuleContext(state, otherRule, otherClassName.className)
-
- if (!equal(context, otherContext)) {
- return false
+ for (let i = 0; i < otherRules.length; i++) {
+ let rule = otherRules[i]
+ let properties: string[] = []
+ rule.walkDecls(({ prop }) => {
+ properties.push(prop)
+ })
+ if (!equal(info[i].properties, properties)) {
+ return false
+ }
+ let context = jit.getRuleContext(state, rule, otherClassName.className)
+ if (!equal(info[i].context, context)) {
+ return false
+ }
}
return true
@@ -77,9 +75,7 @@ severity:
severity === 'error'
? 1 /* DiagnosticSeverity.Error */
: 2 /* DiagnosticSeverity.Warning */,
- message: `'${className.className}' applies the same CSS ${
- properties.length === 1 ? 'property' : 'properties'
- } as ${joinWithAnd(
+ message: `'${className.className}' applies the same CSS properties as ${joinWithAnd(
conflictingClassNames.map(
(conflictingClassName) => `'${conflictingClassName.className}'`
)
|