tailwind-ctp-intellisense @master -
refs -
log -
-
https://git.jolheiser.com/tailwind-ctp-intellisense.git
Tailwind intellisense + Catppuccin
Fix error when a `files.excludes` pattern contains braces (#696)
Signature
-----BEGIN PGP SIGNATURE-----
wsBcBAABCAAQBQJjwTBtCRBK7hj4Ov3rIwAAF7wIAF9w/TnRi+k6Zu7dHXH4TurG
Mhg4pIGvawEADgdYfp6pgeBg+MgJYRNEd/BdJYiVzlBmva3X/hJ3rYdnxhBeg7Qw
8ah4uwGjOphnRQXhc/rQ2fOtr5rNbG83hzwf9wCViuDKFxBtYVdtXVGYbgIN6CB9
gyCBLHTHrP5WqnAw/VT0KL5QZJ3I7NnmJNJLBC52NHxX0+48vWE3153pbCFEsqQF
2hLFVrBQuGQfeXFbkudE3Yfx0xrrGdnhxTcQ093Euip1dCWlNn+I9ouamhiauRrU
IRxofakjiq79jnyr9R1XXrcXMGZ/q3TykkxGt9mWfUcZyMke8D+Jf0cJJAqQZ4Q=
=PIfl
-----END PGP SIGNATURE-----
3 changed files, 18 additions(+), 1 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 48cbd65285e890b27f8e7c172c62c25a1ebf910d..0de93f2c3023958d06c60636910ad05b3b2ec6da 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,12 +11,14 @@ "@tailwindcss/aspect-ratio": "0.4.2",
"@tailwindcss/forms": "0.5.3",
"@tailwindcss/line-clamp": "0.4.2",
"@tailwindcss/typography": "0.5.7",
+ "@types/braces": "3.0.1",
"@types/debounce": "1.2.0",
"@types/moo": "0.5.3",
"@types/node": "14.14.34",
"@types/semver": "7.3.10",
"@types/vscode": "1.65.0",
"becke-ch--regex--s0-0-v1--base--pl--lib": "1.4.0",
+ "braces": "3.0.2",
"builtin-modules": "3.2.0",
"chokidar": "3.5.1",
"color-name": "1.1.4",
@@ -4665,6 +4667,11 @@ "integrity": "sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==",
"dependencies": {
"@babel/types": "^7.3.0"
}
+ },
+ "node_modules/@types/braces": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/@types/braces/-/braces-3.0.1.tgz",
+ "integrity": "sha512-+euflG6ygo4bn0JHtn4pYqcXwRtLvElQ7/nnjDu7iYG56H0+OhCd7d6Ug0IE3WcFpZozBKW2+80FUbv5QGk5AQ=="
},
"node_modules/@types/debounce": {
"version": "1.2.0",
@@ -24821,6 +24828,11 @@ "integrity": "sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==",
"requires": {
"@babel/types": "^7.3.0"
}
+ },
+ "@types/braces": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/@types/braces/-/braces-3.0.1.tgz",
+ "integrity": "sha512-+euflG6ygo4bn0JHtn4pYqcXwRtLvElQ7/nnjDu7iYG56H0+OhCd7d6Ug0IE3WcFpZozBKW2+80FUbv5QGk5AQ=="
},
"@types/debounce": {
"version": "1.2.0",
diff --git a/packages/vscode-tailwindcss/package.json b/packages/vscode-tailwindcss/package.json
index 57e996340cbf235d9e2ff375c0d4d63fa878996d..40b6aaba7033939bc1ed7f761e28ae30702133f4 100755
--- a/packages/vscode-tailwindcss/package.json
+++ b/packages/vscode-tailwindcss/package.json
@@ -321,7 +321,9 @@ "test": "jest",
"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
index 8455948fd594ea7736a9f454cb9f74737da8471a..4ad6e2bd794380886040beb4a49483faeb04ccaa 100755
--- 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 @@ }
let [configFile] = await Workspace.findFiles(
new RelativePattern(folder, `**/${CONFIG_GLOB}`),
- `{${getExcludePatterns(folder).join(',')}}`,
+ `{${getExcludePatterns(folder)
+ .flatMap((pattern) => braces.expand(pattern))
+ .join(',')}}`,
1
)