tm-grammars 1.22.19 → 1.23.0

package/grammars/csharp.json

@@ -29,7 +29,7 @@
             }
           },
           "contentName": "meta.accessor.getter.cs",
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.curlybrace.close.cs"
@@ -57,7 +57,7 @@
         }
       },
       "contentName": "meta.accessor.getter.cs",
-      "end": "(?=;|\\})",
+      "end": "(?=[;}])",
       "patterns": [
         {
           "include": "#ref-modifier"
@@ -77,7 +77,7 @@
             }
           },
           "contentName": "meta.accessor.setter.cs",
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.curlybrace.close.cs"
@@ -97,7 +97,7 @@
             }
           },
           "contentName": "meta.accessor.setter.cs",
-          "end": "(?=;|\\})",
+          "end": "(?=[;}])",
           "patterns": [
             {
               "include": "#ref-modifier"
@@ -163,7 +163,7 @@
               "include": "#intrusive"
             },
             {
-              "begin": "(?={)",
+              "begin": "(?=\\{)",
               "end": "(?=[,;)}])",
               "patterns": [
                 {
@@ -249,7 +249,7 @@
           "name": "keyword.operator.expression.new.cs"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "include": "#comment"
@@ -272,7 +272,7 @@
               "name": "storage.modifier.out.cs"
             }
           },
-          "end": "(?=,|\\)|\\])",
+          "end": "(?=[,)\\]])",
           "patterns": [
             {
               "include": "#declaration-expression-local"
@@ -313,7 +313,7 @@
       ]
     },
     "array-creation-expression": {
-      "begin": "\\b(new|stackalloc)\\b\\s*(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))?\\s*(?=\\[)",
+      "begin": "\\b(new|stackalloc)\\b\\s*(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)?\\s*(?=\\[)",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.expression.$1.cs"
@@ -326,7 +326,7 @@
           ]
         }
       },
-      "end": "(?<=\\])",
+      "end": "(?<=])",
       "patterns": [
         {
           "include": "#bracketed-argument-list"
@@ -346,10 +346,10 @@
           ]
         }
       },
-      "match": "(?<!\\.)\\b(as)\\b\\s*(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?(?!\\?))?(?:\\s*\\[\\s*(?:,\\s*)*\\](?:\\s*\\?(?!\\?))?)*))?"
+      "match": "(?<!\\.)\\b(as)\\b\\s*(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?(?!\\?))?(?:\\s*\\[\\s*(?:,\\s*)*](?:\\s*\\?(?!\\?))?)*)?"
     },
     "assignment-expression": {
-      "begin": "(?:\\*|/|%|\\+|-|\\?\\?|\\&|\\^|<<|>>>?|\\|)?=(?!=|>)",
+      "begin": "(?:[*/%+\\-]|\\?\\?|[\\&\\^]|<<|>>>?|\\|)?=(?![=>])",
       "beginCaptures": {
         "0": {
           "patterns": [
@@ -359,7 +359,7 @@
           ]
         }
       },
-      "end": "(?=[,\\)\\];}])",
+      "end": "(?=[,)\\];}])",
       "patterns": [
         {
           "include": "#ref-modifier"
@@ -376,11 +376,11 @@
           "name": "keyword.operator.assignment.compound.cs"
         },
         {
-          "match": "\\&=|\\^=|<<=|>>>?=|\\|=",
+          "match": "&=|\\^=|<<=|>>>?=|\\|=",
           "name": "keyword.operator.assignment.compound.bitwise.cs"
         },
         {
-          "match": "\\=",
+          "match": "=",
           "name": "keyword.operator.assignment.cs"
         }
       ]
@@ -430,7 +430,7 @@
           "name": "entity.name.variable.property.cs"
         }
       },
-      "end": "(?=(,|\\)))",
+      "end": "(?=([,)]))",
       "patterns": [
         {
           "include": "#operator-assignment"
@@ -441,7 +441,7 @@
       ]
     },
     "attribute-section": {
-      "begin": "(\\[)(assembly|module|field|event|method|param|property|return|type)?(\\:)?",
+      "begin": "(\\[)(assembly|module|field|event|method|param|property|return|type)?(:)?",
       "beginCaptures": {
         "1": {
           "name": "punctuation.squarebracket.open.cs"
@@ -453,7 +453,7 @@
           "name": "punctuation.separator.colon.cs"
         }
       },
-      "end": "(\\])",
+      "end": "(])",
       "endCaptures": {
         "1": {
           "name": "punctuation.squarebracket.close.cs"
@@ -482,7 +482,7 @@
           "name": "keyword.operator.expression.await.cs"
         }
       },
-      "end": "(?<=})|(?=;|})",
+      "end": "(?<=})|(?=[;}])",
       "patterns": [
         {
           "include": "#foreach-statement"
@@ -522,7 +522,7 @@
           "name": "punctuation.curlybrace.open.cs"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.curlybrace.close.cs"
@@ -553,7 +553,7 @@
           "name": "punctuation.squarebracket.open.cs"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.squarebracket.close.cs"
@@ -578,7 +578,7 @@
           "name": "punctuation.squarebracket.open.cs"
         }
       },
-      "end": "(?=(\\]))",
+      "end": "(?=(]))",
       "endCaptures": {
         "1": {
           "name": "punctuation.squarebracket.close.cs"
@@ -587,7 +587,7 @@
       "patterns": [
         {
           "begin": "(?<=\\[)",
-          "end": "(?=\\])",
+          "end": "(?=])",
           "patterns": [
             {
               "include": "#comment"
@@ -638,7 +638,7 @@
           "name": "punctuation.parenthesis.close.cs"
         }
       },
-      "match": "(\\()\\s*(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))\\s*(\\))(?=\\s*-*!*@?[_[:alnum:]\\(])"
+      "match": "(\\()\\s*(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)\\s*(\\))(?=\\s*-*!*@?[_[:alnum:](])"
     },
     "casted-constant-pattern": {
       "begin": "(\\()([\\s.:@_[:alnum:]]+)(\\))(?=[\\s+\\-!~]*@?[_[:alnum:]('\"]+)",
@@ -660,7 +660,7 @@
           "name": "punctuation.parenthesis.close.cs"
         }
       },
-      "end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
+      "end": "(?=[)}\\],;:?=\\&|\\^]|!=|\\b(and|or|when)\\b)",
       "patterns": [
         {
           "include": "#casted-constant-pattern"
@@ -696,7 +696,7 @@
               "name": "punctuation.separator.coloncolon.cs"
             }
           },
-          "match": "(@?[_[:alpha:]][_[:alnum:]]*)\\s*(\\:\\:)"
+          "match": "(@?[_[:alpha:]][_[:alnum:]]*)\\s*(::)"
         },
         {
           "captures": {
@@ -710,7 +710,7 @@
           "match": "(@?[_[:alpha:]][_[:alnum:]]*)\\s*(\\.)"
         },
         {
-          "match": "\\@?[_[:alpha:]][_[:alnum:]]*",
+          "match": "@?[_[:alpha:]][_[:alnum:]]*",
           "name": "variable.other.constant.cs"
         }
       ]
@@ -722,7 +722,7 @@
           "name": "keyword.control.exception.catch.cs"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "begin": "\\(",
@@ -751,7 +751,7 @@
                   "name": "entity.name.variable.local.cs"
                 }
               },
