From 22209f09c78016846bdb59fbb7b5530354107021 Mon Sep 17 00:00:00 2001 From: Brad Cornes Date: Tue, 30 May 2023 09:58:24 +0100 Subject: [PATCH] Fix diagnostic false-positive when no CSS properties are present (#793) --- .../src/diagnostics/getCssConflictDiagnostics.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts index a531af0..0950e76 100644 --- a/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts +++ b/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts @@ -82,9 +82,14 @@ export async function getCssConflictDiagnostics( return false } + let propertiesAreComparable = false + for (let i = 0; i < otherRules.length; i++) { let otherRule = otherRules[i] let properties = getRuleProperties(otherRule) + if (info[i].properties.length > 0 && properties.length > 0) { + propertiesAreComparable = true + } if (!equal(info[i].properties, properties)) { return false } @@ -94,6 +99,10 @@ export async function getCssConflictDiagnostics( } } + if (!propertiesAreComparable) { + return false + } + return true })