From 2bd25864844c158d3b55d1f21b18a8fe7f6d0abd Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Wed, 26 Feb 2025 12:11:12 -0500 Subject: [PATCH 1/3] Add tests --- .../src/language/rewriting.test.ts | 16 ++++++++++++---- .../tests/css/css-server.test.ts | 3 ++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/packages/tailwindcss-language-server/src/language/rewriting.test.ts b/packages/tailwindcss-language-server/src/language/rewriting.test.ts index 33596a2e..d3874418 100644 --- a/packages/tailwindcss-language-server/src/language/rewriting.test.ts +++ b/packages/tailwindcss-language-server/src/language/rewriting.test.ts @@ -69,20 +69,28 @@ test('@theme', () => { let input = [ // '@theme {', - ' color: red;', + ' --color: red;', + ' --font-*: initial;', + ' --font-weight-*: initial;', '}', '@theme inline reference static default {', - ' color: red;', + ' --color: red;', + ' --font-*: initial;', + ' --font-weight-*: initial;', '}', ] let output = [ // '.placeholder {', // wrong - ' color: red;', + ' --color: red;', + ' --font-_: initial;', + ' --font-weight-_: initial;', '}', '.placeholder {', // wrong - ' color: red;', + ' --color: red;', + ' --font-_: initial;', + ' --font-weight-_: initial;', '}', ] diff --git a/packages/tailwindcss-language-server/tests/css/css-server.test.ts b/packages/tailwindcss-language-server/tests/css/css-server.test.ts index 02146ccc..1ee3246b 100644 --- a/packages/tailwindcss-language-server/tests/css/css-server.test.ts +++ b/packages/tailwindcss-language-server/tests/css/css-server.test.ts @@ -219,6 +219,7 @@ defineTest({ @theme { --color-primary: #333; --leading-*: initial; + --font-weight-*: initial; } `, }) @@ -235,7 +236,7 @@ defineTest({ uri: '{workspace:default}/file-1.css', range: { start: { line: 1, character: 0 }, - end: { line: 4, character: 1 }, + end: { line: 5, character: 1 }, }, }, }, From 3fdc058c3f48a8bc6e73f97136cf9900cfee1c98 Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Wed, 26 Feb 2025 12:11:16 -0500 Subject: [PATCH 2/3] fix error --- packages/tailwindcss-language-server/src/language/rewriting.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tailwindcss-language-server/src/language/rewriting.ts b/packages/tailwindcss-language-server/src/language/rewriting.ts index 4dc7a429..4a983ad1 100644 --- a/packages/tailwindcss-language-server/src/language/rewriting.ts +++ b/packages/tailwindcss-language-server/src/language/rewriting.ts @@ -74,7 +74,7 @@ export function rewriteCss(css: string) { }) // Replace `--some-var-*` with `--some-var-_` - css = css.replace(/--([a-zA-Z0-9]+)-[*]/g, '--$1_') + css = css.replace(/--([a-zA-Z0-9-]+)-[*]/g, '--$1-_') return css } From 3cd1aca56cc42efad638ccf14c31687d6a3d342d Mon Sep 17 00:00:00 2001 From: Jordan Pittman Date: Wed, 26 Feb 2025 12:19:39 -0500 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 9889da1e..4ae7a5d1 100644 --- a/packages/vscode-tailwindcss/CHANGELOG.md +++ b/packages/vscode-tailwindcss/CHANGELOG.md @@ -2,7 +2,7 @@ ## Prerelease -- Nothing yet! +- Fix syntax error when resetting multi-word theme key namespaces ([#1237](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1237)) # 0.14.7