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

Improve extraction for variable colors (#638)

master
Brad Cornes 2022-10-20 12:59:28 +01:00 committed by GitHub
parent 6c47780242
commit 733d872d8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/tailwindcss-language-service/src/util/color.ts
View File

@ -42,16 +42,22 @@ function getKeywordColor(value: unknown): KeywordColor | null {
// https://github.com/khalilgharbaoui/coloregex // https://github.com/khalilgharbaoui/coloregex
const colorRegex = new RegExp( const colorRegex = new RegExp(
`(?:^|\\s|\\(|,)(#(?:[0-9a-f]{2}){2,4}|(#[0-9a-f]{3})|(rgb|hsl)a?\\((-?[\\d.]+%?(\\s*[,/]\\s*|\\s+)+){2,3}\\s*([\\d.]+%?|var\\([^)]+\\))?\\)|transparent|currentColor|${Object.keys( `(?:^|\\s|\\(|,)(#(?:[0-9a-f]{2}){2,4}|(#[0-9a-f]{3})|(rgb|hsl)a?\\(\\s*(-?[\\d.]+%?(\\s*[,/]\\s*|\\s+)+){2,3}\\s*([\\d.]+%?|var\\([^)]+\\))?\\)|transparent|currentColor|${Object.keys(
namedColors namedColors
).join('|')})(?:$|\\s|\\)|,)`, ).join('|')})(?:$|\\s|\\)|,)`,
'gi' 'gi'
) )
function replaceColorVarsWithTheirDefaults(str: string): string {
// rgb(var(--primary, 66 66 66))
// -> rgb(66 66 66)
return str.replace(/((?:rgb|hsl)a?\(\s*)var\([^,]+,\s*([^)]+)\)/gi, '$1$2')
}
function getColorsInString(str: string): (culori.Color | KeywordColor)[] { function getColorsInString(str: string): (culori.Color | KeywordColor)[] {
if (/(?:box|drop)-shadow/.test(str)) return [] if (/(?:box|drop)-shadow/.test(str)) return []
return Array.from(str.matchAll(colorRegex), (match) => { return Array.from(replaceColorVarsWithTheirDefaults(str).matchAll(colorRegex), (match) => {
let color = match[1].replace(/var\([^)]+\)/, '1') let color = match[1].replace(/var\([^)]+\)/, '1')
return getKeywordColor(color) ?? culori.parse(color) return getKeywordColor(color) ?? culori.parse(color)
}).filter(Boolean) }).filter(Boolean)