Skip to content

Commit c45e6cc

Browse files
alexr00alexr00
committed
Update grammars
1 parent e9671e4 commit c45e6cc

14 files changed

Lines changed: 362 additions & 335 deletions

‎extensions/cpp/cgmanifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
"git": {
77
"name": "jeff-hykin/cpp-textmate-grammar",
88
"repositoryUrl": "https://github.com/jeff-hykin/cpp-textmate-grammar",
9-
"commitHash": "fedd206d1b2803f31a278e9b5f098ce4bc76e532"
9+
"commitHash": "666808cab3907fc91ed4d3901060ee6b045cca58"
1010
}
1111
},
1212
"license": "MIT",
13-
"version": "1.14.13",
13+
"version": "1.14.15",
1414
"description": "The files syntaxes/c.json and syntaxes/c++.json were derived from https://github.com/atom/language-c which was originally converted from the C TextMate bundle https://github.com/textmate/c.tmbundle."
1515
},
1616
{

‎extensions/cpp/syntaxes/c.tmLanguage.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
55
"Once accepted there, we are happy to receive an update request."
66
],
7-
"version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/fedd206d1b2803f31a278e9b5f098ce4bc76e532",
7+
"version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/72b309aabb63bf14a3cdf0280149121db005d616",
88
"name": "C",
99
"scopeName": "source.c",
1010
"patterns": [
@@ -583,7 +583,7 @@
583583
},
584584
"case_statement": {
585585
"name": "meta.conditional.case.c",
586-
"begin": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)case(?!\\w))",
586+
"begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)case(?!\\w))",
587587
"beginCaptures": {
588588
"1": {
589589
"patterns": [
@@ -946,7 +946,7 @@
946946
},
947947
"default_statement": {
948948
"name": "meta.conditional.case.c",
949-
"begin": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)default(?!\\w))",
949+
"begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)default(?!\\w))",
950950
"beginCaptures": {
951951
"1": {
952952
"patterns": [
@@ -2772,7 +2772,7 @@
27722772
}
27732773
},
27742774
"static_assert": {
2775-
"begin": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)static_assert|_Static_assert(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(\\()",
2775+
"begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)static_assert|_Static_assert(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
27762776
"beginCaptures": {
27772777
"1": {
27782778
"patterns": [
@@ -3051,7 +3051,7 @@
30513051
},
30523052
"switch_conditional_parentheses": {
30533053
"name": "meta.conditional.switch.c",
3054-
"begin": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(\\()",
3054+
"begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
30553055
"beginCaptures": {
30563056
"1": {
30573057
"patterns": [
@@ -3099,7 +3099,7 @@
30993099
},
31003100
"switch_statement": {
31013101
"name": "meta.block.switch.c",
3102-
"begin": "(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)switch(?!\\w)))",
3102+
"begin": "(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)switch(?!\\w)))",
31033103
"beginCaptures": {
31043104
"1": {
31053105
"name": "meta.head.switch.c"

‎extensions/cpp/syntaxes/cpp.embedded.macro.tmLanguage.json‎

Lines changed: 122 additions & 122 deletions
Large diffs are not rendered by default.

‎extensions/cpp/syntaxes/cpp.tmLanguage.json‎

Lines changed: 122 additions & 122 deletions
Large diffs are not rendered by default.

‎extensions/csharp/cgmanifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "dotnet/csharp-tmLanguage",
88
"repositoryUrl": "https://github.com/dotnet/csharp-tmLanguage",
9-
"commitHash": "ad7514e8d78542a6ee37f6187091cd4102eb3797"
9+
"commitHash": "572697a2c2267430010b3534281f73337144e94f"
1010
}
1111
},
1212
"license": "MIT",

‎extensions/csharp/syntaxes/csharp.tmLanguage.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
55
"Once accepted there, we are happy to receive an update request."
66
],
7-
"version": "https://github.com/dotnet/csharp-tmLanguage/commit/ad7514e8d78542a6ee37f6187091cd4102eb3797",
7+
"version": "https://github.com/dotnet/csharp-tmLanguage/commit/572697a2c2267430010b3534281f73337144e94f",
88
"name": "C#",
99
"scopeName": "source.cs",
1010
"patterns": [
@@ -2498,7 +2498,7 @@
24982498
},
24992499
"interpolation": {
25002500
"name": "meta.interpolation.cs",
2501-
"begin": "(?<=[^\\{])((?:\\{\\{)*)(\\{)(?=[^\\{])",
2501+
"begin": "(?<=[^\\{]|^)((?:\\{\\{)*)(\\{)(?=[^\\{])",
25022502
"beginCaptures": {
25032503
"1": {
25042504
"name": "string.quoted.double.cs"

‎extensions/java/cgmanifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
"git": {
77
"name": "atom/language-java",
88
"repositoryUrl": "https://github.com/atom/language-java",
9-
"commitHash": "123beb50115b0bfb0db8f2325df6d05fb8a016a8"
9+
"commitHash": "0facf7cbe02cda460db1160fd730f2e57bf15c36"
1010
}
1111
},
1212
"license": "MIT",
13-
"version": "0.31.3"
13+
"version": "0.31.4"
1414
}
1515
],
1616
"version": 1

‎extensions/java/syntaxes/java.tmLanguage.json‎

Lines changed: 74 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
55
"Once accepted there, we are happy to receive an update request."
66
],
7-
"version": "https://github.com/atom/language-java/commit/123beb50115b0bfb0db8f2325df6d05fb8a016a8",
7+
"version": "https://github.com/atom/language-java/commit/0facf7cbe02cda460db1160fd730f2e57bf15c36",
88
"name": "Java",
99
"scopeName": "source.java",
1010
"patterns": [
@@ -209,7 +209,7 @@
209209
"name": "keyword.control.new.java"
210210
}
211211
},
212-
"end": "(?=;|\\)|,|:|}|\\+|\\-|\\*|\\/|%|!|&|\\||=)",
212+
"end": "(?=;|\\)|\\]|\\.|,|\\?|:|}|\\+|\\-|\\*|\\/(?!\\/|\\*)|%|!|&|\\||\\^|=)",
213213
"patterns": [
214214
{
215215
"include": "#comments"
@@ -269,7 +269,7 @@
269269
]
270270
},
271271
"class": {
272-
"begin": "(?=\\w?[\\w\\s]*\\b(?:class|(?<!@)interface|enum)\\s+\\w+)",
272+
"begin": "(?=\\w?[\\w\\s]*\\b(?:class|(?<!@)interface|enum)\\s+[\\w$]+)",
273273
"end": "}",
274274
"endCaptures": {
275275
"0": {
@@ -296,7 +296,7 @@
296296
"name": "entity.name.type.class.java"
297297
}
298298
},
299-
"match": "(class|(?<!@)interface|enum)\\s+(\\w+)",
299+
"match": "(class|(?<!@)interface|enum)\\s+([\\w$]+)",
300300
"name": "meta.class.identifier.java"
301301
},
302302
{
@@ -696,52 +696,64 @@
696696
"include": "#comments"
697697
},
698698
{
699-
"begin": "(\\w+)\\s*({)",
699+
"begin": "\\b(\\w+)\\b",
700700
"beginCaptures": {
701701
"1": {
702702
"name": "constant.other.enum.java"
703-
},
704-
"2": {
705-
"name": "punctuation.bracket.curly.java"
706703
}
707704
},
708-
"end": "\\}",
705+
"end": "(,)|(?=;|})",
709706
"endCaptures": {
710-
"0": {
711-
"name": "punctuation.bracket.curly.java"
707+
"1": {
708+
"name": "punctuation.separator.delimiter.java"
712709
}
713710
},
714711
"patterns": [
715712
{
716-
"include": "#class-body"
717-
}
718-
]
719-
},
720-
{
721-
"begin": "(\\w+)\\s*(\\()",
722-
"beginCaptures": {
723-
"1": {
724-
"name": "constant.other.enum.java"
713+
"include": "#comments-javadoc"
714+
},
715+
{
716+
"include": "#comments"
717+
},
718+
{
719+
"begin": "\\(",
720+
"beginCaptures": {
721+
"0": {
722+
"name": "punctuation.bracket.round.java"
723+
}
724+
},
725+
"end": "\\)",
726+
"endCaptures": {
727+
"0": {
728+
"name": "punctuation.bracket.round.java"
729+
}
730+
},
731+
"patterns": [
732+
{
733+
"include": "#code"
734+
}
735+
]
725736
},
726-
"2": {
727-
"name": "punctuation.bracket.round.java"
728-
}
729-
},
730-
"end": "\\)",
731-
"endCaptures": {
732-
"0": {
733-
"name": "punctuation.bracket.round.java"
734-
}
735-
},
736-
"patterns": [
737737
{
738-
"include": "#code"
738+
"begin": "{",
739+
"beginCaptures": {
740+
"0": {
741+
"name": "punctuation.bracket.curly.java"
742+
}
743+
},
744+
"end": "}",
745+
"endCaptures": {
746+
"0": {
747+
"name": "punctuation.bracket.curly.java"
748+
}
749+
},
750+
"patterns": [
751+
{
752+
"include": "#class-body"
753+
}
754+
]
739755
}
740756
]
741-
},
742-
{
743-
"match": "\\b\\w+\\b",
744-
"name": "constant.other.enum.java"
745757
}
746758
]
747759
},
@@ -1472,7 +1484,7 @@
14721484
]
14731485
},
14741486
{
1475-
"begin": "\\b(catch)\\b\\s*(?=\\(\\s*[^\\s]+\\s*[^)]+\\))",
1487+
"begin": "\\b(catch)\\b",
14761488
"beginCaptures": {
14771489
"1": {
14781490
"name": "keyword.control.catch.java"
@@ -1486,6 +1498,9 @@
14861498
},
14871499
"name": "meta.catch.java",
14881500
"patterns": [
1501+
{
1502+
"include": "#comments"
1503+
},
14891504
{
14901505
"begin": "\\(",
14911506
"beginCaptures": {
@@ -1508,19 +1523,31 @@
15081523
"include": "#storage-modifiers"
15091524
},
15101525
{
1511-
"match": "\\|",
1512-
"name": "punctuation.catch.separator.java"
1513-
},
1514-
{
1515-
"match": "([a-zA-Z$_][\\.a-zA-Z0-9$_]*)\\s*(\\w+)?",
1516-
"captures": {
1517-
"1": {
1526+
"begin": "[a-zA-Z$_][\\.a-zA-Z0-9$_]*",
1527+
"beginCaptures": {
1528+
"0": {
15181529
"name": "storage.type.java"
1530+
}
1531+
},
1532+
"end": "(\\|)|(?=\\))",
1533+
"endCaptures": {
1534+
"1": {
1535+
"name": "punctuation.catch.separator.java"
1536+
}
1537+
},
1538+
"patterns": [
1539+
{
1540+
"include": "#comments"
15191541
},
1520-
"2": {
1521-
"name": "variable.parameter.java"
1542+
{
1543+
"match": "\\w+",
1544+
"captures": {
1545+
"0": {
1546+
"name": "variable.parameter.java"
1547+
}
1548+
}
15221549
}
1523-
}
1550+
]
15241551
}
15251552
]
15261553
},

‎extensions/javascript/syntaxes/JavaScript.tmLanguage.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
55
"Once accepted there, we are happy to receive an update request."
66
],
7-
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/dc5fe357ee5582244b798917a5fc9d7cd73e6220",
7+
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/2e0fded599d7b85b78692dee3d96e8a4710a5c57",
88
"name": "JavaScript (with React support)",
99
"scopeName": "source.js",
1010
"patterns": [
@@ -27,12 +27,6 @@
2727
"repository": {
2828
"statements": {
2929
"patterns": [
30-
{
31-
"include": "#string"
32-
},
33-
{
34-
"include": "#comment"
35-
},
3630
{
3731
"include": "#declaration"
3832
},
@@ -53,6 +47,12 @@
5347
},
5448
{
5549
"include": "#punctuation-semicolon"
50+
},
51+
{
52+
"include": "#string"
53+
},
54+
{
55+
"include": "#comment"
5656
}
5757
]
5858
},

‎extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
55
"Once accepted there, we are happy to receive an update request."
66
],
7-
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/dc5fe357ee5582244b798917a5fc9d7cd73e6220",
7+
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/2e0fded599d7b85b78692dee3d96e8a4710a5c57",
88
"name": "JavaScript (with React support)",
99
"scopeName": "source.js.jsx",
1010
"patterns": [
@@ -27,12 +27,6 @@
2727
"repository": {
2828
"statements": {
2929
"patterns": [
30-
{
31-
"include": "#string"
32-
},
33-
{
34-
"include": "#comment"
35-
},
3630
{
3731
"include": "#declaration"
3832
},
@@ -53,6 +47,12 @@
5347
},
5448
{
5549
"include": "#punctuation-semicolon"
50+
},
51+
{
52+
"include": "#string"
53+
},
54+
{
55+
"include": "#comment"
5656
}
5757
]
5858
},

0 commit comments

Comments
 (0)