1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
diff --git a/packages/vscode-tailwindcss/src/extension.ts b/packages/vscode-tailwindcss/src/extension.ts
index 1d5ea430210d34122d098b0752f7a7c5df5a3f48..72b5c4b8e67617e6f70e9b090d65014d65bb6bbc 100755
--- a/packages/vscode-tailwindcss/src/extension.ts
+++ b/packages/vscode-tailwindcss/src/extension.ts
@@ -88,12 +88,15 @@ function getGlobalExcludePatterns(scope: ConfigurationScope): string[] {
return Object.entries(Workspace.getConfiguration('files', scope).get('exclude'))
.filter(([, value]) => value === true)
.map(([key]) => key)
+ .filter(Boolean)
}
function getExcludePatterns(scope: ConfigurationScope): string[] {
return [
...getGlobalExcludePatterns(scope),
- ...(<string[]>Workspace.getConfiguration('tailwindCSS', scope).get('files.exclude')),
+ ...(<string[]>Workspace.getConfiguration('tailwindCSS', scope).get('files.exclude')).filter(
+ Boolean
+ ),
]
}
@@ -109,12 +112,12 @@
return false
}
-function mergeExcludes(settings: WorkspaceConfiguration, scope: ConfigurationScope) {
+function mergeExcludes(settings: WorkspaceConfiguration, scope: ConfigurationScope): any {
return {
...settings,
files: {
...settings.files,
- exclude: [...getGlobalExcludePatterns(scope), ...settings.files.exclude],
+ exclude: getExcludePatterns(scope),
},
}
}
|