From 8d2df54c5497749235877c00cac099c699e3d31a Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Mon, 19 May 2025 12:52:17 -0400 Subject: [PATCH 1/3] Refactor --- .../tailwindcss-language-service/src/util/color.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/tailwindcss-language-service/src/util/color.ts b/packages/tailwindcss-language-service/src/util/color.ts index 5eb8ec53..9faa949c 100644 --- a/packages/tailwindcss-language-service/src/util/color.ts +++ b/packages/tailwindcss-language-service/src/util/color.ts @@ -79,11 +79,12 @@ function getColorFromDecls( ): culori.Color | KeywordColor | null { let props = Object.keys(decls).filter((prop) => { // ignore content: ""; - if ( - prop === 'content' && - (decls[prop] === '""' || decls[prop] === "''" || decls[prop] === 'var(--tw-content)') - ) { - return false + if (prop === 'content') { + let value = decls[prop] + + if (value === '""' || value === "''" || value === 'var(--tw-content)') { + return false + } } // ignore mask-image & mask-composite From f6f0e68753e13020c96b470268291bb3c2d09e27 Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Mon, 19 May 2025 12:52:49 -0400 Subject: [PATCH 2/3] Display color swatches when using `before`/`after` variants --- packages/tailwindcss-language-service/src/util/color.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/tailwindcss-language-service/src/util/color.ts b/packages/tailwindcss-language-service/src/util/color.ts index 9faa949c..514fc286 100644 --- a/packages/tailwindcss-language-service/src/util/color.ts +++ b/packages/tailwindcss-language-service/src/util/color.ts @@ -82,6 +82,10 @@ function getColorFromDecls( if (prop === 'content') { let value = decls[prop] + if (Array.isArray(value) && value.length === 1) { + value = value[0] + } + if (value === '""' || value === "''" || value === 'var(--tw-content)') { return false } From 33902e87c41a7f5e8f89697b0d159eeeec330d30 Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Mon, 19 May 2025 12:54:49 -0400 Subject: [PATCH 3/3] Update changelog --- packages/vscode-tailwindcss/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vscode-tailwindcss/CHANGELOG.md b/packages/vscode-tailwindcss/CHANGELOG.md index d11b9911..878b52f3 100644 --- a/packages/vscode-tailwindcss/CHANGELOG.md +++ b/packages/vscode-tailwindcss/CHANGELOG.md @@ -2,7 +2,7 @@ ## Prerelease -- Nothing yet! +- Display color swatches when using `before`/`after` variants ([#1374](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1374)) # 0.14.17