compare scope when determining css conflicts (tailwindlabs#134)

bradlc · bradlc · commit c5b5c1b116df · 2020-06-23T21:14:47.000+01:00
diff --git a/src/lsp/providers/diagnostics/getCssConflictDiagnostics.ts b/src/lsp/providers/diagnostics/getCssConflictDiagnostics.ts
@@ -44,7 +44,8 @@ export function getCssConflictDiagnostics(
           !Array.isArray(meta) &&
           !Array.isArray(otherMeta) &&
           equal(meta.context, otherMeta.context) &&
-          equal(meta.pseudo, otherMeta.pseudo)
+          equal(meta.pseudo, otherMeta.pseudo) &&
+          meta.scope === otherMeta.scope
         )
       })
 

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,8 @@ export function getCssConflictDiagnostics(`
`44`	`44`	`!Array.isArray(meta) &&`
`45`	`45`	`!Array.isArray(otherMeta) &&`
`46`	`46`	`equal(meta.context, otherMeta.context) &&`
`47`		`- equal(meta.pseudo, otherMeta.pseudo)`
	`47`	`+ equal(meta.pseudo, otherMeta.pseudo) &&`
	`48`	`+ meta.scope === otherMeta.scope`
`48`	`49`	`)`
`49`	`50`	`})`
`50`	`51`