Tweak theme helper detection (#689)

tailwindlabs · Jan 4, 2023 · b0e4fad · b0e4fad
1 parent 3beff14
commit b0e4fad
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/packages/tailwindcss-language-service/src/completionProvider.ts b/packages/tailwindcss-language-service/src/completionProvider.ts
@@ -614,7 +614,7 @@ function provideCssHelperCompletions(
 
   const match = text
     .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) {
     return null

diff --git a/packages/tailwindcss-language-service/src/util/find.ts b/packages/tailwindcss-language-service/src/util/find.ts
@@ -350,7 +350,10 @@ export function findHelperFunctionsInRange(
   range?: Range
 ): DocumentHelperFunction[] {
   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) => {
     let quotesBefore = ''
@@ -364,7 +367,11 @@ export function findHelperFunctionsInRange(
     }
     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 {
       helper: match.groups.helper === 'theme' ? 'theme' : 'config',