jolheiser
/
tailwind-ctp-intellisense
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix `files.exclude` merging (#464)

master
Brad Cornes 2022-01-17 14:07:55 +00:00
parent 5b675434f0
commit f40272fee2
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
packages/vscode-tailwindcss/src/extension.ts
View File

@ -18,6 +18,7 @@ import {
TextEditorDecorationType,
RelativePattern,
ConfigurationScope,
WorkspaceConfiguration,
} from 'vscode'
import {
LanguageClient,
@ -83,15 +84,16 @@ function getUserLanguages(folder?: WorkspaceFolder): Record<string, string> {
return isObject(langs) ? langs : {}
}
function getExcludePatterns(folder: WorkspaceFolder): string[] {
let globalExclude = Workspace.getConfiguration('files', folder).get('exclude')
let exclude = Object.entries(globalExclude)
.filter(([, value]) => value)
function getGlobalExcludePatterns(scope: ConfigurationScope): string[] {
return Object.entries(Workspace.getConfiguration('files', scope).get('exclude'))
.filter(([, value]) => value === true)
.map(([key]) => key)
}
function getExcludePatterns(scope: ConfigurationScope): string[] {
return [
...exclude,
...(<string[]>Workspace.getConfiguration('tailwindCSS', folder).get('files.exclude')),
...getGlobalExcludePatterns(scope),
...(<string[]>Workspace.getConfiguration('tailwindCSS', scope).get('files.exclude')),
]
}
@ -107,17 +109,12 @@ function isExcluded(file: string, folder: WorkspaceFolder): boolean {
return false
}
function mergeExcludes(settings, scope) {
// merge `files.exclude` into `tailwindCSS.files.exclude`
let globalExclude = Object.entries(Workspace.getConfiguration('files', scope).get('exclude'))
.filter(([, value]) => value)
.map(([key]) => key)
function mergeExcludes(settings: WorkspaceConfiguration, scope: ConfigurationScope) {
return {
...settings,
files: {
...settings.files,
exclude: [...globalExclude, ...settings.files.exclude],
exclude: [...getGlobalExcludePatterns(scope), ...settings.files.exclude],
},
}
}