-              "match": "(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))\\s*(?:(\\g<identifier>)\\b)?"
+              "match": "(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)\\s*(?:(\\g<identifier>)\\b)?"
             }
           ]
         },
@@ -767,7 +767,7 @@
       ]
     },
     "char-character-escape": {
-      "match": "\\\\(x[0-9a-fA-F]{1,4}|u[0-9a-fA-F]{4}|.)",
+      "match": "\\\\(x\\h{1,4}|u\\h{4}|.)",
       "name": "constant.character.escape.cs"
     },
     "char-literal": {
@@ -777,7 +777,7 @@
           "name": "punctuation.definition.char.begin.cs"
         }
       },
-      "end": "(\\')|((?:[^\\\\\\n])$)",
+      "end": "(')|([^\\\\\\n]$)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.char.end.cs"
@@ -795,7 +795,7 @@
     },
     "class-declaration": {
       "begin": "(?=(\\brecord\\b\\s+)?\\bclass\\b)",
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "begin": "(\\b(record)\\b\\s+)?\\b(class)\\b\\s+(@?[_[:alpha:]][_[:alnum:]]*)\\s*",
@@ -836,7 +836,7 @@
               "name": "punctuation.curlybrace.open.cs"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.curlybrace.close.cs"
@@ -1043,7 +1043,7 @@
     },
     "constructor-declaration": {
       "begin": "(?=@?[_[:alpha:]][_[:alnum:]]*\\s*\\()",
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "captures": {
@@ -1116,7 +1116,7 @@
       "name": "keyword.control.context.$1.cs"
     },
     "conversion-operator-declaration": {
-      "begin": "(?<explicit_or_implicit_keyword>(?:\\b(?:explicit|implicit)))\\s*(?<operator_keyword>(?:\\b(?:operator)))\\s*(?<type_name>(?:(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))\\s*(?=\\()",
+      "begin": "(?<explicit_or_implicit_keyword>\\b(?:explicit|implicit))\\s*(?<operator_keyword>\\boperator)\\s*(?<type_name>(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -1149,7 +1149,7 @@
           ]
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "include": "#comment"
@@ -1181,7 +1181,7 @@
           "name": "entity.name.variable.local.cs"
         }
       },
-      "match": "(?:\\b(var)\\b|(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*)))\\s+(\\g<identifier>)\\b\\s*(?=[,)\\]])"
+      "match": "(?:\\b(var)\\b|(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*))\\s+(\\g<identifier>)\\b\\s*(?=[,)\\]])"
     },
     "declaration-expression-tuple": {
       "captures": {
@@ -1199,7 +1199,7 @@
           "name": "entity.name.variable.tuple-element.cs"
         }
       },
-      "match": "(?:\\b(var)\\b|(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*)))\\s+(\\g<identifier>)\\b\\s*(?=[,)])"
+      "match": "(?:\\b(var)\\b|(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*))\\s+(\\g<identifier>)\\b\\s*(?=[,)])"
     },
     "declarations": {
       "patterns": [
@@ -1221,7 +1221,7 @@
           "name": "keyword.operator.assignment.cs"
         }
       },
-      "end": "(?=,|\\))",
+      "end": "(?=[,)])",
       "patterns": [
         {
           "include": "#expression"
@@ -1237,7 +1237,7 @@
       "match": "\\b(default)\\b"
     },
     "delegate-declaration": {
-      "begin": "(?:\\b(delegate)\\b)\\s+(?<type_name>(?:(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))\\s+(\\g<identifier>)\\s*(<([^<>]+)>)?\\s*(?=\\()",
+      "begin": "\\b(delegate)\\b\\s+(?<type_name>(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)\\s+(\\g<identifier>)\\s*(<([^<>]+)>)?\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "name": "storage.type.delegate.cs"
@@ -1315,7 +1315,7 @@
           "name": "entity.name.function.cs"
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "include": "#comment"
@@ -1358,7 +1358,7 @@
           "name": "keyword.control.loop.do.cs"
         }
       },
-      "end": "(?=;|})",
+      "end": "(?=[;}])",
       "patterns": [
         {
           "include": "#statement"
@@ -1366,7 +1366,7 @@
       ]
     },
     "double-raw-interpolation": {
-      "begin": "(?<=[^\\{][^\\{]|^)((?:\\{)*)(\\{\\{)(?=[^\\{])",
+      "begin": "(?<=[^{][^{]|^)(\\{*)(\\{\\{)(?=[^{])",
       "beginCaptures": {
         "1": {
           "name": "string.quoted.double.cs"
@@ -1375,7 +1375,7 @@
           "name": "punctuation.definition.interpolation.begin.cs"
         }
       },
-      "end": "\\}\\}",
+      "end": "}}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.interpolation.end.cs"
@@ -1407,7 +1407,7 @@
           "name": "keyword.operator.null-conditional.cs"
         }
       },
-      "end": "(?<=\\])(?!\\s*\\[)",
+      "end": "(?<=])(?!\\s*\\[)",
       "patterns": [
         {
           "include": "#bracketed-argument-list"
@@ -1430,11 +1430,11 @@
     },
     "enum-declaration": {
       "begin": "(?=\\benum\\b)",
-      "end": "(?<=\\})",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "begin": "(?=enum)",
-          "end": "(?=\\{)",
+          "end": "(?=\\{)|(?=;)",
           "patterns": [
             {
               "include": "#comment"
@@ -1473,7 +1473,7 @@
               "name": "punctuation.curlybrace.open.cs"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.curlybrace.close.cs"
@@ -1499,7 +1499,7 @@
                   "name": "entity.name.variable.enum-member.cs"
                 }
               },
-              "end": "(?=(,|\\}))",
+              "end": "(?=([,}]))",
               "patterns": [
                 {
                   "include": "#comment"
@@ -1526,7 +1526,7 @@
           "name": "punctuation.curlybrace.open.cs"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.curlybrace.close.cs"
@@ -1540,13 +1540,13 @@
           "include": "#attribute-section"
         },
         {
-          "begin": "\\b(add|remove)\\b\\s*(?=\\{|;|=>|//|/\\*|$)",
+          "begin": "\\b(add|remove)\\b\\s*(?=[{;]|=>|//|/\\*|$)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.accessor.$1.cs"
             }
           },
-          "end": "(?<=\\}|;)|(?=\\})",
+          "end": "(?<=[};])|(?=})",
           "patterns": [
             {
               "include": "#accessor-setter"
@@ -1556,7 +1556,7 @@
       ]
     },
     "event-declaration": {
-      "begin": "\\b(event)\\b\\s*(?<return_type>(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))\\s+)(?<interface_name>\\g<type_name>\\s*\\.\\s*)?(\\g<identifier>)\\s*(?=\\{|;|,|=|//|/\\*|$)",
+      "begin": "\\b(event)\\b\\s*(?<return_type>(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)\\s+)(?<interface_name>\\g<type_name>\\s*\\.\\s*)?(\\g<identifier>)\\s*(?=[{;,=]|//|/\\*|$)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.event.cs"
@@ -1582,7 +1582,7 @@
           "name": "entity.name.variable.event.cs"
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "include": "#comment"
@@ -1632,7 +1632,7 @@
           "name": "entity.name.variable.parameter.cs"
         }
       },
-      "match": "(?:\\b(ref|params|out|in)\\b\\s*)?(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args><(?:[^<>]|\\g<type_args>)*>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)*\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))\\s*\\b(\\g<identifier>)\\b"
+      "match": "(?:\\b(ref|params|out|in)\\b\\s*)?(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args><(?:[^<>]|\\g<type_args>)*>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)*\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)\\s*\\b(\\g<identifier>)\\b"
     },
     "expression": {
       "patterns": [
@@ -1744,7 +1744,7 @@
           "name": "keyword.operator.arrow.cs"
         }
       },
