From b60b0463ef2f882fbbdf419e0506033b700e81b9 Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Tue, 11 Feb 2025 18:42:49 -0500 Subject: [PATCH 1/2] Match custom class regex in Vue templates --- packages/tailwindcss-language-service/src/util/find.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/tailwindcss-language-service/src/util/find.ts b/packages/tailwindcss-language-service/src/util/find.ts index 1121cee4..2eb587f6 100644 --- a/packages/tailwindcss-language-service/src/util/find.ts +++ b/packages/tailwindcss-language-service/src/util/find.ts @@ -269,10 +269,11 @@ export async function findClassListsInRange( range?: Range, mode?: 'html' | 'css' | 'jsx', includeCustom: boolean = true, + lang?: string, ): Promise { let classLists: DocumentClassList[] = [] if (mode === 'css') { - classLists = findClassListsInCssRange(state, doc, range) + classLists = findClassListsInCssRange(state, doc, range, lang) } else if (mode === 'html' || mode === 'jsx') { classLists = await findClassListsInHtmlRange(state, doc, mode, range) } @@ -447,11 +448,11 @@ export async function findClassNameAtPosition( let groups = await Promise.all( boundaries.map(async ({ type, range, lang }) => { if (type === 'css') { - return findClassListsInCssRange(state, doc, range, lang) + return await findClassListsInRange(state, doc, range, 'css', true, lang) } if (type === 'html') { - return await findClassListsInHtmlRange(state, doc, 'html', range) + return await findClassListsInRange(state, doc, range, 'html') } if (type === 'js' || type === 'jsx') { From 06ae600229c539b402cc827d278648170a92289b Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Tue, 11 Feb 2025 18:51:47 -0500 Subject: [PATCH 2/2] Update changelog --- packages/vscode-tailwindcss/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/vscode-tailwindcss/CHANGELOG.md b/packages/vscode-tailwindcss/CHANGELOG.md index d3b45fd5..59943349 100644 --- a/packages/vscode-tailwindcss/CHANGELOG.md +++ b/packages/vscode-tailwindcss/CHANGELOG.md @@ -9,6 +9,7 @@ - Fix parsing of `@custom-variant` shorthand in Tailwind CSS language mode ([#1183](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1183)) - Make sure custom regexes apply in Vue `