wip

Author: bradlc

packages/tailwindcss-language-server/src/language/cssServer.ts

@@ -357,6 +357,7 @@ function createVirtualCssDocument(textDocument: TextDocument): TextDocument {
         /@media(\s+screen\s*\([^)]+\))/g,
         (_match, screen) => `@media (${MEDIA_MARKER})${' '.repeat(screen.length - 4)}`
       )
+      .replace(/(?<=\b(?:theme|config)\([^)]*)[.[\]]/g, '_')
   )
 }
 

packages/tailwindcss-language-server/src/server.ts

@@ -112,6 +112,7 @@ const TRIGGER_CHARACTERS = [
   // @apply and emmet-style
   '.',
   // config/theme helper
+  '(',
   '[',
   // JIT "important" prefix
   '!',

packages/tailwindcss-language-service/src/completionProvider.ts

@@ -537,14 +537,26 @@ function provideCssHelperCompletions(
 
   const match = text
     .substr(0, text.length - 1) // don't include that extra character from earlier
-    .match(/\b(?<helper>config|theme)\(['"](?<keys>[^'"]*)$/)
+    .match(/\b(?<helper>config|theme)\(\s*['"]?(?<path>[^)'"]*)$/)
 
   if (match === null) {
     return null
   }
 
+  let alpha: string
+  let path = match.groups.path.replace(/^['"]+/g, '')
+  let matches = path.match(/^([^\s]+)(?![^\[]*\])(?:\s*\/\s*([^\/\s]*))$/)
+  if (matches) {
+    path = matches[1]
+    alpha = matches[2]
+  }
+
+  if (alpha !== undefined) {
+    return null
+  }
+
   let base = match.groups.helper === 'config' ? state.config : dlv(state.config, 'theme', {})
-  let parts = match.groups.keys.split(/([\[\].]+)/)
+  let parts = path.split(/([\[\].]+)/)
   let keys = parts.filter((_, i) => i % 2 === 0)
   let separators = parts.filter((_, i) => i % 2 !== 0)
   // let obj =

packages/tailwindcss-language-service/src/diagnostics/getInvalidConfigPathDiagnostics.ts

@@ -179,42 +179,49 @@ export function getInvalidConfigPathDiagnostics(
 
   ranges.forEach((range) => {
     let text = getTextWithoutComments(document, 'css', range)
-    let matches = findAll(
-      /(?<prefix>\s|^)(?<helper>config|theme)\((?<quote>['"])(?<key>[^)]+)\k<quote>[^)]*\)/g,
-      text
-    )
+    let matches = findAll(/(?<prefix>\s|^)(?<helper>config|theme)\((?<path>[^)]*)\)/g, text)
 
     matches.forEach((match) => {
-      let base = match.groups.helper === 'theme' ? ['theme'] : []
-      let result = validateConfigPath(state, match.groups.key, base)
-
-      if (result.isValid === true) {
-        return null
+      let path = match.groups.path.replace(/^['"]+|['"]+$/g, '')
+      let alpha: string
+      let matches = path.match(/^([^\s]+)(?![^\[]*\])(?:\s*\/\s*([^\/\s]+))$/)
+      if (matches) {
+        path = matches[1]
+        alpha = matches[2]
       }
-
-      let startIndex =
-        match.index +
-        match.groups.prefix.length +
-        match.groups.helper.length +
-        1 + // open paren
-        match.groups.quote.length
-
-      diagnostics.push({
-        code: DiagnosticKind.InvalidConfigPath,
-        range: absoluteRange(
-          {
-            start: indexToPosition(text, startIndex),
-            end: indexToPosition(text, startIndex + match.groups.key.length),
-          },
-          range
-        ),
-        severity:
-          severity === 'error'
-            ? 1 /* DiagnosticSeverity.Error */
-            : 2 /* DiagnosticSeverity.Warning */,
-        message: result.reason,
-        suggestions: result.suggestions,
-      })
+      console.log({ path, alpha })
+      return
+
+      // let base = match.groups.helper === 'theme' ? ['theme'] : []
+      // let result = validateConfigPath(state, match.groups.path, base)
+
+      // if (result.isValid === true) {
+      //   return null
+      // }
+
+      // let startIndex =
+      //   match.index +
+      //   match.groups.prefix.length +
+      //   match.groups.helper.length +
+      //   1 + // open paren
+      //   match.groups.innerPrefix.length
+
+      // diagnostics.push({
+      //   code: DiagnosticKind.InvalidConfigPath,
+      //   range: absoluteRange(
+      //     {
+      //       start: indexToPosition(text, startIndex),
+      //       end: indexToPosition(text, startIndex + match.groups.path.length),
+      //     },
+      //     range
+      //   ),
+      //   severity:
+      //     severity === 'error'
+      //       ? 1 /* DiagnosticSeverity.Error */
+      //       : 2 /* DiagnosticSeverity.Warning */,
+      //   message: result.reason,
+      //   suggestions: result.suggestions,
+      // })
     })
   })