Skip to content

Commit a8f369d

Browse files
deathaxedeathaxe
committed
Merge branch 'st4149'
2 parents 887869b + 3c410ee commit a8f369d

File tree

2 files changed

+145
-79
lines changed

2 files changed

+145
-79
lines changed

‎Tailwind CSS.sublime-syntax‎

Lines changed: 49 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,17 @@ contexts:
2222
- include: tailwind-at-screen
2323
- include: tailwind-at-source
2424
- include: tailwind-at-tailwind
25+
- include: tailwind-at-theme
2526
- include: tailwind-at-utility
2627
- include: tailwind-at-variants
2728

29+
###[ CSS PROPERTY IDENTIFIERS ]################################################
30+
31+
custom-property-content:
32+
- meta_prepend: true
33+
- match: \*
34+
scope: constant.other.wildcard.asterisk.css.tailwind
35+
2836
###[ TAILWIND INLINE AT RULES ]################################################
2937

3038
tailwind-at-apply:
@@ -45,32 +53,6 @@ contexts:
4553

4654
###[ TAILWIND TOPLEVEL AT RULES ]##############################################
4755

48-
tailwind-at-utility:
49-
- match: (@)utility{{break}}
50-
captures:
51-
0: keyword.control.directive.css.tailwind
52-
1: punctuation.definition.keyword.css.tailwind
53-
push:
54-
- tailwind-at-utility-meta
55-
- maybe-stylesheet-block
56-
- tailwind-at-utility-name
57-
58-
tailwind-at-utility-meta:
59-
- meta_include_prototype: false
60-
- meta_scope: meta.at-rule.utility.css.tailwind
61-
- include: immediately-pop
62-
63-
tailwind-at-utility-name:
64-
- meta_include_prototype: false
65-
- match: '{{ident_begin}}'
66-
set: tailwind-at-utility-name-content
67-
- include: comments
68-
- include: else-pop
69-
70-
tailwind-at-utility-name-content:
71-
- meta_scope: entity.other.utility-name.css.tailwind
72-
- include: identifier-content
73-
7456
# @config "./tailwind.config.js"
7557
tailwind-at-config:
7658
- match: (@)(?i:config){{break}}
@@ -92,7 +74,7 @@ contexts:
9274
1: punctuation.definition.keyword.css.tailwind
9375
push:
9476
- tailwind-at-plugin-meta
95-
- maybe-stylesheet-block
77+
- maybe-property-list
9678
- tailwind-at-plugin-path
9779

9880
tailwind-at-plugin-meta:
@@ -190,6 +172,46 @@ contexts:
190172
- meta_scope: entity.other.import.css.tailwind
191173
- include: identifier-content
192174

175+
tailwind-at-theme:
176+
- match: (@)theme{{break}}
177+
captures:
178+
0: keyword.control.directive.css.tailwind
179+
1: punctuation.definition.keyword.css.tailwind
180+
push:
181+
- tailwind-at-theme-meta
182+
- maybe-property-list
183+
184+
tailwind-at-theme-meta:
185+
- meta_include_prototype: false
186+
- meta_scope: meta.at-rule.theme.css.tailwind
187+
- include: immediately-pop
188+
189+
tailwind-at-utility:
190+
- match: (@)utility{{break}}
191+
captures:
192+
0: keyword.control.directive.css.tailwind
193+
1: punctuation.definition.keyword.css.tailwind
194+
push:
195+
- tailwind-at-utility-meta
196+
- maybe-property-list
197+
- tailwind-at-utility-name
198+
199+
tailwind-at-utility-meta:
200+
- meta_include_prototype: false
201+
- meta_scope: meta.at-rule.utility.css.tailwind
202+
- include: immediately-pop
203+
204+
tailwind-at-utility-name:
205+
- meta_include_prototype: false
206+
- match: '{{ident_begin}}'
207+
set: tailwind-at-utility-name-content
208+
- include: comments
209+
- include: else-pop
210+
211+
tailwind-at-utility-name-content:
212+
- meta_scope: entity.other.utility-name.css.tailwind
213+
- include: identifier-content
214+
193215
tailwind-at-variants:
194216
- match: (@)variants{{break}}
195217
captures:

