development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-13 13:46:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to latest C# TextMate grammar

Browse source 
This fixes several syntax highlighting issues:

* Parameters with a multi-dimensional array type does not break matching the rest of the parameter list.
* Ensure that the closing brace of an anonymous object does not break matching further rules.
* Ensure that throw expressions allow matching nested expressions.
* Allow expression-bodied methods with generic constraints.
This commit is contained in:
Dustin Campbell 2017-12-12 10:13:28 -08:00
parent 14a1996a22
commit 7b18e67e7a
1 changed files with 32 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
extensions/csharp/syntaxes/csharp.tmLanguage.json
View file

@ -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/436456ee5ce44e29cb1752c3b29f493b1de08c42",
"version": "https://github.com/dotnet/csharp-tmLanguage/commit/a334939a6493290f874264712447107bc9545835",
"name": "C#",
"scopeName": "source.cs",
"fileTypes": [
@ -935,7 +935,7 @@
"name": "punctuation.separator.colon.cs"
}
},
"end": "(?=\\{|where|;)",
"end": "(?=\\{|where|;|=>)",
"patterns": [
{
"name": "keyword.other.class.cs",
@ -2438,18 +2438,12 @@
]
},
"throw-expression": {
"begin": "(?<!\\.)\\b(throw)\\b",
"beginCaptures": {
"match": "(?<!\\.)\\b(throw)\\b",
"captures": {
"1": {
"name": "keyword.control.flow.throw.cs"
}
},
"end": "(?=;)",
"patterns": [
{
"include": "#expression"
}
]
}
},
"interpolated-string": {
"name": "string.quoted.double.cs",
@ -3055,7 +3049,7 @@
"name": "keyword.other.new.cs"
}
},
"end": "(?=\\)|;|})",
"end": "(?<=\\})",
"patterns": [
{
"include": "#initializer-expression"
@ -3087,25 +3081,13 @@
"include": "#attribute-section"
},
{
"name": "storage.modifier.cs",
"match": "\\b(ref|params|out)\\b"
},
{
"match": "\\s+([_[:alpha:]][_[:alnum:]]*)\\s*(?=[=,\\]])",
"captures": {
"1": {
"name": "entity.name.variable.parameter.cs"
}
}
},
{
"include": "#variable-initializer"
},
{
"include": "#type"
"include": "#parameter"
},
{
"include": "#punctuation-comma"
},
{
"include": "#variable-initializer"
}
]
}
@ -3132,28 +3114,34 @@
"include": "#attribute-section"
},
{
"name": "storage.modifier.cs",
"match": "\\b(ref|params|out|this)\\b"
},
{
"match": "\\b([_[:alpha:]][_[:alnum:]]*)\\s*(?=[=,)])",
"captures": {
"1": {
"name": "entity.name.variable.parameter.cs"
}
}
},
{
"include": "#variable-initializer"
},
{
"include": "#type"
"include": "#parameter"
},
{
"include": "#punctuation-comma"
},
{
"include": "#variable-initializer"
}
]
},
"parameter": {
"match": "(?x)\n(?:(?:\\b(ref|params|out|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*)* # pointer suffix?\n (?:\\s*\\?\\s*)? # nullable suffix?\n (?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)* # array suffix?\n )\n)\\s+\n(\\g<identifier>)",
"captures": {
"1": {
"name": "storage.modifier.cs"
},
"2": {
"patterns": [
{
"include": "#type"
}
]
},
"7": {
"name": "entity.name.variable.parameter.cs"
}
}
},
"argument-list": {
"begin": "\\(",
"beginCaptures": {