-      "end": "(?=[,\\);}])",
+      "end": "(?=[,);}])",
       "patterns": [
         {
           "include": "#ref-modifier"
@@ -1787,15 +1787,15 @@
           "name": "keyword.operator.comparison.cs"
         },
         {
-          "match": "<=|>=|<|>",
+          "match": "<=|>=|[<>]",
           "name": "keyword.operator.relational.cs"
         },
         {
-          "match": "\\!|&&|\\|\\|",
+          "match": "!|&&|\\|\\|",
           "name": "keyword.operator.logical.cs"
         },
         {
-          "match": "\\&|~|\\^|\\|",
+          "match": "[\\&~\\^|]",
           "name": "keyword.operator.bitwise.cs"
         },
         {
@@ -1807,7 +1807,7 @@
           "name": "keyword.operator.increment.cs"
         },
         {
-          "match": "\\+|-(?!>)|\\*|/|%",
+          "match": "\\+|-(?!>)|[*/%]",
           "name": "keyword.operator.arithmetic.cs"
         },
         {
@@ -1833,13 +1833,13 @@
       "end": "(?=;)",
       "patterns": [
         {
-          "match": "\\@?[_[:alpha:]][_[:alnum:]]*",
+          "match": "@?[_[:alpha:]][_[:alnum:]]*",
           "name": "variable.other.alias.cs"
         }
       ]
     },
     "field-declaration": {
-      "begin": "(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))\\s+(\\g<identifier>)\\s*(?!=>|==)(?=,|;|=|$)",
+      "begin": "(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)\\s+(\\g<identifier>)\\s*(?!=[>=])(?=[,;=]|$)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -1879,7 +1879,7 @@
           "name": "keyword.control.exception.finally.cs"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "include": "#comment"
@@ -1896,7 +1896,7 @@
           "name": "keyword.control.context.fixed.cs"
         }
       },
-      "end": "(?<=\\))|(?=;|})",
+      "end": "(?<=\\))|(?=[;}])",
       "patterns": [
         {
           "include": "#intrusive"
@@ -1932,7 +1932,7 @@
           "name": "keyword.control.loop.for.cs"
         }
       },
-      "end": "(?<=\\))|(?=;|})",
+      "end": "(?<=\\))|(?=[;}])",
       "patterns": [
         {
           "begin": "\\(",
@@ -1949,8 +1949,8 @@
           },
           "patterns": [
             {
-              "begin": "(?=[^;\\)])",
-              "end": "(?=;|\\))",
+              "begin": "(?=[^;)])",
+              "end": "(?=[;)])",
               "patterns": [
                 {
                   "include": "#intrusive"
@@ -1989,7 +1989,7 @@
           "name": "keyword.control.loop.foreach.cs"
         }
       },
-      "end": "(?<=\\))|(?=;|})",
+      "end": "(?<=\\))|(?=[;}])",
       "patterns": [
         {
           "include": "#intrusive"
@@ -2033,7 +2033,7 @@
                   "name": "keyword.control.loop.in.cs"
                 }
               },
-              "match": "(?:(?:(\\bref)\\s+)?(\\bvar\\b)|(?<type_name>(?:(?:ref\\s+)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*)))\\s+(\\g<identifier>)\\s+\\b(in)\\b"
+              "match": "(?:(?:(\\bref)\\s+)?(\\bvar\\b)|(?<type_name>(?:ref\\s+)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*))\\s+(\\g<identifier>)\\s+\\b(in)\\b"
             },
             {
               "captures": {
@@ -2051,7 +2051,7 @@
                   "name": "keyword.control.loop.in.cs"
                 }
               },
-              "match": "(?:\\b(var)\\b\\s*)?(?<tuple>\\((?:[^\\(\\)]|\\g<tuple>)+\\))\\s+\\b(in)\\b"
+              "match": "(?:\\b(var)\\b\\s*)?(?<tuple>\\((?:[^()]|\\g<tuple>)+\\))\\s+\\b(in)\\b"
             },
             {
               "include": "#expression"
@@ -2172,7 +2172,7 @@
           "name": "keyword.operator.expression.query.group.cs"
         }
       },
-      "end": "(?=;|\\))",
+      "end": "(?=[;)])",
       "patterns": [
         {
           "include": "#group-by"
@@ -2237,11 +2237,11 @@
       ]
     },
     "implicit-anonymous-function-parameter": {
-      "match": "\\@?[_[:alpha:]][_[:alnum:]]*\\b",
+      "match": "@?[_[:alpha:]][_[:alnum:]]*\\b",
       "name": "entity.name.variable.parameter.cs"
     },
     "indexer-declaration": {
-      "begin": "(?<return_type>(?<type_name>(?:(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))\\s+)(?<interface_name>\\g<type_name>\\s*\\.\\s*)?(?<indexer_name>this)\\s*(?=\\[)",
+      "begin": "(?<return_type>(?<type_name>(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)\\s+)(?<interface_name>\\g<type_name>\\s*\\.\\s*)?(?<indexer_name>this)\\s*(?=\\[)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -2264,7 +2264,7 @@
           "name": "variable.language.this.cs"
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "include": "#comment"
@@ -2290,7 +2290,7 @@
           "name": "punctuation.curlybrace.open.cs"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.curlybrace.close.cs"
@@ -2307,7 +2307,7 @@
     },
     "interface-declaration": {
       "begin": "(?=\\binterface\\b)",
-      "end": "(?<=\\})",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "begin": "(interface)\\b\\s+(@?[_[:alpha:]][_[:alnum:]]*)",
@@ -2319,7 +2319,7 @@
               "name": "entity.name.type.interface.cs"
             }
           },