‎tests/syntax_test.tailwind.css‎

Lines changed: 96 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,36 @@
1515

1616
/* Tailwind CSS */
1717

18+
.content {
19+
@apply whatever;
20+
/* ^^^^^^^^^^^^^^^ meta.property-list.css meta.block.css meta.at-rule.apply.css.tailwind */
21+
/* ^ meta.property-list.css meta.block.css punctuation.terminator.rule.css */
22+
/* ^^^^^^ keyword.control.directive.apply.css.tailwind */
23+
/* ^^^^^^^^ entity.other.attribute-name.class.css */
24+
font-family: Helvetica;
25+
/* ^^^^^^^^^^^ meta.property-list.css meta.block.css meta.property-name.css support.type.property-name.css */
26+
}
27+
1828
@config "./tailwind.config.js";
1929
/* <- meta.at-rule.config.css.tailwind keyword.control.directive.css punctuation.definition.keyword.css */
2030
/*^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.at-rule.config.css.tailwind */
2131
/*^^^^^ keyword.control.directive.css */
2232
/* ^^^^^^^^^^^^^^^^^^^^^^ string.quoted.double.css */
2333

34+
@layer base {
35+
/* <- meta.at-rule.layer.css keyword.control.directive.css punctuation.definition.keyword.css */
36+
/*^^^^^^^^^^ meta.at-rule.layer.css - meta.block */
37+
/* ^^ meta.at-rule.layer.css meta.block.css */
38+
/*^^^^ keyword.control.directive.css */
39+
/* ^^^^ entity.other.layer.css */
40+
/* ^ punctuation.section.block.begin.css */
41+
.bg {
42+
@apply font-bold py-2 px-4 rounded !important;
43+
/* ^^^^^^ meta.at-rule.apply.css.tailwind keyword.control.directive.apply.css.tailwind */
44+
}
45+
/* ^ punctuation.section.block.end.css */
46+
}
47+
2448
@plugin "daisyui";
2549
/*^^^^^^^^^^^^^^^ meta.at-rule.plugin.css.tailwind */
2650
/*^^^^^ keyword.control.directive.css.tailwind */
@@ -55,43 +79,6 @@
5579
}
5680
/* <- meta.at-rule.plugin.css.tailwind meta.block.css punctuation.section.block.end.css */
5781

58-
@source "./app/views/**/*.rb";
59-
/*^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.at-rule.source.css.tailwind */
60-
/*^^^^^ keyword.control.directive.css.tailwind */
61-
/* ^^^^^^^^^^^^^^^^^^^^^ meta.string.css string.quoted.double.css */
62-
/* ^ punctuation.definition.string.begin.css */
63-
/* ^ punctuation.definition.string.end.css */
64-
/* ^ punctuation.terminator.rule.css */
65-
66-
@tailwind base;
67-
/* <- meta.at-rule.tailwind.css.tailwind keyword.control.directive.css.tailwind punctuation.definition.keyword.css.tailwind */
68-
/*^^^^^^^^^^^^ meta.at-rule.tailwind.css.tailwind */
69-
/*^^^^^^^ keyword.control.directive.css.tailwind */
70-
/* ^^^^ entity.other.import.css.tailwind */
71-
/* ^ punctuation.terminator.rule.css */
72-
@tailwind compontent;
73-
/* <- meta.at-rule.tailwind.css.tailwind keyword.control.directive.css.tailwind punctuation.definition.keyword.css.tailwind */
74-
/*^^^^^^^^^^^^^^^^^^ meta.at-rule.tailwind.css.tailwind */
75-
/*^^^^^^^ keyword.control.directive.css.tailwind */
76-
/* ^^^^^^^^^^ entity.other.import.css.tailwind */
77-
/* ^ punctuation.terminator.rule.css */
78-
@tailwind utilities;
79-
/* <- meta.at-rule.tailwind.css.tailwind keyword.control.directive.css.tailwind punctuation.definition.keyword.css.tailwind */
80-
/*^^^^^^^^^^^^^^^^^ meta.at-rule.tailwind.css.tailwind */
81-
/*^^^^^^^ keyword.control.directive.css.tailwind */
82-
/* ^^^^^^^^^ entity.other.import.css.tailwind */
83-
/* ^ punctuation.terminator.rule.css */
84-
85-
.content {
86-
@apply whatever;
87-
/* ^^^^^^^^^^^^^^^ meta.property-list.css meta.block.css meta.at-rule.apply.css.tailwind */
88-
/* ^ meta.property-list.css meta.block.css punctuation.terminator.rule.css */
89-
/* ^^^^^^ keyword.control.directive.apply.css.tailwind */
90-
/* ^^^^^^^^ entity.other.attribute-name.class.css */
91-
font-family: Helvetica;
92-
/* ^^^^^^^^^^^ meta.property-list.css meta.block.css meta.property-name.css support.type.property-name.css */
93-
}
94-
9582
@responsive {
9683
/* <- meta.at-rule.responsive.css.tailwind keyword.control.directive.css.tailwind punctuation.definition.keyword.css.tailwind */
9784
/*^^^^^^^^^^ meta.at-rule.responsive.css.tailwind - meta.block */
@@ -107,20 +94,6 @@
10794
}
10895
/* <- meta.at-rule.responsive.css.tailwind meta.block.css punctuation.section.block.end.css */
10996

