Skip to content

Commit 4a57482

Browse files
thecrypticacethecrypticace
committed
Fix highlighting of @theme params
1 parent adb5d75 commit 4a57482

File tree

2 files changed

+75
-20
lines changed

2 files changed

+75
-20
lines changed

‎packages/tailwindcss-language-syntax/tests/syntax.test.ts

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,65 +28,72 @@ test('@theme', async ({ expect }) => {
2828
^^^^^^^^ 4: source.css.tailwind
2929
^^^^^^ 2: keyword.control.at-rule.theme.tailwind
3030
^ 1: punctuation.definition.keyword.css
31-
^ 1: meta.property-list.css punctuation.section.property-list.begin.bracket.curly.css
31+
^ 1: variable.other.css
32+
^ 1: meta.at-rule.theme.body.tailwind punctuation.section.theme.begin.bracket.curly.tailwind
3233
3334
--color: red;
34-
^^^^^^^^^^^^^^^ 6: source.css.tailwind meta.property-list.css
35-
^^^^^^^ 1: variable.css
35+
^^^^^^^^^^^^^^^ 6: source.css.tailwind meta.at-rule.theme.body.tailwind
36+
^^^^^^^ 1: meta.property-name.css
3637
^ 1: punctuation.separator.key-value.css
3738
^^^ 1: meta.property-value.css support.constant.color.w3c-standard-color-name.css
3839
^ 1: punctuation.terminator.rule.css
3940
4041
}
41-
^ 1: source.css.tailwind meta.property-list.css punctuation.section.property-list.end.bracket.curly.css
42+
^ 1: source.css.tailwind meta.at-rule.theme.body.tailwind punctuation.section.theme.end.bracket.curly.tailwind
4243
4344
@theme static {
44-
^^^^^^^^^^^^^^^ 4: source.css.tailwind
45+
^^^^^^^^^^^^^^^ 6: source.css.tailwind
4546
^^^^^^ 2: keyword.control.at-rule.theme.tailwind
4647
^ 1: punctuation.definition.keyword.css
47-
^ 1: meta.property-list.css punctuation.section.property-list.begin.bracket.curly.css
48+
^^^^^^^^ 3: variable.other.css
49+
^ 1: meta.at-rule.theme.body.tailwind punctuation.section.theme.begin.bracket.curly.tailwind
4850
4951
--color: red;
50-
^^^^^^^^^^^^^^^ 6: source.css.tailwind meta.property-list.css
51-
^^^^^^^ 1: variable.css
52+
^^^^^^^^^^^^^^^ 6: source.css.tailwind meta.at-rule.theme.body.tailwind
53+
^^^^^^^ 1: meta.property-name.css
5254
^ 1: punctuation.separator.key-value.css
5355
^^^ 1: meta.property-value.css support.constant.color.w3c-standard-color-name.css
5456
^ 1: punctuation.terminator.rule.css
5557
5658
}
57-
^ 1: source.css.tailwind meta.property-list.css punctuation.section.property-list.end.bracket.curly.css
59+
^ 1: source.css.tailwind meta.at-rule.theme.body.tailwind punctuation.section.theme.end.bracket.curly.tailwind
5860
5961
@theme inline deprecated {
60-
^^^^^^^^^^^^^^^^^^^^^^^^^^ 4: source.css.tailwind
62+
^^^^^^^^^^^^^^^^^^^^^^^^^^ 8: source.css.tailwind
6163
^^^^^^ 2: keyword.control.at-rule.theme.tailwind
6264
^ 1: punctuation.definition.keyword.css
63-
^ 1: meta.property-list.css punctuation.section.property-list.begin.bracket.curly.css
65+
^^^^^^^^^^^^^^^^^^^ 5: variable.other.css
66+
^ 1: meta.at-rule.theme.body.tailwind punctuation.section.theme.begin.bracket.curly.tailwind
6467
6568
--color: red;
66-
^^^^^^^^^^^^^^^ 6: source.css.tailwind meta.property-list.css
67-
^^^^^^^ 1: variable.css
69+
^^^^^^^^^^^^^^^ 6: source.css.tailwind meta.at-rule.theme.body.tailwind
70+
^^^^^^^ 1: meta.property-name.css
6871
^ 1: punctuation.separator.key-value.css
6972
^^^ 1: meta.property-value.css support.constant.color.w3c-standard-color-name.css
7073
^ 1: punctuation.terminator.rule.css
7174
7275
}
73-
^ 1: source.css.tailwind meta.property-list.css punctuation.section.property-list.end.bracket.curly.css
76+
^ 1: source.css.tailwind meta.at-rule.theme.body.tailwind punctuation.section.theme.end.bracket.curly.tailwind
7477
7578
@theme prefix(tw) inline {
76-
^^^^^^^^^^^^^^^^^^^^^^^^^^ 4: source.css.tailwind
79+
^^^^^^^^^^^^^^^^^^^^^^^^^^ 11: source.css.tailwind
7780
^^^^^^ 2: keyword.control.at-rule.theme.tailwind
7881
^ 1: punctuation.definition.keyword.css
79-
^ 1: meta.property-list.css punctuation.section.property-list.begin.bracket.curly.css
82+
^^^^^^ 1: support.function.prefix.css
83+
^ 1: punctuation.section.function.begin.bracket.round.css
84+
^^ ^^^^^^^^ 4: variable.other.css
85+
^ 1: punctuation.section.function.end.bracket.round.css
86+
^ 1: meta.at-rule.theme.body.tailwind punctuation.section.theme.begin.bracket.curly.tailwind
8087
8188
--color: red;
82-
^^^^^^^^^^^^^^^ 6: source.css.tailwind meta.property-list.css
83-
^^^^^^^ 1: variable.css
89+
^^^^^^^^^^^^^^^ 6: source.css.tailwind meta.at-rule.theme.body.tailwind
90+
^^^^^^^ 1: meta.property-name.css
8491
^ 1: punctuation.separator.key-value.css
8592
^^^ 1: meta.property-value.css support.constant.color.w3c-standard-color-name.css
8693
^ 1: punctuation.terminator.rule.css
8794
8895
}
89-
^ 1: source.css.tailwind meta.property-list.css punctuation.section.property-list.end.bracket.curly.css
96+
^ 1: source.css.tailwind meta.at-rule.theme.body.tailwind punctuation.section.theme.end.bracket.curly.tailwind
9097
"
9198
`)
9299
})

‎packages/vscode-tailwindcss/syntaxes/at-rules.tmLanguage.json

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,55 @@
190190
"end": "(?<=}|;)(?!\\G)",
191191
"patterns": [
192192
{
193-
"include": "source.css#rule-list"
193+
"include": "#prefix-meta-fn"
194+
},
195+
{
196+
"match": "\\s+",
197+
"name": "variable.other.css"
198+
},
199+
{
200+
"match": "reference",
201+
"name": "variable.other.css"
202+
},
203+
{
204+
"match": "inline",
205+
"name": "variable.other.css"
206+
},
207+
{
208+
"match": "static",
209+
"name": "variable.other.css"
210+
},
211+
{
212+
"match": "default",
213+
"name": "variable.other.css"
214+
},
215+
{
216+
"match": "deprecated",
217+
"name": "variable.other.css"
218+
},
219+
{
220+
"match": "[^{\\s]+",
221+
"name": "invalid.illegal.invalid-theme.css"
222+
},
223+
{
224+
"begin": "{",
225+
"beginCaptures": {
226+
"0": {
227+
"name": "punctuation.section.theme.begin.bracket.curly.tailwind"
228+
}
229+
},
230+
"end": "}",
231+
"endCaptures": {
232+
"0": {
233+
"name": "punctuation.section.theme.end.bracket.curly.tailwind"
234+
}
235+
},
236+
"name": "meta.at-rule.theme.body.tailwind",
237+
"patterns": [
238+
{
239+
"include": "#property-list"
240+
}
241+
]
194242
}
195243
]
196244
},

0 commit comments

Comments
 (0)