-          "end": "(?=\\{)",
+          "end": "(?=\\{)|(?=;)",
           "patterns": [
             {
               "include": "#comment"
@@ -2342,7 +2342,7 @@
               "name": "punctuation.curlybrace.open.cs"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.curlybrace.close.cs"
@@ -2403,7 +2403,7 @@
           "name": "punctuation.definition.string.begin.cs"
         }
       },
-      "end": "(\")|((?:[^\\\\\\n])$)",
+      "end": "(\")|([^\\\\\\n]$)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.cs"
@@ -2423,7 +2423,7 @@
       ]
     },
     "interpolation": {
-      "begin": "(?<=[^\\{]|^)((?:\\{\\{)*)(\\{)(?=[^\\{])",
+      "begin": "(?<=[^{]|^)((?:\\{\\{)*)(\\{)(?=[^{])",
       "beginCaptures": {
         "1": {
           "name": "string.quoted.double.cs"
@@ -2432,7 +2432,7 @@
           "name": "punctuation.definition.interpolation.begin.cs"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.interpolation.end.cs"
@@ -2492,7 +2492,7 @@
           "name": "keyword.operator.expression.pattern.is.cs"
         }
       },
-      "end": "(?=[)}\\],;:?=&|^]|!=)",
+      "end": "(?=[)}\\],;:?=\\&|\\^]|!=)",
       "patterns": [
         {
           "include": "#pattern"
@@ -2500,7 +2500,7 @@
       ]
     },
     "join-clause": {
-      "begin": "\\b(join)\\b\\s*(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))?\\s+(\\g<identifier>)\\b\\s*\\b(in)\\b\\s*",
+      "begin": "\\b(join)\\b\\s*(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)?\\s+(\\g<identifier>)\\b\\s*\\b(in)\\b\\s*",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.expression.query.join.cs"
@@ -2519,7 +2519,7 @@
           "name": "keyword.operator.expression.query.in.cs"
         }
       },
-      "end": "(?=;|\\))",
+      "end": "(?=[;)])",
       "patterns": [
         {
           "include": "#join-on"
@@ -2601,7 +2601,7 @@
           "name": "keyword.operator.assignment.cs"
         }
       },
-      "end": "(?=;|\\))",
+      "end": "(?=[;)])",
       "patterns": [
         {
           "include": "#query-body"
@@ -2613,7 +2613,7 @@
     },
     "list-pattern": {
       "begin": "(?=\\[)",
-      "end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
+      "end": "(?=[)}\\],;:?=\\&|\\^]|!=|\\b(and|or|when)\\b)",
       "patterns": [
         {
           "begin": "\\[",
@@ -2622,7 +2622,7 @@
               "name": "punctuation.squarebracket.open.cs"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "endCaptures": {
             "0": {
               "name": "punctuation.squarebracket.close.cs"
@@ -2638,8 +2638,8 @@
           ]
         },
         {
-          "begin": "(?<=\\])",
-          "end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
+          "begin": "(?<=])",
+          "end": "(?=[)}\\],;:?=\\&|\\^]|!=|\\b(and|or|when)\\b)",
           "patterns": [
             {
               "include": "#intrusive"
@@ -2680,7 +2680,7 @@
       ]
     },
     "local-constant-declaration": {
-      "begin": "(?<const_keyword>\\b(?:const)\\b)\\s*(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))\\s+(\\g<identifier>)\\s*(?=,|;|=)",
+      "begin": "(?<const_keyword>\\bconst\\b)\\s*(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)\\s+(\\g<identifier>)\\s*(?=[,;=])",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.const.cs"
@@ -2730,7 +2730,7 @@
       ]
     },
     "local-function-declaration": {
-      "begin": "\\b((?:(?:async|unsafe|static|extern)\\s+)*)(?<type_name>(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?)?(?:\\s*\\[\\s*(?:,\\s*)*\\](?:\\s*\\?)?)*)\\s+(\\g<identifier>)\\s*(<[^<>]+>)?\\s*(?=\\()",
+      "begin": "\\b((?:(?:async|unsafe|static|extern)\\s+)*)(?<type_name>(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?)?(?:\\s*\\[\\s*(?:,\\s*)*](?:\\s*\\?)?)*)\\s+(\\g<identifier>)\\s*(<[^<>]+>)?\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -2757,7 +2757,7 @@
           ]
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "include": "#comment"
@@ -2777,7 +2777,7 @@
       ]
     },
     "local-tuple-var-deconstruction": {
-      "begin": "(?:\\b(var)\\b\\s*)(?<tuple>\\((?:[^\\(\\)]|\\g<tuple>)+\\))\\s*(?=;|=|\\))",
+      "begin": "\\b(var)\\b\\s*(?<tuple>\\((?:[^()]|\\g<tuple>)+\\))\\s*(?=[;=)])",
       "beginCaptures": {
         "1": {
           "name": "storage.type.var.cs"
@@ -2790,7 +2790,7 @@
           ]
         }
       },
-      "end": "(?=;|\\))",
+      "end": "(?=[;)])",
       "patterns": [
         {
           "include": "#comment"
@@ -2801,7 +2801,7 @@
       ]
     },
     "local-variable-declaration": {
-      "begin": "(?:(?:(\\bref)\\s+(?:(\\breadonly)\\s+)?)?(\\bvar\\b)|(?<type_name>(?:(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*[?*]\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*)))\\s+(\\g<identifier>)\\s*(?!=>)(?=,|;|=|\\))",
+      "begin": "(?:(?:(\\bref)\\s+(?:(\\breadonly)\\s+)?)?(\\bvar\\b)|(?<type_name>(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*[?*]\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*))\\s+(\\g<identifier>)\\s*(?!=>)(?=[,;=)])",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.ref.cs"
@@ -2847,7 +2847,7 @@
           "name": "keyword.control.context.lock.cs"
         }
       },
-      "end": "(?<=\\))|(?=;|})",
+      "end": "(?<=\\))|(?=[;}])",
       "patterns": [
         {
           "include": "#intrusive"
@@ -2893,7 +2893,7 @@
               "name": "variable.other.object.property.cs"
             }
           },
-          "match": "(?:(?:(\\?)\\s*)?(\\.)\\s*|(->)\\s*)(@?[_[:alpha:]][_[:alnum:]]*)\\s*(?![_[:alnum:]]|\\(|(\\?)?\\[|<)"
+          "match": "(?:(?:(\\?)\\s*)?(\\.)\\s*|(->)\\s*)(@?[_[:alpha:]][_[:alnum:]]*)\\s*(?![_[:alnum:](]|(\\?)?\\[|<)"
         },
         {
           "captures": {
@@ -2924,7 +2924,7 @@
       ]
     },
     "method-declaration": {
-      "begin": "(?<return_type>(?<type_name>(?:(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))\\s+)(?<interface_name>\\g<type_name>\\s*\\.\\s*)?(\\g<identifier>)\\s*(<([^<>]+)>)?\\s*(?=\\()",
+      "begin": "(?<return_type>(?<type_name>(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)\\s+)(?<interface_name>\\g<type_name>\\s*\\.\\s*)?(\\g<identifier>)\\s*(<([^<>]+)>)?\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -2954,7 +2954,7 @@
           ]
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "include": "#comment"
@@ -2983,7 +2983,7 @@
           "name": "punctuation.separator.colon.cs"
         }
       },
