From ba21a2f1d84f923200e1f21f0ef9759bba5aa48f Mon Sep 17 00:00:00 2001 From: Brad Cornes Date: Fri, 8 Oct 2021 18:24:57 +0100 Subject: [PATCH] fix color detection --- .../src/util/color.ts | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/packages/tailwindcss-language-service/src/util/color.ts b/packages/tailwindcss-language-service/src/util/color.ts index 4c4ca2b..ec4a4cb 100644 --- a/packages/tailwindcss-language-service/src/util/color.ts +++ b/packages/tailwindcss-language-service/src/util/color.ts @@ -51,18 +51,10 @@ const colorRegex = new RegExp( function getColorsInString(str: string): (culori.Color | KeywordColor)[] { if (/(?:box|drop)-shadow/.test(str)) return [] - return ( - str - .match(colorRegex) - ?.map((color) => - color - .trim() - .replace(/^[,(]|[,)]$/g, '') - .replace(/var\([^)]+\)/, '1') - ) - .map((color) => getKeywordColor(color) ?? culori.parse(color)) - .filter(Boolean) ?? [] - ) + return Array.from(str.matchAll(colorRegex), (match) => { + let color = match[1].replace(/var\([^)]+\)/, '1') + return getKeywordColor(color) ?? culori.parse(color) + }).filter(Boolean) } function getColorFromDecls(