Skip to content

Fix highlighting when theme namespaces are used inside --value() and --modifier() #1420

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 4 commits into from
Jul 3, 2025
+112 −1
Merged

Fix highlighting when theme namespaces are used inside --value() and --modifier() #1420

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
bfd115c
Add failing test
thecrypticace Jul 2, 2025
93b294f
Terminate variables inside utility helpers
thecrypticace Jul 2, 2025
96edcd2
Add more tests
thecrypticace Jul 2, 2025
a2991c8
Drop test
thecrypticace Jul 2, 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
96 changes: 96 additions & 0 deletions packages/tailwindcss-language-syntax/tests/__snapshots__/syntax.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1007,6 +1007,102 @@ exports[`@utility 1`] = `

}
^ 1: source.css.tailwind meta.at-rule.utility.body.tailwind punctuation.section.utility.end.bracket.curly.tailwind


^ 1: source.css.tailwind

@utility tab-* {
^^^^^^^^^^^^^^^^ 6: source.css.tailwind
^^^^^^^^ 2: keyword.control.at-rule.utility.tailwind
^ 1: punctuation.definition.keyword.css
^^^^^ 1: variable.parameter.utility.tailwind
^ 1: meta.at-rule.utility.body.tailwind punctuation.section.utility.begin.bracket.curly.tailwind

tab-size: --value(--);
^^^^^^^^^^^^^^^^^^^^^^^^ 9: source.css.tailwind meta.at-rule.utility.body.tailwind
^^^^^^^^ 1: meta.property-name.css support.type.property-name.css
^ 1: punctuation.separator.key-value.css
^^^^^^^^^^^ 4: meta.property-value.css
^^^^^^^ 1: support.function.value.tailwind
^ 1: punctuation.section.function.begin.bracket.round.css
^^ 1: variable.parameter.value.tailwind
^ 1: punctuation.section.function.end.bracket.round.css
^ 1: punctuation.terminator.rule.css

font-size: 12px;
^^^^^^^^^^^^^^^^^^ 7: source.css.tailwind meta.at-rule.utility.body.tailwind
^^^^^^^^^ 1: meta.property-name.css support.type.property-name.css
^ 1: punctuation.separator.key-value.css
^^^^ 2: meta.property-value.css constant.numeric.css
^^ 1: keyword.other.unit.px.css
^ 1: punctuation.terminator.rule.css

}
^ 1: source.css.tailwind meta.at-rule.utility.body.tailwind punctuation.section.utility.end.bracket.curly.tailwind


^ 1: source.css.tailwind

@utility tab-* {
^^^^^^^^^^^^^^^^ 6: source.css.tailwind
^^^^^^^^ 2: keyword.control.at-rule.utility.tailwind
^ 1: punctuation.definition.keyword.css
^^^^^ 1: variable.parameter.utility.tailwind
^ 1: meta.at-rule.utility.body.tailwind punctuation.section.utility.begin.bracket.curly.tailwind

tab-size: --value(--tab-size);
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 9: source.css.tailwind meta.at-rule.utility.body.tailwind
^^^^^^^^ 1: meta.property-name.css support.type.property-name.css
^ 1: punctuation.separator.key-value.css
^^^^^^^^^^^^^^^^^^^ 4: meta.property-value.css
^^^^^^^ 1: support.function.value.tailwind
^ 1: punctuation.section.function.begin.bracket.round.css
^^^^^^^^^^ 1: variable.theme-namespace.css
^ 1: punctuation.section.function.end.bracket.round.css
^ 1: punctuation.terminator.rule.css

font-size: 12px;
^^^^^^^^^^^^^^^^^^ 7: source.css.tailwind meta.at-rule.utility.body.tailwind
^^^^^^^^^ 1: meta.property-name.css support.type.property-name.css
^ 1: punctuation.separator.key-value.css
^^^^ 2: meta.property-value.css constant.numeric.css
^^ 1: keyword.other.unit.px.css
^ 1: punctuation.terminator.rule.css

}
^ 1: source.css.tailwind meta.at-rule.utility.body.tailwind punctuation.section.utility.end.bracket.curly.tailwind


^ 1: source.css.tailwind

@utility tab-* {
^^^^^^^^^^^^^^^^ 6: source.css.tailwind
^^^^^^^^ 2: keyword.control.at-rule.utility.tailwind
^ 1: punctuation.definition.keyword.css
^^^^^ 1: variable.parameter.utility.tailwind
^ 1: meta.at-rule.utility.body.tailwind punctuation.section.utility.begin.bracket.curly.tailwind

tab-size: --value(--tab-size-*);
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 9: source.css.tailwind meta.at-rule.utility.body.tailwind
^^^^^^^^ 1: meta.property-name.css support.type.property-name.css
^ 1: punctuation.separator.key-value.css
^^^^^^^^^^^^^^^^^^^^^ 4: meta.property-value.css
^^^^^^^ 1: support.function.value.tailwind
^ 1: punctuation.section.function.begin.bracket.round.css
^^^^^^^^^^^^ 1: variable.theme-namespace.css
^ 1: punctuation.section.function.end.bracket.round.css
^ 1: punctuation.terminator.rule.css

font-size: 12px;
^^^^^^^^^^^^^^^^^^ 7: source.css.tailwind meta.at-rule.utility.body.tailwind
^^^^^^^^^ 1: meta.property-name.css support.type.property-name.css
^ 1: punctuation.separator.key-value.css
^^^^ 2: meta.property-value.css constant.numeric.css
^^ 1: keyword.other.unit.px.css
^ 1: punctuation.terminator.rule.css

}
^ 1: source.css.tailwind meta.at-rule.utility.body.tailwind punctuation.section.utility.end.bracket.curly.tailwind
"
`;

Expand Down
15 changes: 15 additions & 0 deletions packages/tailwindcss-language-syntax/tests/syntax.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,21 @@ test('@utility', async ({ expect }) => {
@utility functional-* {
width: calc(--value(number) * 1px);
}

@utility tab-* {
tab-size: --value(--);
font-size: 12px;
}

@utility tab-* {
tab-size: --value(--tab-size);
font-size: 12px;
}

@utility tab-* {
tab-size: --value(--tab-size-*);
font-size: 12px;
}
`)

expect(result.toString()).toMatchSnapshot()
Expand Down
2 changes: 1 addition & 1 deletion packages/vscode-tailwindcss/syntaxes/theme-fn.tmLanguage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
"name": "punctuation.separator.list.comma.css"
},
{
"match": "(--[^,\\s]+)",
"match": "(--[^,\\s)]+)",
"name": "variable.theme-namespace.css"
},
{ "include": "#utility-data-type-bare" },
Expand Down