-      "end": "(?=(,|\\)|\\]))",
+      "end": "(?=([,)\\]]))",
       "patterns": [
         {
           "include": "#argument"
@@ -2997,7 +2997,7 @@
           "name": "storage.type.namespace.cs"
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "include": "#comment"
@@ -3016,7 +3016,7 @@
               "name": "punctuation.curlybrace.open.cs"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.curlybrace.close.cs"
@@ -3057,7 +3057,7 @@
                       "name": "constant.numeric.decimal.cs",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "constant.numeric.other.separator.thousands.cs"
                         }
                       ]
@@ -3069,7 +3069,7 @@
                       "name": "constant.numeric.decimal.cs",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "constant.numeric.other.separator.thousands.cs"
                         }
                       ]
@@ -3084,7 +3084,7 @@
                       "name": "constant.numeric.decimal.cs",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "constant.numeric.other.separator.thousands.cs"
                         }
                       ]
@@ -3099,7 +3099,7 @@
                       "name": "keyword.operator.arithmetic.cs"
                     }
                   },
-                  "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)?((?:(?<=[0-9])|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)?((?<!_)([eE])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)))?([fFdDmM](?!\\w))?$"
+                  "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=\\h)_(?=\\h)))*)?((?:(?<=[0-9])|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=\\h)_(?=\\h)))*)?((?<!_)([eE])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)_(?=\\h))*))?([fFdDmM](?!\\w))?$"
                 },
                 {
                   "captures": {
@@ -3110,7 +3110,7 @@
                       "name": "constant.numeric.binary.cs",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "constant.numeric.other.separator.thousands.cs"
                         }
                       ]
@@ -3122,7 +3122,7 @@
                       "name": "constant.numeric.other.suffix.cs"
                     }
                   },
-                  "match": "(\\G0[bB])([01_](?:[01_]|((?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)((?:(?:(?:(?:(?:[uU]|[uU]l)|[uU]L)|l[uU]?)|L[uU]?)|[fFdDmM])(?!\\w))?$"
+                  "match": "(\\G0[bB])([01_](?:[01_]|((?<=\\h)_(?=\\h)))*)((?:(?:(?:(?:(?:[uU]|[uU]l)|[uU]L)|l[uU]?)|L[uU]?)|[fFdDmM])(?!\\w))?$"
                 },
                 {
                   "captures": {
@@ -3133,7 +3133,7 @@
                       "name": "constant.numeric.hex.cs",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "constant.numeric.other.separator.thousands.cs"
                         }
                       ]
@@ -3145,7 +3145,7 @@
                       "name": "constant.numeric.other.suffix.cs"
                     }
                   },
-                  "match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)((?:(?:(?:(?:(?:[uU]|[uU]l)|[uU]L)|l[uU]?)|L[uU]?)|[fFdDmM])(?!\\w))?$"
+                  "match": "(\\G0[xX])(\\h(?:\\h|((?<=\\h)_(?=\\h)))*)((?:(?:(?:(?:(?:[uU]|[uU]l)|[uU]L)|l[uU]?)|L[uU]?)|[fFdDmM])(?!\\w))?$"
                 },
                 {
                   "captures": {
@@ -3153,7 +3153,7 @@
                       "name": "constant.numeric.decimal.cs",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "constant.numeric.other.separator.thousands.cs"
                         }
                       ]
@@ -3174,7 +3174,7 @@
                       "name": "constant.numeric.decimal.cs",
                       "patterns": [
                         {
-                          "match": "(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])",
+                          "match": "(?<=\\h)_(?=\\h)",
                           "name": "constant.numeric.other.separator.thousands.cs"
                         }
                       ]
@@ -3183,10 +3183,10 @@
                       "name": "constant.numeric.other.suffix.cs"
                     }
                   },
-                  "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)((?<!_)([eE])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])_(?=[0-9a-fA-F])))*)))?((?:(?:(?:(?:(?:[uU]|[uU]l)|[uU]L)|l[uU]?)|L[uU]?)|[fFdDmM])(?!\\w))?$"
+                  "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=\\h)_(?=\\h)))*)((?<!_)([eE])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)_(?=\\h))*))?((?:(?:(?:(?:(?:[uU]|[uU]l)|[uU]L)|l[uU]?)|L[uU]?)|[fFdDmM])(?!\\w))?$"
                 },
                 {
-                  "match": "(?:(?:[0-9a-zA-Z_]|_)|(?<=[eE])[+-]|\\.\\d)+",
+                  "match": "(?:[0-9a-zA-Z_]|(?<=[eE])[+\\-]|\\.\\d)+",
                   "name": "invalid.illegal.constant.numeric.cs"
                 }
               ]
@@ -3194,7 +3194,7 @@
           ]
         }
       },
-      "match": "(?<!\\w)\\.?\\d(?:(?:[0-9a-zA-Z_]|_)|(?<=[eE])[+-]|\\.\\d)*"
+      "match": "(?<!\\w)\\.?\\d(?:[0-9a-zA-Z_]|(?<=[eE])[+\\-]|\\.\\d)*"
     },
     "object-creation-expression": {
       "patterns": [
@@ -3219,10 +3219,10 @@
           ]
         }
       },
-      "match": "(new)\\s+(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))\\s*(?=\\{|//|/\\*|$)"
+      "match": "(new)\\s+(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)\\s*(?=\\{|//|/\\*|$)"
     },
     "object-creation-expression-with-parameters": {
-      "begin": "(new)(?:\\s+(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*)))?\\s*(?=\\()",
+      "begin": "(new)(?:\\s+(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*))?\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.expression.new.cs"
@@ -3243,11 +3243,11 @@
       ]
     },
     "operator-assignment": {
-      "match": "(?<!=|!)(=)(?!=)",
+      "match": "(?<![=!])(=)(?!=)",
       "name": "keyword.operator.assignment.cs"
     },
     "operator-declaration": {
-      "begin": "(?<type_name>(?:(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))\\s*\\b(?<operator_keyword>operator)\\b\\s*(?<operator>[+\\-*/%&|\\^!=~<>]+|true|false)\\s*(?=\\()",
+      "begin": "(?<type_name>(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)\\s*\\b(?<operator_keyword>operator)\\b\\s*(?<operator>[+\\-*/%\\&|\\^!=~<>]+|true|false)\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -3263,7 +3263,7 @@
           "name": "entity.name.function.cs"
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "include": "#comment"
@@ -3286,7 +3286,7 @@
           "name": "keyword.operator.expression.query.orderby.cs"
         }
       },