110-
@layer base {
111-
/* <- meta.at-rule.layer.css keyword.control.directive.css punctuation.definition.keyword.css */
112-
/*^^^^^^^^^^ meta.at-rule.layer.css - meta.block */
113-
/* ^^ meta.at-rule.layer.css meta.block.css */
114-
/*^^^^ keyword.control.directive.css */
115-
/* ^^^^ entity.other.layer.css */
116-
/* ^ punctuation.section.block.begin.css */
117-
.bg {
118-
@apply font-bold py-2 px-4 rounded !important;
119-
/* ^^^^^^ meta.at-rule.apply.css.tailwind keyword.control.directive.apply.css.tailwind */
120-
}
121-
/* ^ punctuation.section.block.end.css */
122-
}
123-
12497
@screen base {
12598
/* <- meta.at-rule.screen.css.tailwind keyword.control.directive.css.tailwind punctuation.definition.keyword.css.tailwind */
12699
/*^^^^^^^^^^^ meta.at-rule.screen.css.tailwind - meta.block */
@@ -151,6 +124,68 @@
151124
/* ^ punctuation.section.block.end.css */
152125
}
153126

127+
@source "./app/views/**/*.rb";
128+
/*^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.at-rule.source.css.tailwind */
129+
/*^^^^^ keyword.control.directive.css.tailwind */
130+
/* ^^^^^^^^^^^^^^^^^^^^^ meta.string.css string.quoted.double.css */
131+
/* ^ punctuation.definition.string.begin.css */
132+
/* ^ punctuation.definition.string.end.css */
133+
/* ^ punctuation.terminator.rule.css */
134+
135+
@tailwind base;
136+
/* <- meta.at-rule.tailwind.css.tailwind keyword.control.directive.css.tailwind punctuation.definition.keyword.css.tailwind */
137+
/*^^^^^^^^^^^^ meta.at-rule.tailwind.css.tailwind */
138+
/*^^^^^^^ keyword.control.directive.css.tailwind */
139+
/* ^^^^ entity.other.import.css.tailwind */
140+
/* ^ punctuation.terminator.rule.css */
141+
@tailwind compontent;
142+
/* <- meta.at-rule.tailwind.css.tailwind keyword.control.directive.css.tailwind punctuation.definition.keyword.css.tailwind */
143+
/*^^^^^^^^^^^^^^^^^^ meta.at-rule.tailwind.css.tailwind */
144+
/*^^^^^^^ keyword.control.directive.css.tailwind */
145+
/* ^^^^^^^^^^ entity.other.import.css.tailwind */
146+
/* ^ punctuation.terminator.rule.css */
147+
@tailwind utilities;
148+
/* <- meta.at-rule.tailwind.css.tailwind keyword.control.directive.css.tailwind punctuation.definition.keyword.css.tailwind */
149+
/*^^^^^^^^^^^^^^^^^ meta.at-rule.tailwind.css.tailwind */
150+
/*^^^^^^^ keyword.control.directive.css.tailwind */
151+
/* ^^^^^^^^^ entity.other.import.css.tailwind */
152+
/* ^ punctuation.terminator.rule.css */
153+
154+
@theme {
155+
/*^^^^^^ meta.at-rule.theme.css.tailwind */
156+
/*^^^^ keyword.control.directive.css.tailwind */
157+
/* ^ meta.block.css punctuation.section.block.begin.css */
158+
159+
--*: initial;
160+
/*^^^^^^^^^^^^^ meta.at-rule.theme.css.tailwind meta.block.css */
161+
/*^^^ meta.property-name.css entity.other.custom-property.css */
162+
/* ^ constant.other.wildcard.asterisk.css.tailwind */
163+
/* ^ punctuation.separator.key-value.css */
164+
/* ^^^^^^^^ meta.property-value.css */
165+
/* ^^^^^^^ support.constant.property-value.css */
166+
/* ^ punctuation.terminator.rule.css */
167+
168+
--font-*: initial;
169+
/*^^^^^^^^^^^^^^^^^^ meta.at-rule.theme.css.tailwind meta.block.css */
170+
/*^^^^^^^^ meta.property-name.css entity.other.custom-property.css */
171+
/* ^ constant.other.wildcard.asterisk.css.tailwind */
172+
/* ^ punctuation.separator.key-value.css */
173+
/* ^^^^^^^^ meta.property-value.css */
174+
/* ^^^^^^^ support.constant.property-value.css */
175+
/* ^ punctuation.terminator.rule.css */
176+
177+
--font-display: "Satoshi", "sans-serif";
178+
/*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.at-rule.theme.css.tailwind meta.block.css */
179+
/*^^^^^^^^^^^^^^ meta.property-name.css entity.other.custom-property.css */
180+
/* ^ punctuation.separator.key-value.css */
181+
/* ^^^^^^^^^^^^^^^^^^^^^^^^ meta.property-value.css */
182+
/* ^^^^^^^^^ meta.string.css string.quoted.double.css */
183+
/* ^ punctuation.separator.sequence.css */
184+
/* ^^^^^^^^^^^^ meta.string.css string.quoted.double.css */
185+
/* ^ punctuation.terminator.rule.css */
186+
}
187+
/* <- meta.at-rule.theme.css.tailwind meta.block.css punctuation.section.block.end.css */
188+
154189
@utility utility {
155190
/*^^^^^^^^^^^^^^^^ meta.at-rule.utility.css.tailwind */
156191
/*^^^^^^ keyword.control.directive.css.tailwind */
@@ -161,8 +196,17 @@
161196
/* ^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.at-rule.apply.css.tailwind */
162197
/* ^^^^^^ keyword.control.directive.apply.css.tailwind */
163198
/* ^ punctuation.definition.keyword.css.tailwind */
164-
/* ^^^^^^^^^^^^^^^^^^^ entity.other.attribute-name.class.css */
199+
/* ^^^^ entity.other.attribute-name.class.css */
200+
/* ^^^^^^^^^^^^^^ entity.other.attribute-name.class.css */
165201
/* ^ punctuation.terminator.rule.css */
202+
203+
font-family: Helvetica;
204+
/*^^^^^^^^^^^^^^^^^^^^^^^^^ meta.at-rule.utility.css.tailwind meta.block.css */
205+
/* ^^^^^^^^^^^ meta.property-name.css support.type.property-name.css */
206+
/* ^ punctuation.separator.key-value.css */
207+
/* ^^^^^^^^^^ meta.property-value.css */
208+
/* ^^^^^^^^^ meta.string.css string.unquoted.css */
209+
/* ^ punctuation.terminator.rule.css */
166210
}
167211
/* <- meta.at-rule.utility.css.tailwind meta.block.css punctuation.section.block.end.css */
168212

0 commit comments

Comments
 (0)