From 0e66dac7b762083773181c850eece1873b112f37 Mon Sep 17 00:00:00 2001 From: Brad Cornes Date: Fri, 8 Jan 2021 15:53:02 +0000 Subject: [PATCH] update class attribute regex (#233) --- .../tailwindcss-language-service/src/completionProvider.ts | 5 ++++- packages/tailwindcss-language-service/src/util/find.ts | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/tailwindcss-language-service/src/completionProvider.ts b/packages/tailwindcss-language-service/src/completionProvider.ts index b9b87aa..f7655a0 100644 --- a/packages/tailwindcss-language-service/src/completionProvider.ts +++ b/packages/tailwindcss-language-service/src/completionProvider.ts @@ -159,7 +159,10 @@ function provideClassAttributeCompletions( end: position, }) - const match = findLast(/(?:\s|:)(?:class(?:Name)?|\[ngClass\])=['"`{]/gi, str) + const match = findLast( + /(?:\s|:|\()(?:class(?:Name)?|\[ngClass\])=['"`{]/gi, + str + ) if (match === null) { return null diff --git a/packages/tailwindcss-language-service/src/util/find.ts b/packages/tailwindcss-language-service/src/util/find.ts index a680d8c..96a9606 100644 --- a/packages/tailwindcss-language-service/src/util/find.ts +++ b/packages/tailwindcss-language-service/src/util/find.ts @@ -209,7 +209,7 @@ export function findClassListsInHtmlRange( ): DocumentClassList[] { const text = doc.getText(range) const matches = findAll( - /(?:\s|:)(?:class(?:Name)?|\[ngClass\])=['"`{]/g, + /(?:\s|:|\()(?:class(?:Name)?|\[ngClass\])=['"`{]/g, text ) const result: DocumentClassList[] = []