-      "end": "(?=;|\\))",
+      "end": "(?=[;)])",
       "patterns": [
         {
           "include": "#ordering-direction"
@@ -3326,7 +3326,7 @@
           "name": "entity.name.variable.parameter.cs"
         }
       },
-      "match": "(?:(?:\\b(ref|params|out|in|this)\\b)\\s+)?(?<type_name>(?:(?:ref\\s+)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))\\s+(\\g<identifier>)"
+      "match": "(?:\\b(ref|params|out|in|this)\\b\\s+)?(?<type_name>(?:ref\\s+)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)\\s+(\\g<identifier>)"
     },
     "parenthesized-expression": {
       "begin": "\\(",
@@ -3417,7 +3417,7 @@
     },
     "positional-pattern": {
       "begin": "(?=\\()",
-      "end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
+      "end": "(?=[)}\\],;:?=\\&|\\^]|!=|\\b(and|or|when)\\b)",
       "patterns": [
         {
           "begin": "\\(",
@@ -3443,7 +3443,7 @@
         },
         {
           "begin": "(?<=\\))",
-          "end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
+          "end": "(?=[)}\\],;:?=\\&|\\^]|!=|\\b(and|or|when)\\b)",
           "patterns": [
             {
               "include": "#intrusive"
@@ -3459,7 +3459,7 @@
       ]
     },
     "preprocessor": {
-      "begin": "^\\s*(\\#)\\s*",
+      "begin": "^\\s*(#)\\s*",
       "beginCaptures": {
         "1": {
           "name": "punctuation.separator.hash.cs"
@@ -3583,7 +3583,7 @@
               "name": "keyword.operator.logical.cs"
             }
           },
-          "match": "(==|!=)|(\\!|&&|\\|\\|)"
+          "match": "(==|!=)|(!|&&|\\|\\|)"
         }
       ]
     },
@@ -3625,7 +3625,7 @@
               "name": "keyword.preprocessor.hidden.cs"
             }
           },
-          "match": "\\b(?:(default|hidden))"
+          "match": "\\b(default|hidden)"
         },
         {
           "captures": {
@@ -3641,7 +3641,7 @@
               "name": "string.quoted.double.cs"
             }
           },
-          "match": "\\\"[^\"]*\\\""
+          "match": "\"[^\"]*\""
         }
       ]
     },
@@ -3660,7 +3660,7 @@
               "name": "string.quoted.double.cs"
             }
           },
-          "match": "\\\"[^\"]*\\\""
+          "match": "\"[^\"]*\""
         }
       ]
     },
@@ -3682,7 +3682,7 @@
           "name": "string.quoted.double.cs"
         }
       },
-      "match": "\\b(pragma)\\b\\s*\\b(checksum)\\b\\s*(\\\"[^\"]*\\\")\\s*(\\\"[^\"]*\\\")\\s*(\\\"[^\"]*\\\")"
+      "match": "\\b(pragma)\\b\\s*\\b(checksum)\\b\\s*(\"[^\"]*\")\\s*(\"[^\"]*\")\\s*(\"[^\"]*\")"
     },
     "preprocessor-pragma-warning": {
       "captures": {
@@ -3731,7 +3731,7 @@
               "name": "string.quoted.double.cs"
             }
           },
-          "match": "\\\"[^\"]*\\\""
+          "match": "\"[^\"]*\""
         }
       ]
     },
@@ -3767,7 +3767,7 @@
           "name": "punctuation.curlybrace.open.cs"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.curlybrace.close.cs"
@@ -3785,13 +3785,13 @@
           "name": "storage.modifier.$1.cs"
         },
         {
-          "begin": "\\b(get)\\b\\s*(?=\\{|;|=>|//|/\\*|$)",
+          "begin": "\\b(get)\\b\\s*(?=[{;]|=>|//|/\\*|$)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.accessor.$1.cs"
             }
           },
-          "end": "(?<=\\}|;)|(?=\\})",
+          "end": "(?<=[};])|(?=})",
           "patterns": [
             {
               "include": "#accessor-getter"
@@ -3799,13 +3799,13 @@
           ]
         },
         {
-          "begin": "\\b(set|init)\\b\\s*(?=\\{|;|=>|//|/\\*|$)",
+          "begin": "\\b(set|init)\\b\\s*(?=[{;]|=>|//|/\\*|$)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.accessor.$1.cs"
             }
           },
