Skip to content

Commit d872bf4

Browse files
committed
Clean up bs.* deprecation handling, add extension points
1 parent 13614c8 commit d872bf4

File tree

1 file changed

+26
-27
lines changed

1 file changed

+26
-27
lines changed

grammars/rescript.tmLanguage.json

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -280,38 +280,37 @@
280280
"attribute": {
281281
"patterns": [
282282
{
283-
"match": "(@)(splice)",
283+
"match": "(%%?|@@?)([A-Za-z_][A-Za-z0-9_\\.]*)",
284284
"captures": {
285285
"1": {
286286
"name": "storage.modifier punctuation.definition.annotation"
287287
},
288288
"2": {
289-
"name": "invalid.illegal"
290-
}
291-
}
292-
},
293-
{
294-
"match": "(@@?)(bs\\.)?([A-Za-z_][A-Za-z0-9_\\.]*)",
295-
"captures": {
296-
"1": {
297-
"name": "storage.modifier punctuation.definition.annotation"
298-
},
299-
"2": {
300-
"name": "invalid.deprecated"
301-
},
302-
"3": {
303-
"name": "variable.annotation"
304-
}
305-
}
306-
},
307-
{
308-
"match": "(%%?)([A-Za-z_][A-Za-z0-9_\\.]*)",
309-
"captures": {
310-
"1": {
311-
"name": "storage.modifier punctuation.definition.annotation"
312-
},
313-
"2": {
314-
"name": "variable.annotation"
289+
"patterns": [
290+
{
291+
"match": "bs\\.send\\.pipe",
292+
"name": "invalid.deprecated"
293+
},
294+
{
295+
"match": "splice",
296+
"name": "invalid.illegal"
297+
},
298+
{
299+
"match": "(bs\\.)?([A-Za-z_][A-Za-z0-9_\\.]*)",
300+
"captures": {
301+
"1": {
302+
"name": "invalid.deprecated"
303+
},
304+
"2": {
305+
"name": "variable.annotation"
306+
}
307+
}
308+
},
309+
{
310+
"match": "[A-Za-z_][A-Za-z0-9_\\.]*",
311+
"name": "variable.annotation"
312+
}
313+
]
315314
}
316315
}
317316
}

0 commit comments

Comments
 (0)