Skip to content

Commit 02a50ba

Browse files
thecrypticacethecrypticace
committed
Consume layer/utility/variant names as one token
1 parent 76dfb02 commit 02a50ba

File tree

2 files changed

+38
-38
lines changed

2 files changed

+38
-38
lines changed

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

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -413,18 +413,18 @@ exports[`@import 1`] = `
413413
exports[`@layer 1`] = `
414414
"
415415
@layer theme, base, components, utilities;
416-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 38: source.css.tailwind
416+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 14: source.css.tailwind
417417
^^^^^^ 2: keyword.control.at-rule.layer.tailwind
418418
^ 1: punctuation.definition.keyword.css
419-
^^^^^ ^^^^ ^^^^^^^^^^ ^^^^^^^^^ 28: variable.parameter.layer.tailwind
419+
^^^^^ ^^^^ ^^^^^^^^^^ ^^^^^^^^^ 4: variable.parameter.layer.tailwind
420420
^ ^ ^ 3: punctuation.separator.list.comma.css
421421
^ 1: punctuation.terminator.rule.css
422422
423423
@layer utilities {
424-
^^^^^^^^^^^^^^^^^^ 14: source.css.tailwind
424+
^^^^^^^^^^^^^^^^^^ 6: source.css.tailwind
425425
^^^^^^ 2: keyword.control.at-rule.layer.tailwind
426426
^ 1: punctuation.definition.keyword.css
427-
^^^^^^^^^ 9: variable.parameter.layer.tailwind
427+
^^^^^^^^^ 1: variable.parameter.layer.tailwind
428428
^ 1: meta.at-rule.layer.body.tailwind punctuation.section.layer.begin.bracket.curly.tailwind
429429
430430
.custom {
@@ -627,42 +627,42 @@ exports[`@source 1`] = `
627627
exports[`@tailwind 1`] = `
628628
"
629629
@tailwind base;
630-
^^^^^^^^^^^^^^^ 8: source.css.tailwind meta.at-rule.tailwind.css
630+
^^^^^^^^^^^^^^^ 5: source.css.tailwind meta.at-rule.tailwind.css
631631
^^^^^^^^^ 2: keyword.control.at-rule.tailwind.tailwind
632632
^ 1: punctuation.definition.keyword.css
633-
^^^^ 4: variable.parameter.tailwind.tailwind
633+
^^^^ 1: variable.parameter.tailwind.tailwind
634634
^ 1: punctuation.terminator.tailwind.tailwind
635635
636636
@tailwind components;
637-
^^^^^^^^^^^^^^^^^^^^^ 14: source.css.tailwind meta.at-rule.tailwind.css
637+
^^^^^^^^^^^^^^^^^^^^^ 5: source.css.tailwind meta.at-rule.tailwind.css
638638
^^^^^^^^^ 2: keyword.control.at-rule.tailwind.tailwind
639639
^ 1: punctuation.definition.keyword.css
640-
^^^^^^^^^^ 10: variable.parameter.tailwind.tailwind
640+
^^^^^^^^^^ 1: variable.parameter.tailwind.tailwind
641641
^ 1: punctuation.terminator.tailwind.tailwind
642642
643643
@tailwind utilities;
644-
^^^^^^^^^^^^^^^^^^^^ 13: source.css.tailwind meta.at-rule.tailwind.css
644+
^^^^^^^^^^^^^^^^^^^^ 5: source.css.tailwind meta.at-rule.tailwind.css
645645
^^^^^^^^^ 2: keyword.control.at-rule.tailwind.tailwind
646646
^ 1: punctuation.definition.keyword.css
647-
^^^^^^^^^ 9: variable.parameter.tailwind.tailwind
647+
^^^^^^^^^ 1: variable.parameter.tailwind.tailwind
648648
^ 1: punctuation.terminator.tailwind.tailwind
649649
650650
@tailwind utilities source(none);
651-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 18: source.css.tailwind meta.at-rule.tailwind.css
651+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 10: source.css.tailwind meta.at-rule.tailwind.css
652652
^^^^^^^^^ 2: keyword.control.at-rule.tailwind.tailwind
653653
^ 1: punctuation.definition.keyword.css
654-
^^^^^^^^^ 9: variable.parameter.tailwind.tailwind
654+
^^^^^^^^^ 1: variable.parameter.tailwind.tailwind
655655
^^^^^^ 1: support.function.source.css
656656
^ 1: punctuation.section.function.begin.bracket.round.css
657657
^^^^ 1: support.constant.none.css
658658
^ 1: punctuation.section.function.end.bracket.round.css
659659
^ 1: punctuation.terminator.tailwind.tailwind
660660
661661
@tailwind utilities source("./**/*");
662-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 20: source.css.tailwind meta.at-rule.tailwind.css
662+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 12: source.css.tailwind meta.at-rule.tailwind.css
663663
^^^^^^^^^ 2: keyword.control.at-rule.tailwind.tailwind
664664
^ 1: punctuation.definition.keyword.css
665-
^^^^^^^^^ 9: variable.parameter.tailwind.tailwind
665+
^^^^^^^^^ 1: variable.parameter.tailwind.tailwind
666666
^^^^^^ 1: support.function.source.css
667667
^ 1: punctuation.section.function.begin.bracket.round.css
668668
^^^^^^^^ 3: string.quoted.double.css
@@ -672,24 +672,24 @@ exports[`@tailwind 1`] = `
672672
^ 1: punctuation.terminator.tailwind.tailwind
673673
674674
@tailwind screens;
675-
^^^^^^^^^^^^^^^^^^ 11: source.css.tailwind meta.at-rule.tailwind.css
675+
^^^^^^^^^^^^^^^^^^ 5: source.css.tailwind meta.at-rule.tailwind.css
676676
^^^^^^^^^ 2: keyword.control.at-rule.tailwind.tailwind
677677
^ 1: punctuation.definition.keyword.css
678-
^^^^^^^ 7: variable.parameter.tailwind.tailwind
678+
^^^^^^^ 1: variable.parameter.tailwind.tailwind
679679
^ 1: punctuation.terminator.tailwind.tailwind
680680
681681
@tailwind variants;
682-
^^^^^^^^^^^^^^^^^^^ 12: source.css.tailwind meta.at-rule.tailwind.css
682+
^^^^^^^^^^^^^^^^^^^ 5: source.css.tailwind meta.at-rule.tailwind.css
683683
^^^^^^^^^ 2: keyword.control.at-rule.tailwind.tailwind
684684
^ 1: punctuation.definition.keyword.css
685-
^^^^^^^^ 8: variable.parameter.tailwind.tailwind
685+
^^^^^^^^ 1: variable.parameter.tailwind.tailwind
686686
^ 1: punctuation.terminator.tailwind.tailwind
687687
688688
@tailwind unknown;
689-
^^^^^^^^^^^^^^^^^^ 11: source.css.tailwind meta.at-rule.tailwind.css
689+
^^^^^^^^^^^^^^^^^^ 5: source.css.tailwind meta.at-rule.tailwind.css
690690
^^^^^^^^^ 2: keyword.control.at-rule.tailwind.tailwind
691691
^ 1: punctuation.definition.keyword.css
692-
^^^^^^^ 7: variable.parameter.tailwind.tailwind
692+
^^^^^^^ 1: variable.parameter.tailwind.tailwind
693693
^ 1: punctuation.terminator.tailwind.tailwind
694694
"
695695
`;
@@ -851,10 +851,10 @@ exports[`@theme 1`] = `
851851
exports[`@utility 1`] = `
852852
"
853853
@utility custom {
854-
^^^^^^^^^^^^^^^^^ 11: source.css.tailwind
854+
^^^^^^^^^^^^^^^^^ 6: source.css.tailwind
855855
^^^^^^^^ 2: keyword.control.at-rule.utility.tailwind
856856
^ 1: punctuation.definition.keyword.css
857-
^^^^^^ 6: variable.parameter.utility.tailwind
857+
^^^^^^ 1: variable.parameter.utility.tailwind
858858
^ 1: meta.at-rule.utility.body.tailwind punctuation.section.utility.begin.bracket.curly.tailwind
859859
860860
width: 12px;
@@ -867,10 +867,10 @@ exports[`@utility 1`] = `
867867
^ 1: source.css.tailwind
868868
869869
@utility functional-* {
870-
^^^^^^^^^^^^^^^^^^^^^^^ 17: source.css.tailwind
870+
^^^^^^^^^^^^^^^^^^^^^^^ 6: source.css.tailwind
871871
^^^^^^^^ 2: keyword.control.at-rule.utility.tailwind
872872
^ 1: punctuation.definition.keyword.css
873-
^^^^^^^^^^^^ 12: variable.parameter.utility.tailwind
873+
^^^^^^^^^^^^ 1: variable.parameter.utility.tailwind
874874
^ 1: meta.at-rule.utility.body.tailwind punctuation.section.utility.begin.bracket.curly.tailwind
875875
876876
width: calc(--value(number) * 1px);
@@ -884,10 +884,10 @@ exports[`@utility 1`] = `
884884
exports[`@variant 1`] = `
885885
"
886886
@variant dark {
887-
^^^^^^^^^^^^^^^ 9: source.css.tailwind
887+
^^^^^^^^^^^^^^^ 6: source.css.tailwind
888888
^^^^^^^^ 2: keyword.control.at-rule.variant.tailwind
889889
^ 1: punctuation.definition.keyword.css
890-
^^^^ 4: variable.parameter.variant.tailwind
890+
^^^^ 1: variable.parameter.variant.tailwind
891891
^ 1: meta.at-rule.variant.body.tailwind punctuation.section.variant.begin.bracket.curly.tailwind
892892
893893
.foo {
@@ -920,10 +920,10 @@ exports[`@variant 1`] = `
920920
^ 1: meta.property-list.css punctuation.section.property-list.begin.bracket.curly.css
921921
922922
@variant dark {
923-
^^^^^^^^^^^^^^^^^ 10: source.css.tailwind meta.property-list.css
923+
^^^^^^^^^^^^^^^^^ 7: source.css.tailwind meta.property-list.css
924924
^^^^^^^^ 2: keyword.control.at-rule.variant.tailwind
925925
^ 1: punctuation.definition.keyword.css
926-
^^^^ 4: variable.parameter.variant.tailwind
926+
^^^^ 1: variable.parameter.variant.tailwind
927927
^ 1: meta.at-rule.variant.body.tailwind punctuation.section.variant.begin.bracket.curly.tailwind
928928
929929
color: white;
@@ -971,10 +971,10 @@ exports[`legacy: @responsive 1`] = `
971971
exports[`legacy: @screen 1`] = `
972972
"
973973
@screen sm {
974-
^^^^^^^^^^^^ 7: source.css.tailwind
974+
^^^^^^^^^^^^ 6: source.css.tailwind
975975
^^^^^^^ 2: keyword.control.at-rule.screen.tailwind
976976
^ 1: punctuation.definition.keyword.css
977-
^^ 2: variable.parameter.screen.tailwind
977+
^^ 1: variable.parameter.screen.tailwind
978978
^ 1: meta.at-rule.screen.body.tailwind punctuation.section.screen.begin.bracket.curly.tailwind
979979
980980
.foo {
@@ -1002,10 +1002,10 @@ exports[`legacy: @screen 1`] = `
10021002
exports[`legacy: @variants 1`] = `
10031003
"
10041004
@variants hover, focus {
1005-
^^^^^^^^^^^^^^^^^^^^^^^^ 17: source.css.tailwind
1005+
^^^^^^^^^^^^^^^^^^^^^^^^ 9: source.css.tailwind
10061006
^^^^^^^^^ 2: keyword.control.at-rule.variants.tailwind
10071007
^ 1: punctuation.definition.keyword.css
1008-
^^^^^ ^^^^^ 10: variable.parameter.variants.tailwind
1008+
^^^^^ ^^^^^ 2: variable.parameter.variants.tailwind
10091009
^ 1: punctuation.separator.list.comma.css
10101010
^ 1: meta.at-rule.variants.body.tailwind punctuation.section.variants.begin.bracket.curly.tailwind
10111011

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"include": "#source-fn"
8383
},
8484
{
85-
"match": "[^\\s;]+?",
85+
"match": "[^\\s;]+",
8686
"name": "variable.parameter.tailwind.tailwind"
8787
}
8888
]
@@ -103,7 +103,7 @@
103103
"include": "source.css#comment-block"
104104
},
105105
{
106-
"match": "[^\\s{]+?",
106+
"match": "[^\\s{]+",
107107
"name": "variable.parameter.screen.tailwind"
108108
},
109109
{
@@ -144,7 +144,7 @@
144144
"include": "source.css#comment-block"
145145
},
146146
{
147-
"match": "[^\\s{;,]+?",
147+
"match": "[^\\s{;,]+",
148148
"name": "variable.parameter.layer.tailwind"
149149
},
150150
{
@@ -351,7 +351,7 @@
351351
"include": "source.css#commas"
352352
},
353353
{
354-
"match": "[^\\s{,]+?",
354+
"match": "[^\\s{,]+",
355355
"name": "variable.parameter.variants.tailwind"
356356
},
357357
{
@@ -389,7 +389,7 @@
389389
"end": "(?<=})(?!\\G)",
390390
"patterns": [
391391
{
392-
"match": "[^\\s{,]+?",
392+
"match": "[^\\s{,]+",
393393
"name": "variable.parameter.utility.tailwind"
394394
},
395395
{
@@ -427,7 +427,7 @@
427427
"end": "(?<=[};])(?!\\G)",
428428
"patterns": [
429429
{
430-
"match": "[^\\s({;,]+?",
430+
"match": "[^\\s({;,]+",
431431
"name": "variable.parameter.variant.tailwind"
432432
},
433433
{

0 commit comments

Comments
 (0)