Skip to content

Commit 95aae66

Browse files
JohnnyMorganzJohnnyMorganz
committed
Provide more explicit scopes for <, > and -> to support bracket colorization
Provide explicit scopes for `<` and `>` in a type declaration to allow colorization. Add an explicit scope to `->` to mark it as ignored during colorization.
1 parent 5febad5 commit 95aae66

File tree

43 files changed

+504
-504
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+504
-504
lines changed

‎Luau.YAML-tmLanguage

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ repository:
349349
- match: "\\?|\\&|\\|"
350350
name: keyword.operator.type.luau
351351
- match: "->"
352-
name: keyword.operator.type.luau
352+
name: keyword.operator.type.function.luau
353353
- match: "\\b(false)\\b"
354354
name: constant.language.boolean.false.luau
355355
- match: "\\b(true)\\b"
@@ -368,9 +368,9 @@ repository:
368368
- begin: "(<)"
369369
end: "(>)"
370370
beginCaptures:
371-
"1": { name: keyword.operator.type.luau }
371+
"1": { name: punctuation.definition.typeparameters.begin.luau }
372372
endCaptures:
373-
"1": { name: keyword.operator.type.luau }
373+
"1": { name: punctuation.definition.typeparameters.end.luau }
374374
patterns:
375375
- match: "=" # for generics declarations
376376
name: keyword.operator.assignment.luau
@@ -408,4 +408,4 @@ repository:
408408
match: "(@)({{identifier}})"
409409
captures:
410410
"1": { name: keyword.operator.attribute.luau }
411-
"2": { name: storage.type.attribute.luau}
411+
"2": { name: storage.type.attribute.luau }

‎Luau.tmLanguage

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -968,7 +968,7 @@
968968
<key>match</key>
969969
<string>-&gt;</string>
970970
<key>name</key>
971-
<string>keyword.operator.type.luau</string>
971+
<string>keyword.operator.type.function.luau</string>
972972
</dict>
973973
<dict>
974974
<key>match</key>
@@ -1032,15 +1032,15 @@
10321032
<key>1</key>
10331033
<dict>
10341034
<key>name</key>
1035-
<string>keyword.operator.type.luau</string>
1035+
<string>punctuation.definition.typeparameters.begin.luau</string>
10361036
</dict>
10371037
</dict>
10381038
<key>endCaptures</key>
10391039
<dict>
10401040
<key>1</key>
10411041
<dict>
10421042
<key>name</key>
1043-
<string>keyword.operator.type.luau</string>
1043+
<string>punctuation.definition.typeparameters.end.luau</string>
10441044
</dict>
10451045
</dict>
10461046
<key>patterns</key>

