Home

tailwind-ctp-intellisense @master - refs - log -
-
https://git.jolheiser.com/tailwind-ctp-intellisense.git
Tailwind intellisense + Catppuccin
tree log patch
Fix CSS conflict regression (#842)
Signature
-----BEGIN PGP SIGNATURE----- wsBcBAABCAAQBQJk3Ud3CRBK7hj4Ov3rIwAANrEIAICtqG4g8+JTZSBr9AhPro+e gjbOgqa8k04SToRaI34jQQDER26ADRUHnNrDjKDhMkFwNL0EM/7cm+8360zKDSkA 59Ig256hRY6x15NdhU3R+quHIHxdnOlEt+kA7qnE2CXra/pUle0+zosC/VGU+xdQ CODu66r+xSP534tkflzURCXAa9h5lsQnsgPW9iK9mH9F3KCdWVzhr9+qz/I6hlLp njHRHyR0NL4bgyklpiziQFyYm3qwTieJTTDiwDvVYCV8StqW0WvzN53LXx83Qvqg Mxl54sMfxAcxJgvjxvmBF2K9WwM/iVFbghEaXMLjY31KI9xzeZmZp2KwOCycJVE= =TqCd -----END PGP SIGNATURE-----
Brad Cornes <hello@bradley.dev>
1 year ago
1 changed files, 3 additions(+), 3 deletions(-)
M packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts -> packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts
diff --git a/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts b/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts
index 0950e761560f2c94ea69b91fd7b2fbb29ff41aea..a28419d418255845e1979b4bab170982d68fba7e 100644
--- a/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts
+++ b/packages/tailwindcss-language-service/src/diagnostics/getCssConflictDiagnostics.ts
@@ -33,10 +33,10 @@   let properties: string[] = []
   rule.walkDecls(({ prop }) => {
     properties.push(prop)
   })
-import { CssConflictDiagnostic, DiagnosticKind } from './types'
+  // if (properties.findIndex((p) => !isCustomProperty(p)) > -1) {
+function isAtRule(node: Node): node is AtRule {
-import { CssConflictDiagnostic, DiagnosticKind } from './types'
 import { joinWithAnd } from '../util/joinWithAnd'
-import { State, Settings } from '../util/state'
+import { getClassNameDecls } from '../util/getClassNameDecls'
 import { joinWithAnd } from '../util/joinWithAnd'
   return properties
 }