-          "end": "(?<=\\}|;)|(?=\\})",
+          "end": "(?<=[};])|(?=})",
           "patterns": [
             {
               "include": "#accessor-setter"
@@ -3815,7 +3815,7 @@
       ]
     },
     "property-declaration": {
-      "begin": "(?![[:word:][:space:]]*\\b(?:class|interface|struct|enum|event)\\b)(?<return_type>(?<type_name>(?:(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))\\s+)(?<interface_name>\\g<type_name>\\s*\\.\\s*)?(?<property_name>\\g<identifier>)\\s*(?=\\{|=>|//|/\\*|$)",
+      "begin": "(?![[:word:]\\s]*\\b(?:class|interface|struct|enum|event)\\b)(?<return_type>(?<type_name>(?:ref\\s+(?:readonly\\s+)?)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)\\s+)(?<interface_name>\\g<type_name>\\s*\\.\\s*)?(?<property_name>\\g<identifier>)\\s*(?=\\{|=>|//|/\\*|$)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -3838,7 +3838,7 @@
           "name": "entity.name.variable.property.cs"
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "include": "#comment"
@@ -3858,8 +3858,8 @@
       ]
     },
     "property-pattern": {
-      "begin": "(?={)",
-      "end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
+      "begin": "(?=\\{)",
+      "end": "(?=[)}\\],;:?=\\&|\\^]|!=|\\b(and|or|when)\\b)",
       "patterns": [
         {
           "begin": "\\{",
@@ -3868,7 +3868,7 @@
               "name": "punctuation.curlybrace.open.cs"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.curlybrace.close.cs"
@@ -3884,8 +3884,8 @@
           ]
         },
         {
-          "begin": "(?<=\\})",
-          "end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
+          "begin": "(?<=})",
+          "end": "(?=[)}\\],;:?=\\&|\\^]|!=|\\b(and|or|when)\\b)",
           "patterns": [
             {
               "include": "#intrusive"
@@ -3932,7 +3932,7 @@
       ]
     },
     "query-expression": {
-      "begin": "\\b(from)\\b\\s*(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))?\\s+(\\g<identifier>)\\b\\s*\\b(in)\\b\\s*",
+      "begin": "\\b(from)\\b\\s*(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)?\\s+(\\g<identifier>)\\b\\s*\\b(in)\\b\\s*",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.expression.query.from.cs"
@@ -3951,7 +3951,7 @@
           "name": "keyword.operator.expression.query.in.cs"
         }
       },
-      "end": "(?=;|\\))",
+      "end": "(?=[;)])",
       "patterns": [
         {
           "include": "#query-body"
@@ -4094,7 +4094,7 @@
       ]
     },
     "raw-interpolation": {
-      "begin": "(?<=[^\\{]|^)((?:\\{)*)(\\{)(?=[^\\{])",
+      "begin": "(?<=[^{]|^)(\\{*)(\\{)(?=[^{])",
       "beginCaptures": {
         "1": {
           "name": "string.quoted.double.cs"
@@ -4103,7 +4103,7 @@
           "name": "punctuation.definition.interpolation.begin.cs"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.interpolation.end.cs"
@@ -4180,7 +4180,7 @@
     },
     "record-declaration": {
       "begin": "(?=\\brecord\\b)",
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "begin": "(record)\\b\\s+(@?[_[:alpha:]][_[:alnum:]]*)",
@@ -4218,7 +4218,7 @@
               "name": "punctuation.curlybrace.open.cs"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.curlybrace.close.cs"
@@ -4249,7 +4249,7 @@
           "name": "keyword.operator.relational.cs"
         }
       },
-      "end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
+      "end": "(?=[)}\\],;:?=\\&|\\^]|!=|\\b(and|or|when)\\b)",
       "patterns": [
         {
           "include": "#expression"
@@ -4293,7 +4293,7 @@
           "name": "keyword.operator.expression.query.select.cs"
         }
       },
-      "end": "(?=;|\\))",
+      "end": "(?=[;)])",
       "patterns": [
         {
           "include": "#query-body"
@@ -4405,7 +4405,7 @@
       "name": "storage.modifier.$1.cs"
     },
     "string-character-escape": {
-      "match": "\\\\(x[0-9a-fA-F]{1,4}|U[0-9a-fA-F]{8}|u[0-9a-fA-F]{4}|.)",
+      "match": "\\\\(x\\h{1,4}|U\\h{8}|u\\h{4}|.)",
       "name": "constant.character.escape.cs"
     },
     "string-literal": {
@@ -4415,7 +4415,7 @@
           "name": "punctuation.definition.string.begin.cs"
         }
       },
-      "end": "(\")|((?:[^\\\\\\n])$)",
+      "end": "(\")|([^\\\\\\n]$)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.cs"
@@ -4433,7 +4433,7 @@
     },
     "struct-declaration": {
       "begin": "(?=(\\brecord\\b\\s+)?\\bstruct\\b)",
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "begin": "(\\b(record)\\b\\s+)?(struct)\\b\\s+(@?[_[:alpha:]][_[:alnum:]]*)",
@@ -4474,7 +4474,7 @@
               "name": "punctuation.curlybrace.open.cs"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.curlybrace.close.cs"
@@ -4501,7 +4501,7 @@
             "1": {
               "patterns": [
                 {
-                  "match": "\\@?[_[:alpha:]][_[:alnum:]]*",
+                  "match": "@?[_[:alpha:]][_[:alnum:]]*",
                   "name": "variable.other.object.property.cs"
                 },
                 {
@@ -4527,7 +4527,7 @@
           "name": "punctuation.curlybrace.open.cs"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.curlybrace.close.cs"
@@ -4544,7 +4544,7 @@
               "name": "keyword.operator.arrow.cs"
             }
           },
-          "end": "(?=,|})",
+          "end": "(?=[,}])",
           "patterns": [
             {
               "include": "#expression"
@@ -4558,7 +4558,7 @@
               "name": "keyword.control.conditional.when.cs"
             }
           },
-          "end": "(?==>|,|})",
+          "end": "(?==>|[,}])",
           "patterns": [
             {
               "include": "#case-guard"
@@ -4567,7 +4567,7 @@
         },
         {
           "begin": "(?!\\s)",
-          "end": "(?=\\bwhen\\b|=>|,|})",
+          "end": "(?=\\bwhen\\b|=>|[,}])",
           "patterns": [
             {
               "include": "#pattern"
@@ -4597,7 +4597,7 @@
               "name": "keyword.control.conditional.when.cs"
             }
           },
-          "end": "(?=:|})",
+          "end": "(?=[:}])",
           "patterns": [
             {
               "include": "#case-guard"
@@ -4606,7 +4606,7 @@
         },
         {
           "begin": "(?!\\s)",
-          "end": "(?=\\bwhen\\b|:|})",
+          "end": "(?=\\bwhen\\b|[:}])",
           "patterns": [
             {
               "include": "#pattern"
@@ -4646,7 +4646,7 @@
               "name": "punctuation.curlybrace.open.cs"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.curlybrace.close.cs"
@@ -4677,7 +4677,7 @@
         },
         {
           "begin": "(?=\\()",
-          "end": "(?<=\\})|(?=\\})",
+          "end": "(?<=})|(?=})",
           "patterns": [
             {
               "include": "#switch-statement"
@@ -4686,7 +4686,7 @@
         },
         {
           "begin": "(?=\\{)",
-          "end": "(?<=\\})|(?=\\})",
+          "end": "(?<=})|(?=})",
           "patterns": [
             {
               "include": "#switch-expression"
@@ -4724,7 +4724,7 @@
           "name": "keyword.control.exception.try.cs"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "include": "#comment"
@@ -4793,7 +4793,7 @@
           ]
         }
       },
-      "match": "(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\\s*(?!=>|==)(?==)"
+      "match": "(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\))\\s*(?!=[>=])(?==)"
     },
     "tuple-deconstruction-element-list": {
       "begin": "\\(",
@@ -4844,7 +4844,7 @@
           "name": "entity.name.variable.tuple-element.cs"
         }
       },
-      "match": "(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*(?:\\?)?\\s*)*))(?:(?<tuple_name>\\g<identifier>)\\b)?"
+      "match": "(?<type_name>(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)(?:(?<tuple_name>\\g<identifier>)\\b)?"
     },
     "tuple-literal": {
       "begin": "(\\()(?=.*[:,])",
@@ -4973,7 +4973,7 @@
           "name": "punctuation.squarebracket.open.cs"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.squarebracket.close.cs"
@@ -5044,7 +5044,7 @@
               "name": "punctuation.separator.coloncolon.cs"
             }
           },
-          "match": "(@?[_[:alpha:]][_[:alnum:]]*)\\s*(\\:\\:)"
+          "match": "(@?[_[:alpha:]][_[:alnum:]]*)\\s*(::)"
         },
         {
           "captures": {
@@ -5101,13 +5101,13 @@
       ]
     },
     "type-parameter-list": {
-      "begin": "\\<",
+      "begin": "<",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.typeparameters.begin.cs"
         }
       },
-      "end": "\\>",
+      "end": ">",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.typeparameters.end.cs"
@@ -5135,11 +5135,11 @@
     },
     "type-pattern": {
       "begin": "(?=@?[_[:alpha:]][_[:alnum:]]*)",
-      "end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
+      "end": "(?=[)}\\],;:?=\\&|\\^]|!=|\\b(and|or|when)\\b)",
       "patterns": [
         {
           "begin": "\\G",
-          "end": "(?!\\G[@_[:alpha:]])(?=[\\({@_[:alpha:])}\\],;:=&|^]|(?:\\s|^)\\?|!=|\\b(and|or|when)\\b)",
+          "end": "(?!\\G[@_[:alpha:]])(?=[({@_[:alpha:])}\\],;:=\\&|\\^]|(?:\\s|^)\\?|!=|\\b(and|or|when)\\b)",
           "patterns": [
             {
               "include": "#intrusive"
@@ -5150,8 +5150,8 @@
           ]
         },
         {
-          "begin": "(?=[\\({@_[:alpha:]])",
-          "end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
+          "begin": "(?=[({@_[:alpha:]])",
+          "end": "(?=[)}\\],;:?=\\&|\\^]|!=|\\b(and|or|when)\\b)",
           "patterns": [
             {
               "include": "#intrusive"
@@ -5188,19 +5188,19 @@
               "name": "punctuation.separator.coloncolon.cs"
             }
           },
-          "end": "(?<=[_[:alnum:]])|(?=[.<\\[\\({)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
+          "end": "(?<=[_[:alnum:]])|(?=[.<\\[({)}\\],;:?=\\&|\\^]|!=|\\b(and|or|when)\\b)",
           "patterns": [
             {
               "include": "#intrusive"
             },
             {
-              "match": "\\@?[_[:alpha:]][_[:alnum:]]*",
+              "match": "@?[_[:alpha:]][_[:alnum:]]*",
               "name": "entity.name.type.cs"
             }
           ]
         },
         {
-          "match": "\\@?[_[:alpha:]][_[:alnum:]]*",
+          "match": "@?[_[:alpha:]][_[:alnum:]]*",
           "name": "entity.name.type.cs"
         },
         {
@@ -5210,13 +5210,13 @@
               "name": "punctuation.accessor.cs"
             }
           },
-          "end": "(?<=[_[:alnum:]])|(?=[<\\[\\({)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
+          "end": "(?<=[_[:alnum:]])|(?=[<\\[({)}\\],;:?=\\&|\\^]|!=|\\b(and|or|when)\\b)",
           "patterns": [
             {
               "include": "#intrusive"
             },
             {
-              "match": "\\@?[_[:alpha:]][_[:alnum:]]*",
+              "match": "@?[_[:alpha:]][_[:alnum:]]*",
               "name": "entity.name.type.cs"
             }
           ]
@@ -5303,7 +5303,7 @@
               "include": "#comment"
             },
             {
-              "match": "\\@?[_[:alpha:]][_[:alnum:]]*",
+              "match": "@?[_[:alpha:]][_[:alnum:]]*",
               "name": "entity.name.type.namespace.cs"
             },
             {
@@ -5323,7 +5323,7 @@
           "name": "keyword.control.context.using.cs"
         }
       },
-      "end": "(?<=\\))|(?=;|})",
+      "end": "(?<=\\))|(?=[;}])",
       "patterns": [
         {
           "include": "#intrusive"
@@ -5368,7 +5368,7 @@
           "name": "storage.type.var.cs"
         }
       },
-      "end": "(?=[)}\\],;:?=&|^]|!=|\\b(and|or|when)\\b)",
+      "end": "(?=[)}\\],;:?=\\&|\\^]|!=|\\b(and|or|when)\\b)",
       "patterns": [
         {
           "include": "#designation-pattern"
@@ -5376,13 +5376,13 @@
       ]
     },
     "variable-initializer": {
-      "begin": "(?<!=|!)(=)(?!=|>)",
+      "begin": "(?<![=!])(=)(?![=>])",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.assignment.cs"
         }
       },
-      "end": "(?=[,\\)\\];}])",
+      "end": "(?=[,)\\];}])",
       "patterns": [
         {
           "include": "#ref-modifier"
@@ -5471,7 +5471,7 @@
           "name": "keyword.operator.expression.query.where.cs"
         }
       },
-      "end": "(?=;|\\))",
+      "end": "(?=[;)])",
       "patterns": [
         {
           "include": "#query-body"
@@ -5488,7 +5488,7 @@
           "name": "keyword.control.loop.while.cs"
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "begin": "\\(",
@@ -5521,7 +5521,7 @@
           "name": "keyword.operator.expression.with.cs"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "include": "#comment"
@@ -5551,7 +5551,7 @@
               "name": "punctuation.separator.equals.cs"
             }
           },
-          "match": "(?:^|\\s+)((?:([-_[:alnum:]]+)(:))?([-_[:alnum:]]+))(=)"
+          "match": "(?:^|\\s+)((?:([\\-_[:alnum:]]+)(:))?([\\-_[:alnum:]]+))(=)"
         },
         {
           "include": "#xml-string"
@@ -5565,7 +5565,7 @@
           "name": "punctuation.definition.string.begin.cs"
         }
       },