‎Luau.tmLanguage.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@
637637
},
638638
{
639639
"match": "->",
640-
"name": "keyword.operator.type.luau"
640+
"name": "keyword.operator.type.function.luau"
641641
},
642642
{
643643
"match": "\\b(false)\\b",
@@ -678,12 +678,12 @@
678678
"end": "(>)",
679679
"beginCaptures": {
680680
"1": {
681-
"name": "keyword.operator.type.luau"
681+
"name": "punctuation.definition.typeparameters.begin.luau"
682682
}
683683
},
684684
"endCaptures": {
685685
"1": {
686-
"name": "keyword.operator.type.luau"
686+
"name": "punctuation.definition.typeparameters.end.luau"
687687
}
688688
},
689689
"patterns": [

‎tests/baselines/full-moon-luau-generic_functions.baseline.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,11 @@ end
114114
^
115115
source.luau
116116
^
117-
source.luau keyword.operator.type.luau
117+
source.luau punctuation.definition.typeparameters.begin.luau
118118
^
119119
source.luau entity.name.type.luau
120120
^
121-
source.luau keyword.operator.type.luau
121+
source.luau punctuation.definition.typeparameters.end.luau
122122
^
123123
source.luau
124124
> a: T,
@@ -169,7 +169,7 @@ end
169169
^
170170
source.luau
171171
^^
172-
source.luau keyword.operator.type.luau
172+
source.luau keyword.operator.type.function.luau
173173
^
174174
source.luau
175175
^
@@ -215,11 +215,11 @@ end
215215
^
216216
source.luau
217217
^
218-
source.luau keyword.operator.type.luau
218+
source.luau punctuation.definition.typeparameters.begin.luau
219219
^
220220
source.luau entity.name.type.luau
221221
^
222-
source.luau keyword.operator.type.luau
222+
source.luau punctuation.definition.typeparameters.end.luau
223223
^
224224
source.luau
225225
> a: T,
@@ -270,7 +270,7 @@ end
270270
^
271271
source.luau
272272
^^
273-
source.luau keyword.operator.type.luau
273+
source.luau keyword.operator.type.function.luau
274274
^
275275
source.luau
276276
^
@@ -290,7 +290,7 @@ end
290290
^
291291
source.luau
292292
^^
293-
source.luau keyword.operator.type.luau
293+
source.luau keyword.operator.type.function.luau
294294
^
295295
source.luau
296296
^

‎tests/baselines/full-moon-luau-named_function_arg_types.baseline.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ end
5151
^
5252
source.luau
5353
^^
54-
source.luau keyword.operator.type.luau
54+
source.luau keyword.operator.type.function.luau
5555
^
5656
source.luau
5757
^^^^^^
@@ -85,7 +85,7 @@ end
8585
^
8686
source.luau
8787
^^
88-
source.luau keyword.operator.type.luau
88+
source.luau keyword.operator.type.function.luau
8989
^
9090
source.luau
9191
^^^^^^
@@ -124,7 +124,7 @@ end
124124
^
125125
source.luau meta.function.luau meta.parameter.luau
126126
^^
127-
source.luau meta.function.luau meta.parameter.luau keyword.operator.type.luau
127+
source.luau meta.function.luau meta.parameter.luau keyword.operator.type.function.luau
128128
^
129129
source.luau meta.function.luau meta.parameter.luau
130130
^
@@ -187,7 +187,7 @@ end
187187
^
188188
source.luau
189189
^^
190-
source.luau keyword.operator.type.luau
190+
source.luau keyword.operator.type.function.luau
191191
^
192192
source.luau
193193
^^^^^^
@@ -246,7 +246,7 @@ end
246246
^
247247
source.luau
248248
^^
249-
source.luau keyword.operator.type.luau
249+
source.luau keyword.operator.type.function.luau
250250
^
251251
source.luau
252252
^
@@ -262,17 +262,17 @@ end
262262
^^^^^
263263
source.luau entity.name.type.luau
264264
^
265-
source.luau keyword.operator.type.luau
265+
source.luau punctuation.definition.typeparameters.begin.luau
266266
^^^^^^
267267
source.luau support.type.primitive.luau
268268
^
269-
source.luau keyword.operator.type.luau
269+
source.luau punctuation.definition.typeparameters.end.luau
270270
^
271271
source.luau
272272
^
273273
source.luau
274274
^^
275-
source.luau keyword.operator.type.luau
275+
source.luau keyword.operator.type.function.luau
276276
^^^^
277277
source.luau
278278
^^^

‎tests/baselines/full-moon-luau-shorthand_array_type.baseline.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ type Array<T> = { [number]: T }
1212
^^^^^
1313
source.luau entity.name.type.luau
1414
^
15-
source.luau keyword.operator.type.luau
15+
source.luau punctuation.definition.typeparameters.begin.luau
1616
^
1717
source.luau entity.name.type.luau
1818
^
19-
source.luau keyword.operator.type.luau
19+
source.luau punctuation.definition.typeparameters.end.luau
2020
^
2121
source.luau
2222
^
@@ -41,11 +41,11 @@ type Array<T> = { [number]: T }
4141
^^^^^
4242
source.luau entity.name.type.luau
4343
^
44-
source.luau keyword.operator.type.luau
44+
source.luau punctuation.definition.typeparameters.begin.luau
4545
^
4646
source.luau entity.name.type.luau
4747
^
48-
source.luau keyword.operator.type.luau
48+
source.luau punctuation.definition.typeparameters.end.luau
4949
^
5050
source.luau
5151
^

0 commit comments

Comments
 (0)