Skip to content

Fix odd v4 behavior with custom @-rules #1212

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
merged 9 commits into from
Feb 17, 2025
Merged

Fix odd v4 behavior with custom @-rules #1212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
554cb09
Remove redundant matcher for custom-variant at-rule
tizu69 Feb 16, 2025
8f31445
Fix --value([*]) throwing error
tizu69 Feb 16, 2025
13fe7e9
QOL: Add autocomplete for [*] utility helper
tizu69 Feb 16, 2025
33f22df
wip
thecrypticace Feb 17, 2025
f6e6bab
Fix symbol lookup
thecrypticace Feb 17, 2025
c17219c
Revert "Fix --value([*]) throwing error"
thecrypticace Feb 17, 2025
baae207
Revert "QOL: Add autocomplete for [*] utility helper"
thecrypticace Feb 17, 2025
e1a7ebc
Update changelog
thecrypticace Feb 17, 2025
111c849
Update changelog
thecrypticace Feb 17, 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
17 changes: 12 additions & 5 deletions packages/tailwindcss-language-server/src/language/cssServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,9 +215,16 @@ connection.onDocumentSymbol(({ textDocument }) =>
if (symbol.name === `@media (${MEDIA_MARKER})`) {
let doc = documents.get(symbol.location.uri)
let text = doc.getText(symbol.location.range)
let match = text.trim().match(/^(@[^\s]+)([^{]+){/)
let match = text.trim().match(/^(@[^\s]+)(?:([^{]+)[{]|([^;{]+);)/)
if (match) {
symbol.name = `${match[1]} ${match[2].trim()}`
symbol.name = `${match[1]} ${match[2]?.trim() ?? match[3]?.trim()}`
}
} else if (symbol.name === `.placeholder`) {
let doc = documents.get(symbol.location.uri)
let text = doc.getText(symbol.location.range)
let match = text.trim().match(/^(@[^\s]+)(?:([^{]+)[{]|([^;{]+);)/)
if (match) {
symbol.name = `${match[1]} ${match[2]?.trim() ?? match[3]?.trim()}`
}
}
return symbol
Expand Down Expand Up @@ -337,7 +344,7 @@ function replace(delta = 0) {
function replaceWithStyleRule(delta = 0) {
return (_match: string, p1: string) => {
let spaces = ' '.repeat(p1.length + delta)
return `.foo${spaces}{`
return `.placeholder${spaces}{`
}
}

Expand All @@ -354,9 +361,9 @@ function createVirtualCssDocument(textDocument: TextDocument): TextDocument {
.replace(/@variants(\s+[^{]+){/g, replace())
.replace(/@responsive(\s*){/g, replace())
.replace(/@utility(\s+[^{]+){/g, replaceWithStyleRule())
.replace(/@custom-variant(\s+[^;]+);/g, (match: string) => {
.replace(/@custom-variant(\s+[^;{]+);/g, (match: string) => {
let spaces = ' '.repeat(match.length - 11)
return `@media(p)${spaces}{}`
return `@media (${MEDIA_MARKER})${spaces}{}`
})
.replace(/@custom-variant(\s+[^{]+){/g, replaceWithStyleRule())
.replace(/@variant(\s+[^{]+){/g, replaceWithStyleRule())
Expand Down
2 changes: 2 additions & 0 deletions packages/vscode-tailwindcss/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
- Show source diagnostics when imports contain a layer ([#1204](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1204))
- Only detect project roots in v4 when using certain CSS features ([#1205](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1205))
- Update Tailwind CSS v4 version to v4.0.6 ([#1207](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1207))
- Fix parsing of `@custom-variant` block syntax containg declarations and/or `@slot` ([#1212](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1212))
- Fix display of custom at-rules in symbol listing ([#1212](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1212))

## 0.14.4

Expand Down