Skip to content

fix: enable $ in the classAttributes setting #1012

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
colelawrence wants to merge 1 commit into from
Closed

fix: enable $ in the classAttributes setting #1012

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions packages/tailwindcss-language-service/src/util/find.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,13 @@ async function findCustomClassLists(
}

export function matchClassAttributes(text: string, attributes: string[]): RegExpMatchArray[] {
const attrs = attributes.filter((x) => typeof x === 'string').flatMap((a) => [a, `\\[${a}\\]`])
const attrs = attributes.filter((x) => typeof x === 'string')
.map(a => {
// escape $, since it is the only character that is both a special RegExp character and a valid JSX + XML attribute
if (a.includes('\\$')) return a; // they already escaped this, so escaping again would produce a useless RegExp (with $)
return a.replaceAll('$', '\\$')
})
.flatMap((a) => [a, `\\[${a}\\]`])
const re = /(?:\s|:|\()(ATTRS)\s*=\s*['"`{]/
return findAll(new RegExp(re.source.replace('ATTRS', attrs.join('|')), 'gi'), text)
}
Expand Down Expand Up @@ -212,7 +218,7 @@ export async function findClassListsInHtmlRange(
currentClassList = undefined
}
}
} catch (_) {}
} catch (_) { }

if (currentClassList) {
classLists.push({
Expand Down