Cleanup code

Author: thecrypticace

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

@@ -16,7 +16,6 @@ import resolveFrom from './util/resolveFrom'
 import { type Feature, supportedFeatures } from '@tailwindcss/language-service/src/features'
 import { pathToFileURL } from 'node:url'
 import { resolveCssImports } from './resolve-css-imports'
-import type { GlobEntry } from '@tailwindcss/oxide'
 
 export interface ProjectConfig {
   /** The folder that contains the project */
@@ -439,38 +438,36 @@ async function* contentSelectorsFromCssConfig(entry: ConfigEntry): AsyncIterable
       }
     } else if (item.kind === 'auto' && !auto) {
       auto = true
-      for await (let file of detectContentFiles(entry.packageRoot)) {
-        if (typeof file === 'string') {
-          yield {
-            pattern: normalizePath(file),
-            priority: DocumentSelectorPriority.CONTENT_FILE,
-          }
+      for await (let pattern of detectContentFiles(entry.packageRoot)) {
+        yield {
+          pattern,
+          priority: DocumentSelectorPriority.CONTENT_FILE,
         }
       }
     }
   }
 }
 
-async function* detectContentFiles(base: string): AsyncIterable<string | GlobEntry> {
+async function* detectContentFiles(base: string): AsyncIterable<string> {
   try {
     let oxidePath = resolveFrom(path.dirname(base), '@tailwindcss/oxide')
     oxidePath = pathToFileURL(oxidePath).href
 
+    const oxide: typeof import('@tailwindcss/oxide') = await import(oxidePath)
+
     // This isn't a v4 project
-    const oxide = await import(oxidePath)
+    if (!oxide.scanDir) return
 
-    function validateOxide(input: any): input is typeof import('@tailwindcss/oxide') {
-      return !!oxide.scanDir
-    }
+    let { files, globs } = oxide.scanDir({ base, globs: true })
 
-    if (!validateOxide(oxide)) {
-      return
+    for (let file of files) {
+      yield normalizePath(file)
     }
 
-    let { files, globs } = oxide.scanDir({ base, globs: true })
-
-    yield* files
-    yield* globs
+    for (let { base, glob } of globs) {
+      // Do not normalize the glob itself as it may contain escape sequences
+      yield normalizePath(base) + '/' + glob
+    }
   } catch {
     //
   }