From 58552955d3ed92e44284d065cd2e52b47c14dfd1 Mon Sep 17 00:00:00 2001 From: Brad Cornes Date: Thu, 25 May 2023 13:20:31 +0100 Subject: [PATCH 1/2] Fix activation when `files.excludes` contains braces --- packages/vscode-tailwindcss/src/extension.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/vscode-tailwindcss/src/extension.ts b/packages/vscode-tailwindcss/src/extension.ts index b324b2c5..4fef00f3 100755 --- a/packages/vscode-tailwindcss/src/extension.ts +++ b/packages/vscode-tailwindcss/src/extension.ts @@ -648,7 +648,9 @@ export async function activate(context: ExtensionContext) { new RelativePattern(folder, `**/${CONFIG_GLOB}`), `{${getExcludePatterns(folder) .flatMap((pattern) => braces.expand(pattern)) - .join(',')}}`, + .join(',') + .replace(/{/g, '%7B') + .replace(/}/g, '%7D')}}`, 1 ) From 8b5b415d97eeb0cbae2208944822688fdd405cae Mon Sep 17 00:00:00 2001 From: Brad Cornes Date: Thu, 25 May 2023 13:23:17 +0100 Subject: [PATCH 2/2] Fix file exclude when searching for CSS files --- packages/vscode-tailwindcss/src/extension.ts | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/packages/vscode-tailwindcss/src/extension.ts b/packages/vscode-tailwindcss/src/extension.ts index 4fef00f3..ac8951b8 100755 --- a/packages/vscode-tailwindcss/src/extension.ts +++ b/packages/vscode-tailwindcss/src/extension.ts @@ -644,13 +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(',') - .replace(/{/g, '%7B') - .replace(/}/g, '%7D')}}`, + exclude, 1 ) @@ -659,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)) {