Skip to content

Commit 3611edc

Browse files
authored
Merge branch 'main' into feat-add-json-textmate
2 parents 2ea9f3e + 1127cb5 commit 3611edc

Some content is hidden

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

94 files changed

+327
-2168
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"type": "module",
33
"private": true,
4-
"packageManager": "[email protected].4",
4+
"packageManager": "[email protected].5",
55
"description": "Collection of TextMate grammars and themes in JSON",
66
"scripts": {
77
"build": "pnpm -r build",

packages/tm-grammars/grammars/actionscript-3.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,6 @@
390390
"name": "constant.other.actionscript.3"
391391
}
392392
},
393-
"comment": "Following convention, let's guess that anything in all caps/digits (possible underscores) is a constant.",
394393
"match": "\\b([A-Z\\$][A-Z0-9_]+)\\b"
395394
},
396395
"guess_type": {
@@ -399,7 +398,6 @@
399398
"name": "support.type.actionscript.3"
400399
}
401400
},
402-
"comment": "Following convention, let's guess that any word starting with one or more capital letters (that contains at least some lower-case letters so that constants aren't detected) refers to a class/type. May be fully-qualified.",
403401
"match": "\\b((?:[A-Za-z0-9_\\$]+\\.)*[A-Z][A-Z0-9]*[a-z]+[A-Za-z0-9_\\$]*)\\b"
404402
},
405403
"implements": {

packages/tm-grammars/grammars/applescript.json

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080
"name": "punctuation.definition.parameters.end.applescript"
8181
}
8282
},
83-
"comment": "\n\t\t\t\t\t\tThis is not a very well-designed rule. For now,\n\t\t\t\t\t\twe can leave it like this though, as it sorta works.\n\t\t\t\t\t",
8483
"end": "^\\s*(end)(?:\\s+(\\2))?(?=\\s*(--.*?)?$)",
8584
"endCaptures": {
8685
"1": {
@@ -110,7 +109,6 @@
110109
"name": "variable.parameter.handler.direct.applescript"
111110
}
112111
},
113-
"comment": "TODO: match `given` parameters",
114112
"end": "^\\s*(end)(?:\\s+(\\2))?(?=\\s*(--.*?)?$)",
115113
"endCaptures": {
116114
"1": {
@@ -639,7 +637,6 @@
639637
"name": "keyword.control.tell.applescript"
640638
}
641639
},
642-
"comment": "tell Textmate",
643640
"end": "^\\s*(end(?:\\s+tell)?)(?=\\s*(--.*?)?$)",
644641
"name": "meta.block.tell.application.textmate.applescript",
645642
"patterns": [
@@ -661,7 +658,6 @@
661658
"name": "keyword.control.tell.applescript"
662659
}
663660
},
664-
"comment": "tell Finder",
665661
"end": "^\\s*(end(?:\\s+tell)?)(?=\\s*(--.*?)?$)",
666662
"name": "meta.block.tell.application.finder.applescript",
667663
"patterns": [
@@ -683,7 +679,6 @@
683679
"name": "keyword.control.tell.applescript"
684680
}
685681
},
686-
"comment": "tell System Events",
687682
"end": "^\\s*(end(?:\\s+tell)?)(?=\\s*(--.*?)?$)",
688683
"name": "meta.block.tell.application.system-events.applescript",
689684
"patterns": [
@@ -705,7 +700,6 @@
705700
"name": "keyword.control.tell.applescript"
706701
}
707702
},
708-
"comment": "tell iTunes",
709703
"end": "^\\s*(end(?:\\s+tell)?)(?=\\s*(--.*?)?$)",
710704
"name": "meta.block.tell.application.itunes.applescript",
711705
"patterns": [
@@ -727,7 +721,6 @@
727721
"name": "keyword.control.tell.applescript"
728722
}
729723
},
730-
"comment": "tell generic application process",
731724
"end": "^\\s*(end(?:\\s+tell)?)(?=\\s*(--.*?)?$)",
732725
"name": "meta.block.tell.application-process.generic.applescript",
733726
"patterns": [
@@ -746,7 +739,6 @@
746739
"name": "keyword.control.tell.applescript"
747740
}
748741
},
749-
"comment": "tell generic application",
750742
"end": "^\\s*(end(?:\\s+tell)?)(?=\\s*(--.*?)?$)",
751743
"name": "meta.block.tell.application.generic.applescript",
752744
"patterns": [
@@ -765,7 +757,6 @@
765757
"name": "keyword.control.tell.applescript"
766758
}
767759
},
768-
"comment": "generic tell block",
769760
"end": "^\\s*(end(?:\\s+tell)?)(?=\\s*(--.*?)?$)",
770761
"name": "meta.block.tell.generic.applescript",
771762
"patterns": [
@@ -781,7 +772,6 @@
781772
"name": "keyword.control.tell.applescript"
782773
}
783774
},
784-
"comment": "tell … to statement",
785775
"end": "(?<!¬)$",
786776
"name": "meta.block.tell.generic.applescript",
787777
"patterns": [
@@ -811,7 +801,6 @@
811801
"built-in.constant": {
812802
"patterns": [
813803
{
814-
"comment": "yes/no can’t always be used as booleans, e.g. in an if() expression. But they work e.g. for boolean arguments.",
815804
"match": "\\b(?i:true|false|yes|no)\\b",
816805
"name": "constant.language.boolean.applescript"
817806
},
@@ -864,7 +853,6 @@
864853
"name": "keyword.operator.word.applescript"
865854
},
866855
{
867-
"comment": "In double quotes so we can use a single quote in the keywords.",
868856
"match": "(?ix)\\b\n\t\t\t\t\t\t(is(n't|\\s+not)?(\\s+(equal(\\s+to)?|(less|greater)\\s+than(\\s+or\\s+equal(\\s+to)?)?|in|contained\\s+by))?\n\t\t\t\t\t\t|does(n't|\\s+not)\\s+(equal|come\\s+(before|after)|contain)\n\t\t\t\t\t\t)\n\t\t\t\t\t\\b",
869857
"name": "keyword.operator.word.applescript"
870858
},
@@ -889,12 +877,10 @@
889877
"name": "punctuation.separator.continuation.line.applescript"
890878
},
891879
{
892-
"comment": "the : in property assignments",
893880
"match": ":",
894881
"name": "punctuation.separator.key-value.property.applescript"
895882
},
896883
{
897-
"comment": "the parentheses in groups",
898884
"match": "[()]",
899885
"name": "punctuation.section.group.applescript"
900886
}
@@ -1040,7 +1026,6 @@
10401026
"name": "punctuation.definition.array.begin.applescript"
10411027
}
10421028
},
1043-
"comment": "We cannot necessarily distinguish \"records\" from \"arrays\", and so this could be either.",
10441029
"end": "\\}",
10451030
"endCaptures": {
10461031
"0": {

packages/tm-grammars/grammars/ara.json

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191
"patterns": [
9292
{
9393
"begin": "(?i)(?=\\\\?[a-z_0-9\\\\]+\\\\[a-z_][a-z0-9_]*\\s*(\\(|(::<)))",
94-
"comment": "Functions in a user-defined namespace (overrides any built-ins)",
9594
"end": "(?=\\s*(\\(|(::<)))",
9695
"patterns": [
9796
{
@@ -106,7 +105,6 @@
106105
"name": "punctuation.separator.inheritance.php"
107106
}
108107
},
109-
"comment": "Root namespace function calls (built-in or user)",
110108
"end": "(?=\\s*(\\(|(::<)))",
111109
"patterns": [
112110
{
@@ -119,17 +117,14 @@
119117
"interpolation": {
120118
"patterns": [
121119
{
122-
"comment": "Interpolating octal values e.g. \\01 or \\07.",
123120
"match": "\\\\[0-7]{1,3}",
124121
"name": "constant.numeric.octal.ara"
125122
},
126123
{
127-
"comment": "Interpolating hex values e.g. \\x1 or \\xFF.",
128124
"match": "\\\\x[0-9A-Fa-f]{1,2}",
129125
"name": "constant.numeric.hex.ara"
130126
},
131127
{
132-
"comment": "Escaped characters in double-quoted strings e.g. \\n or \\t.",
133128
"match": "\\\\[nrt\\\\\\$\\\"]",
134129
"name": "constant.character.escape.ara"
135130
}
@@ -232,27 +227,22 @@
232227
"operators": {
233228
"patterns": [
234229
{
235-
"comment": "assignment operators",
236230
"match": "(\\+=|-=|\\*=|/=|%=|\\^=|&&=|<=|>=|&=|\\|=|<<=|>>=|\\?\\?=)",
237231
"name": "keyword.assignments.ara"
238232
},
239233
{
240-
"comment": "logical operators",
241234
"match": "(\\^|\\||\\|\\||&&|>>|<<|&|~|<<|>>|>|<|<=>|\\?\\?|\\?|:|\\?:)(?!=)",
242235
"name": "keyword.operators.ara"
243236
},
244237
{
245-
"comment": "comparison operators",
246238
"match": "(==|===|!==|!=|<=|>=|<|>)(?!=)",
247239
"name": "keyword.operator.comparison.ara"
248240
},
249241
{
250-
"comment": "math operators",
251242
"match": "(([+%]|(\\*(?!\\w)))(?!=))|(-(?!>))|(/(?!/))",
252243
"name": "keyword.operator.math.ara"
253244
},
254245
{
255-
"comment": "single equal assignment operator",
256246
"match": "(?<![<>])=(?!=|>)",
257247
"name": "keyword.operator.assignment.ara"
258248
},
@@ -280,36 +270,29 @@
280270
"name": "punctuation.brackets.curly.ara"
281271
}
282272
},
283-
"comment": "less than, greater than (special case)",
284273
"match": "(?:\\b|(?:(\\))|(\\])|(\\})))[ \\t]+([<>])[ \\t]+(?:\\b|(?:(\\()|(\\[)|(\\{)))"
285274
},
286275
{
287-
"comment": "arrow method call, arrow property access",
288276
"match": "(?:->|\\?->)",
289277
"name": "keyword.operator.arrow.ara"
290278
},
291279
{
292-
"comment": "double arrow key-value pair",
293280
"match": "(?:=>)",
294281
"name": "keyword.operator.double-arrow.ara"
295282
},
296283
{
297-
"comment": "static method call, static property access",
298284
"match": "(?:::)",
299285
"name": "keyword.operator.static.ara"
300286
},
301287
{
302-
"comment": "closure creation",
303288
"match": "(?:\\(\\.\\.\\.\\))",
304289
"name": "keyword.operator.closure.ara"
305290
},
306291
{
307-
"comment": "spread operator",
308292
"match": "(?:\\.\\.\\.)",
309293
"name": "keyword.operator.spread.ara"
310294
},
311295
{
312-
"comment": "namespace operator",
313296
"match": "\\\\",
314297
"name": "keyword.operator.namespace.ara"
315298
}

0 commit comments

Comments
 (0)