Skip to content

Commit 48e93f7

Browse files
alexr00alexr00
authored
Update grammars (#194614)
1 parent 8f38222 commit 48e93f7

16 files changed

+4931
-2745
lines changed

‎extensions/cpp/cgmanifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,4 @@
9393
}
9494
],
9595
"version": 1
96-
}
96+
}

‎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": "525e628edad54c0f7aa15b015310df240803ea66"
9+
"commitHash": "29a37e5e2d66deefe5a06afad793a820871f4fdf"
1010
}
1111
},
1212
"license": "MIT",

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

Lines changed: 93 additions & 68 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/525e628edad54c0f7aa15b015310df240803ea66",
7+
"version": "https://github.com/dotnet/csharp-tmLanguage/commit/29a37e5e2d66deefe5a06afad793a820871f4fdf",
88
"name": "C#",
99
"scopeName": "source.cs",
1010
"patterns": [
@@ -4437,7 +4437,7 @@
44374437
]
44384438
},
44394439
"parameter": {
4440-
"match": "(?x)\n(?:(?:\\b(ref|params|out|in|this)\\b)\\s+)?\n(?<type_name>\n (?:\n (?:ref\\s+)? # ref return\n (?:\n (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n (?<name_and_type_args> # identifier + type arguments (if any)\n \\g<identifier>\\s*\n (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n )\n (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n )\n (?:\\s*\\?\\s*)? # nullable suffix?\n (?:\\s* # array suffix?\n \\[\n (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n \\]\n \\s*\n (?:\\?)? # arrays can be nullable reference types\n \\s*\n )*\n )\n)\\s+\n(\\g<identifier>)",
4440+
"match": "(?x)\n(?:(?:\\b(ref|params|out|in|this)\\b)\\s+)?\n(?<type_name>\n (?:\n (?:ref\\s+)? # ref return\n (?:\n (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n (?<name_and_type_args> # identifier + type arguments (if any)\n \\g<identifier>\\s*\n (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n )\n (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n (?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\))\n )\n (?:\\s*\\?\\s*)? # nullable suffix?\n (?:\\s* # array suffix?\n \\[\n (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n \\]\n \\s*\n (?:\\?)? # arrays can be nullable reference types\n \\s*\n )*\n )\n)\\s+\n(\\g<identifier>)",
44414441
"captures": {
44424442
"1": {
44434443
"name": "storage.modifier.$1.cs"
@@ -4800,7 +4800,7 @@
48004800
"anonymous-method-expression": {
48014801
"patterns": [
48024802
{
4803-
"begin": "(?x)\n((?:\\b(?:async|static)\\b\\s*)*)\n(@?[_[:alpha:]][_[:alnum:]]*)\\b\\s*\n(=>)",
4803+
"begin": "(?x)\n((?:\\b(?:async|static)\\b\\s*)*)\n(?:\n (@?[_[:alpha:]][_[:alnum:]]*)\\b|\n (\\()\n (?<tuple>(?:[^()]|\\(\\g<tuple>\\))*)\n (\\))\n)\\s*\n(=>)",
48044804
"beginCaptures": {
48054805
"1": {
48064806
"patterns": [
@@ -4814,59 +4814,69 @@
48144814
"name": "entity.name.variable.parameter.cs"
48154815
},
48164816
"3": {
4817-
"name": "keyword.operator.arrow.cs"
4818-
}
4819-
},
4820-
"end": "(?=\\)|;|}|,)",
4821-
"patterns": [
4822-
{
4823-
"include": "#block"
4824-
},
4825-
{
4826-
"include": "#ref-modifier"
4817+
"name": "punctuation.parenthesis.open.cs"
48274818
},
4828-
{
4829-
"include": "#expression"
4830-
}
4831-
]
4832-
},
4833-
{
4834-
"begin": "(?x)\n((?:\\b(?:async|static)\\b\\s*)*)\n(?<tuple>\n \\(\n (?:[^()]|\\g<tuple>)*\n \\)\n)\\s*\n(=>)",
4835-
"beginCaptures": {
4836-
"1": {
4819+
"4": {
48374820
"patterns": [
48384821
{
4839-
"match": "async|static",
4840-
"name": "storage.modifier.$0.cs"
4841-
}
4842-
]
4843-
},
4844-
"2": {
4845-
"patterns": [
4822+
"include": "#comment"
4823+
},
4824+
{
4825+
"include": "#explicit-anonymous-function-parameter"
4826+
},
48464827
{
4847-
"include": "#lambda-parameter-list"
4828+
"include": "#implicit-anonymous-function-parameter"
4829+
},
4830+
{
4831+
"include": "#default-argument"
4832+
},
4833+
{
4834+
"include": "#punctuation-comma"
48484835
}
48494836
]
48504837
},
4851-
"3": {
4838+
"5": {
4839+
"name": "punctuation.parenthesis.close.cs"
4840+
},
4841+
"6": {
48524842
"name": "keyword.operator.arrow.cs"
48534843
}
48544844
},
4855-
"end": "(?=\\)|;|}|,)",
4845+
"end": "(?=[,;)}])",
48564846
"patterns": [
48574847
{
4858-
"include": "#block"
4848+
"include": "#intrusive"
48594849
},
48604850
{
4861-
"include": "#ref-modifier"
4851+
"begin": "(?={)",
4852+
"end": "(?=[,;)}])",
4853+
"patterns": [
4854+
{
4855+
"include": "#block"
4856+
},
4857+
{
4858+
"include": "#intrusive"
4859+
}
4860+
]
48624861
},
48634862
{
4864-
"include": "#expression"
4863+
"begin": "\\b(ref)\\b|(?=\\S)",
4864+
"beginCaptures": {
4865+
"1": {
4866+
"name": "storage.modifier.ref.cs"
4867+
}
4868+
},
4869+
"end": "(?=[,;)}])",
4870+
"patterns": [
4871+
{
4872+
"include": "#expression"
4873+
}
4874+
]
48654875
}
48664876
]
48674877
},
48684878
{
4869-
"begin": "(?x)\n((?:\\b(?:async|static)\\b\\s*)*)\n(?:\\b(delegate)\\b\\s*)",
4879+
"begin": "(?x)\n((?:\\b(?:async|static)\\b\\s*)*)\n\\b(delegate)\\b\\s*",
48704880
"beginCaptures": {
48714881
"1": {
48724882
"patterns": [
@@ -4880,10 +4890,35 @@
48804890
"name": "storage.type.delegate.cs"
48814891
}
48824892
},
4883-
"end": "(?=\\)|;|}|,)",
4893+
"end": "(?<=})|(?=[,;)}])",
48844894
"patterns": [
48854895
{
4886-
"include": "#parenthesized-parameter-list"
4896+
"include": "#intrusive"
4897+
},
4898+
{
4899+
"begin": "\\(",
4900+
"beginCaptures": {
4901+
"0": {
4902+
"name": "punctuation.parenthesis.open.cs"
4903+
}
4904+
},
4905+
"end": "\\)",
4906+
"endCaptures": {
4907+
"0": {
4908+
"name": "punctuation.parenthesis.close.cs"
4909+
}
4910+
},
4911+
"patterns": [
4912+
{
4913+
"include": "#intrusive"
4914+
},
4915+
{
4916+
"include": "#explicit-anonymous-function-parameter"
4917+
},
4918+
{
4919+
"include": "#punctuation-comma"
4920+
}
4921+
]
48874922
},
48884923
{
48894924
"include": "#block"
@@ -4892,36 +4927,8 @@
48924927
}
48934928
]
48944929
},
4895-
"lambda-parameter-list": {
4896-
"begin": "\\(",
4897-
"beginCaptures": {
4898-
"0": {
4899-
"name": "punctuation.parenthesis.open.cs"
4900-
}
4901-
},
4902-
"end": "\\)",
4903-
"endCaptures": {
4904-
"0": {
4905-
"name": "punctuation.parenthesis.close.cs"
4906-
}
4907-
},
4908-
"patterns": [
4909-
{
4910-
"include": "#comment"
4911-
},
4912-
{
4913-
"include": "#attribute-section"
4914-
},
4915-
{
4916-
"include": "#lambda-parameter"
4917-
},
4918-
{
4919-
"include": "#punctuation-comma"
4920-
}
4921-
]
4922-
},
4923-
"lambda-parameter": {
4924-
"match": "(?x)\n(?:\\b(ref|out|in)\\b)?\\s*\n(?:(?<type_name>\n (?:\n (?:\n (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n (?<name_and_type_args> # identifier + type arguments (if any)\n \\g<identifier>\\s*\n (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n )\n (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n )\n (?:\\s*\\?\\s*)? # nullable suffix?\n (?:\\s* # array suffix?\n \\[\n (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n \\]\n \\s*\n (?:\\?)? # arrays can be nullable reference types\n \\s*\n )*\n )\n)\\s+)?\n(\\g<identifier>)\\b\\s*\n(?=[,)])",
4930+
"explicit-anonymous-function-parameter": {
4931+
"match": "(?x)\n(?:\\b(ref|params|out|in)\\b\\s*)?\n(?<type_name>\n (?:\n (?:\n (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n (?<name_and_type_args> # identifier + type arguments (if any)\n \\g<identifier>\\s*\n (?<type_args><(?:[^<>]|\\g<type_args>)*>\\s*)?\n )\n (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n (?<tuple>\\s*\\((?:[^()]|\\g<tuple>)*\\))\n )\n (?:\\s*\\?\\s*)? # nullable suffix?\n (?:\\s* # array suffix?\n \\[\n (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n \\]\n \\s*\n (?:\\?)? # arrays can be nullable reference types\n \\s*\n )*\n )\n)\\s*\n\\b(\\g<identifier>)\\b",
49254932
"captures": {
49264933
"1": {
49274934
"name": "storage.modifier.$1.cs"
@@ -4938,6 +4945,24 @@
49384945
}
49394946
}
49404947
},
4948+
"implicit-anonymous-function-parameter": {
4949+
"match": "\\@?[_[:alpha:]][_[:alnum:]]*\\b",
4950+
"name": "entity.name.variable.parameter.cs"
4951+
},
4952+
"default-argument": {
4953+
"begin": "=",
4954+
"beginCaptures": {
4955+
"0": {
4956+
"name": "keyword.operator.assignment.cs"
4957+
}
4958+
},
4959+
"end": "(?=,|\\))",
4960+
"patterns": [
4961+
{
4962+
"include": "#expression"
4963+
}
4964+
]
4965+
},
49414966
"type": {
49424967
"patterns": [
49434968
{

‎extensions/dart/cgmanifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "dart-lang/dart-syntax-highlight",
88
"repositoryUrl": "https://github.com/dart-lang/dart-syntax-highlight",
9-
"commitHash": "4670ad8a1f742ccfb122c2b01e588af78f3fc120"
9+
"commitHash": "bd0079ba7ca85cdd6400a8a467e532b539d0f285"
1010
}
1111
},
1212
"licenseDetail": [

‎extensions/dart/syntaxes/dart.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/dart-lang/dart-syntax-highlight/commit/4670ad8a1f742ccfb122c2b01e588af78f3fc120",
7+
"version": "https://github.com/dart-lang/dart-syntax-highlight/commit/bd0079ba7ca85cdd6400a8a467e532b539d0f285",
88
"name": "Dart",
99
"scopeName": "source.dart",
1010
"patterns": [
@@ -332,7 +332,7 @@
332332
},
333333
{
334334
"name": "keyword.declaration.dart",
335-
"match": "(?<!\\$)\\b(abstract|sealed|base|interface|inline class|class|enum|extends|extension|external|factory|implements|get(?!\\()|mixin|native|operator|set(?!\\()|typedef|with|covariant)\\b(?!\\$)"
335+
"match": "(?<!\\$)\\b(abstract|sealed|base|interface|class|enum|extends|extension type|extension|external|factory|implements|get(?!\\()|mixin|native|operator|set(?!\\()|typedef|with|covariant)\\b(?!\\$)"
336336
},
337337
{
338338
"name": "storage.modifier.dart",

‎extensions/julia/cgmanifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "JuliaEditorSupport/atom-language-julia",
88
"repositoryUrl": "https://github.com/JuliaEditorSupport/atom-language-julia",
9-
"commitHash": "7cbe6a7c4f2c8275e15f5b6e0722d285730ffb99"
9+
"commitHash": "85cf3ef2ddcb7bc9b2b17b2a5f1fc664e1f1e718"
1010
}
1111
},
1212
"license": "MIT",

‎extensions/julia/syntaxes/julia.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/JuliaEditorSupport/atom-language-julia/commit/7cbe6a7c4f2c8275e15f5b6e0722d285730ffb99",
7+
"version": "https://github.com/JuliaEditorSupport/atom-language-julia/commit/85cf3ef2ddcb7bc9b2b17b2a5f1fc664e1f1e718",
88
"name": "Julia",
99
"scopeName": "source.julia",
1010
"comment": "This grammar is used by Atom (Oniguruma), GitHub (PCRE), and VSCode (Oniguruma),\nso all regexps must be compatible with both engines.\n\nSpecs:\n- https://github.com/kkos/oniguruma/blob/master/doc/RE\n- https://www.pcre.org/current/doc/html/",
@@ -237,7 +237,7 @@
237237
}
238238
},
239239
"match": "((?:[[:alpha:]_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{So}←-⇿])(?:[[:word:]_!\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Sc}⅀-⅄∿⊾⊿⊤⊥∂∅-∇∎∏∐∑∞∟∫-∳⋀-⋃◸-◿♯⟘⟙⟀⟁⦰-⦴⨀-⨆⨉-⨖⨛⨜𝛁𝛛𝛻𝜕𝜵𝝏𝝯𝞉𝞩𝟃ⁱ-⁾₁-₎∠-∢⦛-⦯℘℮゛-゜𝟎-𝟡]|[^\\P{Mn}\u0001-¡]|[^\\P{Mc}\u0001-¡]|[^\\P{Nd}\u0001-¡]|[^\\P{Pc}\u0001-¡]|[^\\P{Sk}\u0001-¡]|[^\\P{Me}\u0001-¡]|[^\\P{No}\u0001-¡]|[′-‷⁗]|[^\\P{So}←-⇿])*)({(?:[^{}]|{(?:[^{}]|{[^{}]*})*})*})?(?=\\([^#]*\\)(::[^\\s]+)?(\\s*\\bwhere\\b\\s+.+?)?\\s*?=(?![=>]))",
240-
"comment": "first group is function name\nSecond group is type parameters (e.g. {T<:Number, S})\nThen open parens\nThen a lookahead ensures that we are followed by:\n - anything (function argumnets)\n - 0 or more spaces\n - Finally an equal sign\nNegative lookahead ensures we don't have another equal sign (not `==`)"
240+
"comment": "first group is function name\nSecond group is type parameters (e.g. {T<:Number, S})\nThen open parens\nThen a lookahead ensures that we are followed by:\n - anything (function arguments)\n - 0 or more spaces\n - Finally an equal sign\nNegative lookahead ensures we don't have another equal sign (not `==`)"
241241
},
242242
{
243243
"captures": {

‎extensions/latex/cgmanifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
"git": {
77
"name": "jlelong/vscode-latex-basics",
88
"repositoryUrl": "https://github.com/jlelong/vscode-latex-basics",
9-
"commitHash": "3ae82b457c28f0368cbbb47024b0245ef1ff3d33"
9+
"commitHash": "221a2443a5e8ac029685a0f872af39b23cc2b634"
1010
}
1111
},
1212
"license": "MIT",
13-
"version": "1.5.2",
13+
"version": "1.5.4",
1414
"description": "The files in syntaxes/ were originally part of https://github.com/James-Yu/LaTeX-Workshop. They have been extracted in the hope that they can useful outside of the LaTeX-Workshop extension.",
1515
"licenseDetail": [
1616
"Copyright (c) vscode-latex-basics authors",

‎extensions/latex/syntaxes/LaTeX.tmLanguage.json‎

Lines changed: 17 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/jlelong/vscode-latex-basics/commit/66ea1422ac817ff7704359b8ec4934a987024aaa",
7+
"version": "https://github.com/jlelong/vscode-latex-basics/commit/221a2443a5e8ac029685a0f872af39b23cc2b634",
88
"name": "LaTeX",
99
"scopeName": "text.tex.latex",
1010
"patterns": [
@@ -2071,7 +2071,22 @@
20712071
]
20722072
},
20732073
{
2074-
"begin": "(?<!\\\\)(\\`\\`)",
2074+
"begin": "(,,)",
2075+
"beginCaptures": {
2076+
"1": {
2077+
"name": "punctuation.definition.string.begin.latex"
2078+
}
2079+
},
2080+
"end": "(?<!\\\\)(\\`\\`)",
2081+
"endCaptures": {
2082+
"1": {
2083+
"name": "punctuation.definition.string.end.latex"
2084+
}
2085+
},
2086+
"name": "string.quoted.double.latex"
2087+
},
2088+
{
2089+
"begin": "(?<!\\\\|\\\\catcode|\\\\string)(\\`\\`)",
20752090
"beginCaptures": {
20762091
"1": {
20772092
"name": "punctuation.definition.string.begin.latex"

0 commit comments

Comments
 (0)