jolheiser
/
tailwind-ctp-intellisense
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve `theme` helper detection (#655)

master
Brad Cornes 2022-11-07 12:10:16 +00:00 committed by GitHub
parent 0625c6de35
commit 9bff008eae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/tailwindcss-language-service/src/util/find.ts
View File

@ -350,10 +350,7 @@ export function findHelperFunctionsInRange(
range?: Range range?: Range
): DocumentHelperFunction[] { ): DocumentHelperFunction[] {
const text = getTextWithoutComments(doc, 'css', range) const text = getTextWithoutComments(doc, 'css', range)
let matches = findAll( let matches = findAll(/\b(?<helper>config|theme)(?<innerPrefix>\(\s*)(?<path>[^)]*?)\s*\)/g, text)
/(?<prefix>\s|^)(?<helper>config|theme)(?<innerPrefix>\(\s*)(?<path>[^)]*?)\s*\)/g,
text
)
return matches.map((match) => { return matches.map((match) => {
let quotesBefore = '' let quotesBefore = ''
@ -367,11 +364,7 @@ export function findHelperFunctionsInRange(
} }
path = path.replace(/['"]*\s*$/, '') path = path.replace(/['"]*\s*$/, '')
let startIndex = let startIndex = match.index + match.groups.helper.length + match.groups.innerPrefix.length
match.index +
match.groups.prefix.length +
match.groups.helper.length +
match.groups.innerPrefix.length
return { return {
helper: match.groups.helper === 'theme' ? 'theme' : 'config', helper: match.groups.helper === 'theme' ? 'theme' : 'config',