From 53b81ca46001486d1622d7a71828460af2160f2c Mon Sep 17 00:00:00 2001 From: Brad Cornes Date: Thu, 25 May 2023 13:24:38 +0100 Subject: [PATCH] Fix activation when `files.excludes` contains braces (#789) * Fix activation when `files.excludes` contains braces * Fix file exclude when searching for CSS files --- packages/vscode-tailwindcss/src/extension.ts | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/vscode-tailwindcss/src/extension.ts b/packages/vscode-tailwindcss/src/extension.ts index b324b2c..ac8951b 100755 --- a/packages/vscode-tailwindcss/src/extension.ts +++ b/packages/vscode-tailwindcss/src/extension.ts @@ -644,11 +644,15 @@ export async function activate(context: ExtensionContext) { return } + let exclude = `{${getExcludePatterns(folder) + .flatMap((pattern) => braces.expand(pattern)) + .join(',') + .replace(/{/g, '%7B') + .replace(/}/g, '%7D')}}` + let [configFile] = await Workspace.findFiles( new RelativePattern(folder, `**/${CONFIG_GLOB}`), - `{${getExcludePatterns(folder) - .flatMap((pattern) => braces.expand(pattern)) - .join(',')}}`, + exclude, 1 ) @@ -657,10 +661,7 @@ export async function activate(context: ExtensionContext) { return } - let cssFiles = await Workspace.findFiles( - new RelativePattern(folder, `**/${CSS_GLOB}`), - `{${getExcludePatterns(folder).join(',')}}` - ) + let cssFiles = await Workspace.findFiles(new RelativePattern(folder, `**/${CSS_GLOB}`), exclude) for (let cssFile of cssFiles) { if (await fileContainsAtConfig(cssFile)) {