Fix error when a files.excludes pattern contains braces (#696)

tailwindlabs · Jan 13, 2023 · 16b1148 · 16b1148
1 parent fd9de48
commit 16b1148
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/vscode-tailwindcss/package.json b/packages/vscode-tailwindcss/package.json
@@ -321,7 +321,9 @@
     "check": "tsc --noEmit"
   },
   "devDependencies": {
+    "@types/braces": "3.0.1",
     "@types/vscode": "1.65.0",
+    "braces": "3.0.2",
     "color-name": "1.1.4",
     "concurrently": "7.0.0",
     "rimraf": "3.0.2",

diff --git a/packages/vscode-tailwindcss/src/extension.ts b/packages/vscode-tailwindcss/src/extension.ts
@@ -43,6 +43,7 @@ import { dedupe, equal } from 'tailwindcss-language-service/src/util/array'
 import namedColors from 'color-name'
 import minimatch from 'minimatch'
 import { CONFIG_GLOB, CSS_GLOB } from 'tailwindcss-language-server/src/lib/constants'
+import braces from 'braces'
 
 const colorNames = Object.keys(namedColors)
 
@@ -644,7 +645,9 @@ export async function activate(context: ExtensionContext) {
 
     let [configFile] = await Workspace.findFiles(
       new RelativePattern(folder, `**/${CONFIG_GLOB}`),
-      `{${getExcludePatterns(folder).join(',')}}`,
+      `{${getExcludePatterns(folder)
+        .flatMap((pattern) => braces.expand(pattern))
+        .join(',')}}`,
       1
     )