Skip to content

Commit

Permalink
Update grammars (#189172)
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexr00
alexr00 authored Jul 28, 2023
1 parent a1c783c commit 41c7fc3
Show file tree
Hide file tree
Showing 10 changed files with 41 additions and 16 deletions.
2 changes: 1 addition & 1 deletion extensions/csharp/cgmanifest.json
View file
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": "878aefe73f942ac68dc4a46a0f154661bcb9eff4"
"commitHash": "772323937fedd65c6dc1c8ce6ea41d97415ed7d1"
}
},
"license": "MIT",
Expand Down
18 changes: 16 additions & 2 deletions extensions/csharp/syntaxes/csharp.tmLanguage.json
View file
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/878aefe73f942ac68dc4a46a0f154661bcb9eff4",
"version": "https://github.com/dotnet/csharp-tmLanguage/commit/772323937fedd65c6dc1c8ce6ea41d97415ed7d1",
"name": "C#",
"scopeName": "source.cs",
"patterns": [
Expand Down Expand Up @@ -286,6 +286,9 @@
{
"include": "#nameof-expression"
},
{
"include": "#default-literal-expression"
},
{
"include": "#throw-expression"
},
Expand All @@ -298,6 +301,9 @@
{
"include": "#verbatim-interpolated-string"
},
{
"include": "#type-builtin"
},
{
"include": "#this-or-base-expression"
},
Expand Down Expand Up @@ -2733,6 +2739,14 @@
}
]
},
"default-literal-expression": {
"match": "(?<!\\.)\\b(default)\\b",
"captures": {
"1": {
"name": "keyword.other.default.cs"
}
}
},
"throw-expression": {
"match": "(?<!\\.)\\b(throw)\\b",
"captures": {
Expand Down Expand Up @@ -3673,7 +3687,7 @@
]
},
"object-creation-expression-with-parameters": {
"begin": "(?x)\n(new)\\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(?=\\()",
"begin": "(?x)\n(new)(?:\\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(?=\\()",
"beginCaptures": {
"1": {
"name": "keyword.other.new.cs"
Expand Down
2 changes: 1 addition & 1 deletion extensions/fsharp/cgmanifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"git": {
"name": "ionide/ionide-fsgrammar",
"repositoryUrl": "https://github.com/ionide/ionide-fsgrammar",
"commitHash": "71b1ead8c99715f6c994115ebab7ee4a14cf0c59"
"commitHash": "8740e610a367c5e3f15be716acc7207655ced4cf"
}
},
"license": "MIT",
Expand Down
6 changes: 3 additions & 3 deletions extensions/fsharp/syntaxes/fsharp.tmLanguage.json
View file
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/ionide/ionide-fsgrammar/commit/71b1ead8c99715f6c994115ebab7ee4a14cf0c59",
"version": "https://github.com/ionide/ionide-fsgrammar/commit/8740e610a367c5e3f15be716acc7207655ced4cf",
"name": "fsharp",
"scopeName": "source.fsharp",
"patterns": [
Expand Down Expand Up @@ -314,7 +314,7 @@
},
{
"match": "(?!when|and|or\\b)\\b([\\w0-9'`^._]+)",
"comments": "Here we need the \\w modifier in order to check that the words isn't blacklisted",
"comments": "Here we need the \\w modifier in order to check that the words are allowed",
"captures": {
"1": {
"name": "entity.name.type.fsharp"
Expand Down Expand Up @@ -1832,4 +1832,4 @@
]
}
}
}
}
4 changes: 2 additions & 2 deletions extensions/java/cgmanifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"git": {
"name": "redhat-developer/vscode-java",
"repositoryUrl": "https://github.com/redhat-developer/vscode-java",
"commitHash": "7a770ab6750b4b09173d98de14eb9792e3432b36"
"commitHash": "5fb57e8e1c5d776b21be13cd7227b25b87edf4a6"
}
},
"license": "MIT",
Expand Down Expand Up @@ -48,4 +48,4 @@
}
],
"version": 1
}
}
13 changes: 12 additions & 1 deletion extensions/java/syntaxes/java.tmLanguage.json
View file
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/redhat-developer/vscode-java/commit/7a770ab6750b4b09173d98de14eb9792e3432b36",
"version": "https://github.com/redhat-developer/vscode-java/commit/5fb57e8e1c5d776b21be13cd7227b25b87edf4a6",
"name": "Java",
"scopeName": "source.java",
"patterns": [
Expand Down Expand Up @@ -1378,6 +1378,17 @@
},
"properties": {
"patterns": [
{
"match": "(\\.)\\s*(new)",
"captures": {
"1": {
"name": "punctuation.separator.period.java"
},
"2": {
"name": "keyword.control.new.java"
}
}
},
{
"match": "(\\.)\\s*([a-zA-Z_$][\\w$]*)(?=\\s*\\.\\s*[a-zA-Z_$][\\w$]*)",
"captures": {
Expand Down
2 changes: 1 addition & 1 deletion extensions/latex/cgmanifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"git": {
"name": "jlelong/vscode-latex-basics",
"repositoryUrl": "https://github.com/jlelong/vscode-latex-basics",
"commitHash": "30adbfae9dcb0a6477584247ac477f13845d1f5f"
"commitHash": "30d04562e592305b6f6d41a539b3ccf326888aaf"
}
},
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions extensions/latex/syntaxes/LaTeX.tmLanguage.json
View file
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/30adbfae9dcb0a6477584247ac477f13845d1f5f",
"version": "https://github.com/jlelong/vscode-latex-basics/commit/30d04562e592305b6f6d41a539b3ccf326888aaf",
"name": "LaTeX",
"scopeName": "text.tex.latex",
"patterns": [
Expand Down Expand Up @@ -1337,7 +1337,7 @@
]
},
{
"begin": "(\\s*\\\\begin\\{(tabular[xy*]?|xltabular|longtable|(?:long)?tabu|(?:long|tall)?tblr|NiceTabular[X*]?)\\}(\\s*\\n)?)",
"begin": "(\\s*\\\\begin\\{(tabular[xy*]?|xltabular|longtable|(?:long)?tabu|(?:long|tall)?tblr|NiceTabular[X*]?|booktabs)\\}(\\s*\\n)?)",
"captures": {
"1": {
"patterns": [
Expand Down
2 changes: 1 addition & 1 deletion extensions/sql/cgmanifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"git": {
"name": "microsoft/vscode-mssql",
"repositoryUrl": "https://github.com/microsoft/vscode-mssql",
"commitHash": "cb5940297a8cef76daaf4a6b63c4968c9a12d17a"
"commitHash": "9cb3529a978ddf599bf5bdd228f21bbcfe2914f5"
}
},
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions extensions/sql/syntaxes/sql.tmLanguage.json
View file

Large diffs are not rendered by default.

0 comments on commit 41c7fc3

Please sign in to comment.