Skip to content

Update grammars #194614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 2, 2023
Merged

Update grammars #194614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extensions/cpp/cgmanifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,4 @@
}
],
"version": 1
}
}
2 changes: 1 addition & 1 deletion extensions/csharp/cgmanifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"git": {
"name": "dotnet/csharp-tmLanguage",
"repositoryUrl": "https://github.com/dotnet/csharp-tmLanguage",
"commitHash": "525e628edad54c0f7aa15b015310df240803ea66"
"commitHash": "29a37e5e2d66deefe5a06afad793a820871f4fdf"
}
},
"license": "MIT",
Expand Down
161 changes: 93 additions & 68 deletions extensions/csharp/syntaxes/csharp.tmLanguage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/dotnet/csharp-tmLanguage/commit/525e628edad54c0f7aa15b015310df240803ea66",
"version": "https://github.com/dotnet/csharp-tmLanguage/commit/29a37e5e2d66deefe5a06afad793a820871f4fdf",
"name": "C#",
"scopeName": "source.cs",
"patterns": [
Expand Down Expand Up @@ -4437,7 +4437,7 @@
]
},
"parameter": {
"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>)",
"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>)",
"captures": {
"1": {
"name": "storage.modifier.$1.cs"
Expand Down Expand Up @@ -4800,7 +4800,7 @@
"anonymous-method-expression": {
"patterns": [
{
"begin": "(?x)\n((?:\\b(?:async|static)\\b\\s*)*)\n(@?[_[:alpha:]][_[:alnum:]]*)\\b\\s*\n(=>)",
"begin": "(?x)\n((?:\\b(?:async|static)\\b\\s*)*)\n(?:\n (@?[_[:alpha:]][_[:alnum:]]*)\\b|\n (\\()\n (?<tuple>(?:[^()]|\\(\\g<tuple>\\))*)\n (\\))\n)\\s*\n(=>)",
"beginCaptures": {
"1": {
"patterns": [
Expand All @@ -4814,59 +4814,69 @@
"name": "entity.name.variable.parameter.cs"
},
"3": {
"name": "keyword.operator.arrow.cs"
}
},
"end": "(?=\\)|;|}|,)",
"patterns": [
{
"include": "#block"
},
{
"include": "#ref-modifier"
"name": "punctuation.parenthesis.open.cs"
},
{
"include": "#expression"
}
]
},
{
"begin": "(?x)\n((?:\\b(?:async|static)\\b\\s*)*)\n(?<tuple>\n \\(\n (?:[^()]|\\g<tuple>)*\n \\)\n)\\s*\n(=>)",
"beginCaptures": {
"1": {
"4": {
"patterns": [
{
"match": "async|static",
"name": "storage.modifier.$0.cs"
}
]
},
"2": {
"patterns": [
"include": "#comment"
},
{
"include": "#explicit-anonymous-function-parameter"
},
{
"include": "#lambda-parameter-list"
"include": "#implicit-anonymous-function-parameter"
},
{
"include": "#default-argument"
},
{
"include": "#punctuation-comma"
}
]
},
"3": {
"5": {
"name": "punctuation.parenthesis.close.cs"
},
"6": {
"name": "keyword.operator.arrow.cs"
}
},
"end": "(?=\\)|;|}|,)",
"end": "(?=[,;)}])",
"patterns": [
{
"include": "#block"
"include": "#intrusive"
},
{
"include": "#ref-modifier"
"begin": "(?={)",
"end": "(?=[,;)}])",
"patterns": [
{
"include": "#block"
},
{
"include": "#intrusive"
}
]
},
{
"include": "#expression"
"begin": "\\b(ref)\\b|(?=\\S)",
"beginCaptures": {
"1": {
"name": "storage.modifier.ref.cs"
}
},
"end": "(?=[,;)}])",
"patterns": [
{
"include": "#expression"
}
]
}
]
},
{
"begin": "(?x)\n((?:\\b(?:async|static)\\b\\s*)*)\n(?:\\b(delegate)\\b\\s*)",
"begin": "(?x)\n((?:\\b(?:async|static)\\b\\s*)*)\n\\b(delegate)\\b\\s*",
"beginCaptures": {
"1": {
"patterns": [
Expand All @@ -4880,10 +4890,35 @@
"name": "storage.type.delegate.cs"
}
},
"end": "(?=\\)|;|}|,)",
"end": "(?<=})|(?=[,;)}])",
"patterns": [
{
"include": "#parenthesized-parameter-list"
"include": "#intrusive"
},
{
"begin": "\\(",
"beginCaptures": {
"0": {
"name": "punctuation.parenthesis.open.cs"
}
},
"end": "\\)",
"endCaptures": {
"0": {
"name": "punctuation.parenthesis.close.cs"
}
},
"patterns": [
{
"include": "#intrusive"
},
{
"include": "#explicit-anonymous-function-parameter"
},
{
"include": "#punctuation-comma"
}
]
},
{
"include": "#block"
Expand All @@ -4892,36 +4927,8 @@
}
]
},
"lambda-parameter-list": {
"begin": "\\(",
"beginCaptures": {
"0": {
"name": "punctuation.parenthesis.open.cs"
}
},
"end": "\\)",
"endCaptures": {
"0": {
"name": "punctuation.parenthesis.close.cs"
}
},
"patterns": [
{
"include": "#comment"
},
{
"include": "#attribute-section"
},
{
"include": "#lambda-parameter"
},
{
"include": "#punctuation-comma"
}
]
},
"lambda-parameter": {
"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(?=[,)])",
"explicit-anonymous-function-parameter": {
"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",
"captures": {
"1": {
"name": "storage.modifier.$1.cs"
Expand All @@ -4938,6 +4945,24 @@
}
}
},
"implicit-anonymous-function-parameter": {
"match": "\\@?[_[:alpha:]][_[:alnum:]]*\\b",
"name": "entity.name.variable.parameter.cs"
},
"default-argument": {
"begin": "=",
"beginCaptures": {
"0": {
"name": "keyword.operator.assignment.cs"
}
},
"end": "(?=,|\\))",
"patterns": [
{
"include": "#expression"
}
]
},
"type": {
"patterns": [
{
Expand Down
2 changes: 1 addition & 1 deletion extensions/dart/cgmanifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"git": {
"name": "dart-lang/dart-syntax-highlight",
"repositoryUrl": "https://github.com/dart-lang/dart-syntax-highlight",
"commitHash": "4670ad8a1f742ccfb122c2b01e588af78f3fc120"
"commitHash": "bd0079ba7ca85cdd6400a8a467e532b539d0f285"
}
},
"licenseDetail": [
Expand Down
4 changes: 2 additions & 2 deletions extensions/dart/syntaxes/dart.tmLanguage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/dart-lang/dart-syntax-highlight/commit/4670ad8a1f742ccfb122c2b01e588af78f3fc120",
"version": "https://github.com/dart-lang/dart-syntax-highlight/commit/bd0079ba7ca85cdd6400a8a467e532b539d0f285",
"name": "Dart",
"scopeName": "source.dart",
"patterns": [
Expand Down Expand Up @@ -332,7 +332,7 @@
},
{
"name": "keyword.declaration.dart",
"match": "(?<!\\$)\\b(abstract|sealed|base|interface|inline class|class|enum|extends|extension|external|factory|implements|get(?!\\()|mixin|native|operator|set(?!\\()|typedef|with|covariant)\\b(?!\\$)"
"match": "(?<!\\$)\\b(abstract|sealed|base|interface|class|enum|extends|extension type|extension|external|factory|implements|get(?!\\()|mixin|native|operator|set(?!\\()|typedef|with|covariant)\\b(?!\\$)"
},
{
"name": "storage.modifier.dart",
Expand Down
2 changes: 1 addition & 1 deletion extensions/julia/cgmanifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"git": {
"name": "JuliaEditorSupport/atom-language-julia",
"repositoryUrl": "https://github.com/JuliaEditorSupport/atom-language-julia",
"commitHash": "7cbe6a7c4f2c8275e15f5b6e0722d285730ffb99"
"commitHash": "85cf3ef2ddcb7bc9b2b17b2a5f1fc664e1f1e718"
}
},
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions extensions/julia/syntaxes/julia.tmLanguage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/JuliaEditorSupport/atom-language-julia/commit/7cbe6a7c4f2c8275e15f5b6e0722d285730ffb99",
"version": "https://github.com/JuliaEditorSupport/atom-language-julia/commit/85cf3ef2ddcb7bc9b2b17b2a5f1fc664e1f1e718",
"name": "Julia",
"scopeName": "source.julia",
"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/",
Expand Down Expand Up @@ -237,7 +237,7 @@
}
},
"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*?=(?![=>]))",
"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 `==`)"
"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 `==`)"
},
{
"captures": {
Expand Down
4 changes: 2 additions & 2 deletions extensions/latex/cgmanifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
"git": {
"name": "jlelong/vscode-latex-basics",
"repositoryUrl": "https://github.com/jlelong/vscode-latex-basics",
"commitHash": "3ae82b457c28f0368cbbb47024b0245ef1ff3d33"
"commitHash": "221a2443a5e8ac029685a0f872af39b23cc2b634"
}
},
"license": "MIT",
"version": "1.5.2",
"version": "1.5.4",
"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.",
"licenseDetail": [
"Copyright (c) vscode-latex-basics authors",
Expand Down
19 changes: 17 additions & 2 deletions extensions/latex/syntaxes/LaTeX.tmLanguage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/jlelong/vscode-latex-basics/commit/66ea1422ac817ff7704359b8ec4934a987024aaa",
"version": "https://github.com/jlelong/vscode-latex-basics/commit/221a2443a5e8ac029685a0f872af39b23cc2b634",
"name": "LaTeX",
"scopeName": "text.tex.latex",
"patterns": [
Expand Down Expand Up @@ -2071,7 +2071,22 @@
]
},
{
"begin": "(?<!\\\\)(\\`\\`)",
"begin": "(,,)",
"beginCaptures": {
"1": {
"name": "punctuation.definition.string.begin.latex"
}
},
"end": "(?<!\\\\)(\\`\\`)",
"endCaptures": {
"1": {
"name": "punctuation.definition.string.end.latex"
}
},
"name": "string.quoted.double.latex"
},
{
"begin": "(?<!\\\\|\\\\catcode|\\\\string)(\\`\\`)",
"beginCaptures": {
"1": {
"name": "punctuation.definition.string.begin.latex"
Expand Down
Loading