Skip to content

Fix syntax error when resetting multi-word theme key namespaces #1237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thecrypticace merged 4 commits into from
Feb 26, 2025
Merged

Fix syntax error when resetting multi-word theme key namespaces #1237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2bd2586
Add tests
thecrypticace Feb 26, 2025
3fdc058
fix error
thecrypticace Feb 26, 2025
3cd1aca
Update changelog
thecrypticace Feb 26, 2025
b03eb81
Merge branch 'main' into fix/theme-key-namespace-reset
thecrypticace Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions packages/tailwindcss-language-server/src/language/rewriting.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;',
'}',
]

Expand Down
2 changes: 1 addition & 1 deletion packages/tailwindcss-language-server/src/language/rewriting.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-_')
Copy link
Member

@philipp-spiess philipp-spiess Feb 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hehe

Copy link
Contributor Author

@thecrypticace thecrypticace Feb 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

right?! lol


return css
}
3 changes: 2 additions & 1 deletion packages/tailwindcss-language-server/tests/css/css-server.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ defineTest({
@theme {
--color-primary: #333;
--leading-*: initial;
--font-weight-*: initial;
}
`,
})
Expand All @@ -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 },
},
},
},
Expand Down
1 change: 1 addition & 0 deletions packages/vscode-tailwindcss/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## Prerelease

- Don't throw when requiring() packages that resolve to a path containing a `#` character ([#1235](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1235))
- Fix syntax error when resetting multi-word theme key namespaces ([#1237](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1237))

# 0.14.7

Expand Down