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

Tweak `theme` helper detection (#689)

master
Brad Cornes 2023-01-04 10:34:41 +00:00 committed by GitHub
parent 3beff1474a
commit b0e4fadc4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/tailwindcss-language-service/src/completionProvider.ts
View File

@ -614,7 +614,7 @@ function provideCssHelperCompletions(
const match = text const match = text
.substr(0, text.length - 1) // don't include that extra character from earlier .substr(0, text.length - 1) // don't include that extra character from earlier
.match(/\b(?<helper>config|theme)\(\s*['"]?(?<path>[^)'"]*)$/) .match(/[\s:;/*(){}](?<helper>config|theme)\(\s*['"]?(?<path>[^)'"]*)$/)
if (match === null) { if (match === null) {
return null return null

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

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