-      "end": "\\]\\]>",
+      "end": "]]>",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.cs"
@@ -5584,7 +5584,7 @@
               "name": "punctuation.definition.constant.cs"
             }
           },
-          "match": "(&)((?:[[:alpha:]:_][[:alnum:]:_.-]*)|(?:\\#[[:digit:]]+)|(?:\\#x[[:xdigit:]]+))(;)",
+          "match": "(&)([[:alpha:]:_][[:alnum:]:_.\\-]*|#\\d+|#x\\h+)(;)",
           "name": "constant.character.entity.cs"
         },
         {
@@ -5627,13 +5627,13 @@
     "xml-string": {
       "patterns": [
         {
-          "begin": "\\'",
+          "begin": "'",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.cs"
             }
           },
-          "end": "\\'",
+          "end": "'",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.cs"
@@ -5647,13 +5647,13 @@
           ]
         },
         {
-          "begin": "\\\"",
+          "begin": "\"",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.cs"
             }
           },
-          "end": "\\\"",
+          "end": "\"",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.cs"
@@ -5669,7 +5669,7 @@
       ]
     },
     "xml-tag": {
-      "begin": "(</?)((?:([-_[:alnum:]]+)(:))?([-_[:alnum:]]+))",
+      "begin": "(</?)((?:([\\-_[:alnum:]]+)(:))?([\\-_[:alnum:]]+))",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.cs"