github-linguist 5.0.0 → 5.0.2

data/grammars/source.tsx.json

@@ -6,8 +6,20 @@
   ],
   "uuid": "805375ec-d614-41f5-8993-5843fe63ea82",
   "patterns": [
+    {
+      "include": "#directives"
+    },
     {
       "include": "#statements"
+    },
+    {
+      "name": "comment.line.shebang.ts",
+      "match": "\\A(#!).*(?=$)",
+      "captures": {
+        "1": {
+          "name": "punctuation.definition.comment.ts"
+        }
+      }
     }
   ],
   "repository": {
@@ -16,9 +28,6 @@
         {
           "include": "#string"
         },
-        {
-          "include": "#regex"
-        },
         {
           "include": "#template"
         },
@@ -85,23 +94,58 @@
       ]
     },
     "var-single-variable": {
-      "name": "meta.var-single-variable.expr.tsx",
-      "begin": "([_$[:alpha:]][_$[:alnum:]]*)",
-      "beginCaptures": {
-        "1": {
-          "name": "meta.definition.variable.tsx variable.other.readwrite.tsx"
-        }
-      },
-      "end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
       "patterns": [
         {
-          "include": "#type-annotation"
+          "name": "meta.var-single-variable.expr.tsx",
+          "begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n  (=\\s*(\n    (async\\s+) |\n    (function\\s*[(<]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>) |\n    ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>))\n  ) |\n  (:\\s*(\n    (<) |\n    ([(]\\s*(\n      ([)]) |\n      (\\.\\.\\.) |\n      ([_$[:alnum:]]+\\s*(\n        ([:,?=])|\n        ([)]\\s*=>)\n      ))\n    )))\n  )\n)",
+          "beginCaptures": {
+            "1": {
+              "name": "meta.definition.variable.tsx entity.name.function.tsx"
+            }
+          },
+          "end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
+          "patterns": [
+            {
+              "include": "#type-annotation"
+            },
+            {
+              "include": "#string"
+            },
+            {
+              "include": "#comment"
+            }
+          ]
         },
         {
-          "include": "#string"
+          "name": "meta.var-single-variable.expr.tsx",
+          "begin": "([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])",
+          "beginCaptures": {
+            "1": {
+              "name": "meta.definition.variable.tsx variable.other.constant.tsx"
+            }
+          },
+          "end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))"
         },
         {
-          "include": "#comment"
+          "name": "meta.var-single-variable.expr.tsx",
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*)",
+          "beginCaptures": {
+            "1": {
+              "name": "meta.definition.variable.tsx variable.other.readwrite.tsx"
+            }
+          },
+          "end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
+          "patterns": [
+            {
+              "include": "#type-annotation"
+            },
+            {
+              "include": "#string"
+            },
+            {
+              "include": "#comment"
+            }
+          ]
         }
       ]
     },
@@ -147,29 +191,14 @@
           "include": "#comment"
         },
         {
-          "begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(:)",
-          "beginCaptures": {
-            "1": {
-              "name": "variable.object.property.tsx"
-            },
-            "2": {
-              "name": "punctuation.destructuring.tsx"
-            }
-          },
+          "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\\'[^']*\\')|(\\\"[^\"]*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
           "end": "(?=,|\\})",
           "patterns": [
             {
-              "include": "#object-binding-pattern"
-            },
-            {
-              "include": "#array-binding-pattern"
-            },
-            {
-              "name": "meta.definition.variable.tsx variable.other.readwrite.tsx",
-              "match": "([_$[:alpha:]][_$[:alnum:]]*)"
+              "include": "#object-binding-element-propertyName"
             },
             {
-              "include": "#variable-initializer"
+              "include": "#binding-element"
             }
           ]
         },
@@ -187,7 +216,28 @@
         }
       ]
     },
-    "array-binding-element": {
+    "object-binding-element-propertyName": {
+      "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\\'[^']*\\')|(\\\"[^\"]*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
+      "end": "(:)",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.destructuring.tsx"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#string"
+        },
+        {
+          "include": "#array-literal"
+        },
+        {
+          "name": "variable.object.property.tsx",
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)"
+        }
+      ]
+    },
+    "binding-element": {
       "patterns": [
         {
           "include": "#comment"
@@ -203,9 +253,6 @@
         },
         {
           "include": "#variable-initializer"
-        },
-        {
-          "include": "#punctuation-comma"
         }
       ]
     },
@@ -260,23 +307,14 @@
       },
       "patterns": [
         {
-          "include": "#array-binding-element"
-        }
-      ]
-    },
-    "ternary-expression": {
-      "begin": "(?=\\?)",
-      "end": "(?=$|[;,})\\]])",
-      "patterns": [
-        {
-          "include": "#ternary-operator"
+          "include": "#binding-element"
         },
         {
-          "include": "#expression"
+          "include": "#punctuation-comma"
         }
       ]
     },
-    "ternary-operator": {
+    "ternary-expression": {
       "begin": "(\\?)",
       "beginCaptures": {
         "0": {
@@ -341,10 +379,10 @@
           "include": "#expression-operators"
         },
         {
-          "include": "#support-objects"
+          "include": "#function-call"
         },
         {
-          "include": "#function-call"
+          "include": "#support-objects"
         },
         {
           "include": "#identifiers"
@@ -549,12 +587,15 @@
               ]
             },
             {
-              "begin": "(?=(?:(?:\\'[^']*\\')|(?:\\\"[^\"]*\\\")))",
+              "begin": "(?=((\\'[^']*\\')|(\\\"[^\"]*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\])))",
               "end": "(?=,|\\}|$)",
               "patterns": [
                 {
                   "include": "#string"
                 },
+                {
+                  "include": "#array-literal"
+                },
                 {
                   "include": "#comment"
                 },
@@ -594,8 +635,7 @@
           "match": "([_$[:alpha:]][_$[:alnum:]]*)"
         },
         {
-          "name": "punctuation.accessor.tsx",
-          "match": "\\."
+          "include": "#punctuation-accessor"
         }
       ]
     },
@@ -802,7 +842,7 @@
         },
         {
           "comment": "(default|*|name) as alias",
-          "match": "(?x) (?: \\b(default)\\b | (\\*) | ([_$[:alpha:]][_$[:alnum:]]*)) \\s+  (as) \\s+ (?: (\\b default \\b | \\*) | ([_$[:alpha:]][_$[:alnum:]]*))",
+          "match": "(?x) (?: \\b(default)\\b | (\\*) | ([_$[:alpha:]][_$[:alnum:]]*)) \\s+ \n  (as) \\s+ (?: (\\b default \\b | \\*) | ([_$[:alpha:]][_$[:alnum:]]*))",
           "captures": {
             "1": {
               "name": "keyword.control.default.tsx"
@@ -911,7 +951,7 @@
           "include": "#type-parameters"
         },
         {
-          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\.)",
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\.)(?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s*\\.\\s*[_$[:alpha:]][_$[:alnum:]]*)*\\s*([,<{]|extends|implements|//|/\\*))",
           "captures": {
             "1": {
               "name": "entity.name.type.module.tsx"
@@ -922,12 +962,15 @@
           }
         },
         {
-          "match": "([_$[:alpha:]][_$[:alnum:]]*)",
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*([,<{]|extends|implements|//|/\\*))",
           "captures": {
             "1": {
               "name": "entity.other.inherited-class.tsx"
             }
           }
+        },
+        {
+          "include": "#expression"
         }
       ]
     },
@@ -1017,6 +1060,9 @@
         {
           "include": "#indexer-declaration"
         },
+        {
+          "include": "#indexer-mapped-type-declaration"
+        },
         {
           "include": "#field-declaration"
         },
@@ -1042,12 +1088,15 @@
         },
         {
           "include": "#punctuation-semicolon"
+        },
+        {
+          "include": "#type"
         }
       ]
     },
     "field-declaration": {
       "name": "meta.field.declaration.tsx",
-      "begin": "(?<!\\()(?:(?<!\\.|\\$)\\b(readonly)\\s+)?(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\\'[^']*\\')|(\\\"[^\"]*\\\")|(\\[[^\\]]*\\]))\\s*(\\?\\s*)?(=|:))",
+      "begin": "(?<!\\()(?:(?<!\\.|\\$)\\b(readonly)\\s+)?(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\\'[^']*\\')|(\\\"[^\"]*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\?\\s*)?(=|:))",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.tsx"
@@ -1059,7 +1108,7 @@
           "include": "#variable-initializer"
         },
         {
-          "begin": "(?=((?:[_$[:alpha:]][_$[:alnum:]]*)|(?:\\'[^']*\\')|(?:\\\"[^\"]*\\\")|(\\[[^\\]]*\\]))\\s*(\\?\\s*)?(=|:))",
+          "begin": "(?=((?:[_$[:alpha:]][_$[:alnum:]]*)|(?:\\'[^']*\\')|(?:\\\"[^\"]*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\?\\s*)?(=|:))",
           "end": "(?=[};,=]|$)|(?<=\\})",
           "patterns": [
             {
@@ -1074,6 +1123,10 @@
             {
               "include": "#comment"
             },
+            {
+              "name": "meta.definition.property.tsx entity.name.function.tsx",
+              "match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=(\\?\\s*)?\\s*\n  (=\\s*(\n    (async\\s+) |\n    (function\\s*[(<]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>) |\n    ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>))\n  ) |\n  (:\\s*(\n    (<) |\n    ([(]\\s*(\n      ([)]) |\n      (\\.\\.\\.) |\n      ([_$[:alnum:]]+\\s*(\n        ([:,?=])|\n        ([)]\\s*=>)\n      ))\n    )))\n  )\n)"
+            },
             {
               "name": "meta.definition.property.tsx variable.object.property.tsx",
               "match": "[_$[:alpha:]][_$[:alnum:]]*"
@@ -1088,7 +1141,7 @@
     },
     "method-declaration": {
       "name": "meta.method.declaration.tsx",
-      "begin": "(?<!\\.|\\$)(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(?:\\b(?:(new)|(constructor))\\b(?!\\$|:))|(?:(\\*)\\s*)?(?=((([_$[:alpha:]][_$[:alnum:]]*)|(\\'[^']*\\')|(\\\"[^\"]*\\\")|(\\[[^\\]]*\\]))\\s*(\\??))?\\s*[\\(\\<]))",
+      "begin": "(?<!\\.|\\$)(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(?:\\b(?:(new)|(constructor))\\b(?!\\$|:))|(?:(\\*)\\s*)?(?=((([_$[:alpha:]][_$[:alnum:]]*)|(\\'[^']*\\')|(\\\"[^\"]*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))?\\s*[\\(\\<]))",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.tsx"
@@ -1138,7 +1191,7 @@
       ]
     },
     "method-overload-declaration": {
-      "begin": "(?<!\\.|\\$)(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(?:\\b(?:(new)|(constructor))\\b(?!\\$|:))|(?:(\\*)\\s*)?(?=((([_$[:alpha:]][_$[:alnum:]]*)|(\\'[^']*\\')|(\\\"[^\"]*\\\")|(\\[[^\\]]*\\]))\\s*(\\??))?\\s*[\\(\\<]))",
+      "begin": "(?<!\\.|\\$)(?:\\b(public|private|protected)\\s+)?(?:\\b(abstract)\\s+)?(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(?:\\b(?:(new)|(constructor))\\b(?!\\$|:))|(?:(\\*)\\s*)?(?=((([_$[:alpha:]][_$[:alnum:]]*)|(\\'[^']*\\')|(\\\"[^\"]*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))?\\s*[\\(\\<]))",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.tsx"
@@ -1170,7 +1223,7 @@
       ]
     },
     "method-declaration-name": {
-      "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\\'[^']*\\')|(\\\"[^\"]*\\\")|(\\[[^\\]]*\\]))\\s*(\\??)\\s*[\\(\\<])",
+      "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\\'[^']*\\')|(\\\"[^\"]*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??)\\s*[\\(\\<])",
       "end": "(?=\\(|\\<)",
       "patterns": [
         {
@@ -1189,6 +1242,65 @@
         }
       ]
     },
+    "object-literal-method-declaration": {
+      "name": "meta.method.declaration.tsx",
+      "begin": "(?<!\\.|\\$)(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=((([_$[:alpha:]][_$[:alnum:]]*)|(\\'[^']*\\')|(\\\"[^\"]*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))?\\s*[\\(\\<])",
+      "beginCaptures": {
+        "1": {
+          "name": "storage.modifier.async.tsx"
+        },
+        "2": {
+          "name": "storage.type.property.tsx"
+        },
+        "3": {
+          "name": "keyword.generator.asterisk.tsx"
+        }
+      },
+      "end": "(?=\\}|;|,)|(?<=\\})",
+      "patterns": [
+        {
+          "include": "#method-declaration-name"
+        },
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#type-parameters"
+        },
+        {
+          "include": "#function-parameters"
+        },
+        {
+          "include": "#return-type"
+        },
+        {
+          "include": "#method-overload-declaration"
+        },
+        {
+          "include": "#decl-block"
+        }
+      ]
+    },
+    "object-literal-method-overload-declaration": {
+      "begin": "(?<!\\.|\\$)(?:\\b(async)\\s+)?(?:\\b(get|set)\\s+)?(?:(\\*)\\s*)?(?=((([_$[:alpha:]][_$[:alnum:]]*)|(\\'[^']*\\')|(\\\"[^\"]*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??))?\\s*[\\(\\<])",
+      "beginCaptures": {
+        "1": {
+          "name": "storage.modifier.async.tsx"
+        },
+        "2": {
+          "name": "storage.type.property.tsx"
+        },
+        "3": {
+          "name": "keyword.generator.asterisk.tsx"
+        }
+      },
+      "end": "(?=\\(|\\<)",
+      "patterns": [
+        {
+          "include": "#method-declaration-name"
+        }
+      ]
+    },
     "indexer-declaration": {
       "name": "meta.indexer.declaration.tsx",
       "begin": "(?:(?<!\\.|\\$)\\b(readonly)\\s*)?(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:)",
@@ -1218,6 +1330,38 @@
         }
       ]
     },
+    "indexer-mapped-type-declaration": {
+      "name": "meta.indexer.mappedtype.declaration.tsx",
+      "begin": "(?:(?<!\\.|\\$)\\b(readonly)\\s*)?(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s+(in)\\s+",
+      "beginCaptures": {
+        "1": {
+          "name": "storage.modifier.tsx"
+        },
+        "2": {
+          "name": "meta.brace.square.tsx"
+        },
+        "3": {
+          "name": "entity.name.type.tsx"
+        },
+        "4": {
+          "name": "keyword.operator.expression.in.tsx"
+        }
+      },
+      "end": "(\\])\\s*(\\?\\s*)?|$",
+      "endCaptures": {
+        "1": {
+          "name": "meta.brace.square.tsx"
+        },
+        "2": {
+          "name": "keyword.operator.optional.tsx"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#type"
+        }
+      ]
+    },
     "function-declaration": {
       "name": "meta.function.tsx",
       "begin": "(?<!\\.|\\$)\\b(?:(export)\\s+)?(?:(async)\\s+)?(function\\b)(?:\\s*(\\*))?(?:(?:\\s+|(?<=\\*))([_$[:alpha:]][_$[:alnum:]]*))?\\s*",
@@ -1342,24 +1486,50 @@
       ]
     },
     "parameter-name": {
-      "match": "(?:\\s*\\b(readonly)\\s+)?(?:\\s*\\b(public|private|protected)\\s+)?(\\.\\.\\.)?\\s*(?<!=|:)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\??)",
-      "captures": {
-        "1": {
-          "name": "storage.modifier.tsx"
-        },
-        "2": {
-          "name": "storage.modifier.tsx"
-        },
-        "3": {
-          "name": "keyword.operator.rest.tsx"
+      "patterns": [
+        {
+          "match": "\\s*\\b(public|protected|private|readonly)(?=\\s+(public|protected|private|readonly)\\s+)",
+          "captures": {
+            "1": {
+              "name": "storage.modifier.tsx"
+            }
+          }
         },
-        "4": {
-          "name": "variable.parameter.tsx"
+        {
+          "match": "(?x)(?:\\s*\\b(public|private|protected|readonly)\\s+)?(\\.\\.\\.)?\\s*(?<!=|:)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\??)(?=\\s*\n  (=\\s*(\n    (async\\s+) |\n    (function\\s*[(<]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>) |\n    ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>))\n  ) |\n  (:\\s*(\n    (<) |\n    ([(]\\s*(\n      ([)]) |\n      (\\.\\.\\.) |\n      ([_$[:alnum:]]+\\s*(\n        ([:,?=])|\n        ([)]\\s*=>)\n      ))\n    )))\n  )\n)",
+          "captures": {
+            "1": {
+              "name": "storage.modifier.tsx"
+            },
+            "2": {
+              "name": "keyword.operator.rest.tsx"
+            },
+            "3": {
+              "name": "entity.name.function.tsx"
+            },
+            "4": {
+              "name": "keyword.operator.optional.tsx"
+            }
+          }
         },
-        "5": {
-          "name": "keyword.operator.optional.tsx"
+        {
+          "match": "(?:\\s*\\b(public|private|protected|readonly)\\s+)?(\\.\\.\\.)?\\s*(?<!=|:)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\??)",
+          "captures": {
+            "1": {
+              "name": "storage.modifier.tsx"
+            },
+            "2": {
+              "name": "keyword.operator.rest.tsx"
+            },
+            "3": {
+              "name": "variable.parameter.tsx"
+            },
+            "4": {
+              "name": "keyword.operator.optional.tsx"
+            }
+          }
         }
-      }
+      ]
     },
     "destructuring-parameter": {
       "patterns": [
@@ -1399,7 +1569,10 @@
           },
           "patterns": [
             {
-              "include": "#parameter-array-binding-element"
+              "include": "#parameter-binding-element"
+            },
+            {
+              "include": "#punctuation-comma"
             }
           ]
         }
@@ -1411,29 +1584,14 @@
           "include": "#comment"
         },
         {
-          "begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(:)",
-          "beginCaptures": {
-            "1": {
-              "name": "variable.object.property.tsx"
-            },
-            "2": {
-              "name": "punctuation.destructuring.tsx"
-            }
-          },
+          "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\\'[^']*\\')|(\\\"[^\"]*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(:))",
           "end": "(?=,|\\})",
           "patterns": [
             {
-              "include": "#parameter-object-binding-pattern"
-            },
-            {
-              "include": "#parameter-array-binding-pattern"
-            },
-            {
-              "name": "variable.parameter.tsx",
-              "match": "([_$[:alpha:]][_$[:alnum:]]*)"
+              "include": "#object-binding-element-propertyName"
             },
             {
-              "include": "#variable-initializer"
+              "include": "#parameter-binding-element"
             }
           ]
         },
@@ -1451,7 +1609,7 @@
         }
       ]
     },
-    "parameter-array-binding-element": {
+    "parameter-binding-element": {
       "patterns": [
         {
           "include": "#comment"
@@ -1467,9 +1625,6 @@
         },
         {
           "include": "#variable-initializer"
-        },
-        {
-          "include": "#punctuation-comma"
         }
       ]
     },
@@ -1524,7 +1679,10 @@
       },
       "patterns": [
         {
-          "include": "#parameter-array-binding-element"
+          "include": "#parameter-binding-element"
+        },
+        {
+          "include": "#punctuation-comma"
         }
       ]
     },
@@ -1684,9 +1842,9 @@
     },
     "type-paren-or-function-parameters": {
       "name": "meta.type.paren.cover.tsx",
-      "begin": "\\s*(\\()",
+      "begin": "\\(",
       "beginCaptures": {
-        "1": {
+        "0": {
           "name": "meta.brace.round.tsx"
         }
       },
@@ -1743,7 +1901,7 @@
         },
         {
           "name": "meta.type.function.tsx",
-          "begin": "(?x)( \\s* (?= [(]\\s*( ([)]) |  (\\.\\.\\.) | ([_$[:alnum:]]+\\s*( ([:,?=])| ([)]\\s*=>) )) ) ) )",
+          "begin": "(?x)(\n  (?=\n    [(]\\s*(\n      ([)]) | \n      (\\.\\.\\.) |\n      ([_$[:alnum:]]+\\s*(\n        ([:,?=])|\n        ([)]\\s*=>)\n      ))\n    )\n  )\n)",
           "end": "(?<=\\))",
           "patterns": [
             {
@@ -1761,6 +1919,10 @@
         {
           "name": "keyword.operator.type.tsx",
           "match": "[&|]"
+        },
+        {
+          "name": "keyword.operator.expression.keyof.tsx",
+          "match": "(?<!\\.|\\$)\\bkeyof\\b(?!\\$)"
         }
       ]
     },
@@ -1892,12 +2054,15 @@
       ]
     },
     "for-loop": {
-      "begin": "(?<!\\.|\\$)\\b(for)\\s*(\\()",
+      "begin": "(?<!\\.|\\$)\\b(for)(?:\\s+(await))?\\s*(\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.loop.tsx"
         },
         "2": {
+          "name": "keyword.control.loop.tsx"
+        },
+        "3": {
           "name": "meta.brace.round.tsx"
         }
       },
@@ -1944,7 +2109,7 @@
     },
     "switch-block": {
       "name": "switch-block.expr.tsx",
-      "begin": "{",
+      "begin": "\\{",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.block.tsx"
@@ -1983,7 +2148,7 @@
     "switch-statement": {
       "name": "switch-statement.expr.tsx",
       "begin": "(?<!\\.|\\$)(?=\\bswitch\\s*\\()",
-      "end": "}",
+      "end": "\\}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.tsx"
@@ -2006,7 +2171,7 @@
         },
         {
           "name": "support.class.builtin.tsx",
-          "match": "(?x)(?<!\\.|\\$)\\b(Array|ArrayBuffer|Atomics|Boolean|DataView|Date|Float32Array|Float64Array|Function|Generator |GeneratorFunction|Int8Array|Int16Array|Int32Array|Intl|Map|Number|Object|Promise|Proxy |Reflect|RegExp|Set|SharedArrayBuffer|SIMD|String|Symbol|TypedArray |Uint8Array|Uint16Array|Uint32Array|Uint8ClampedArray|WeakMap|WeakSet)\\b(?!\\$)"
+          "match": "(?x)(?<!\\.|\\$)\\b(Array|ArrayBuffer|Atomics|Boolean|DataView|Date|Float32Array|Float64Array|Function|Generator\n  |GeneratorFunction|Int8Array|Int16Array|Int32Array|Intl|Map|Number|Object|Promise|Proxy\n  |Reflect|RegExp|Set|SharedArrayBuffer|SIMD|String|Symbol|TypedArray\n  |Uint8Array|Uint16Array|Uint32Array|Uint8ClampedArray|WeakMap|WeakSet)\\b(?!\\$)"
         },
         {
           "name": "support.class.error.tsx",
@@ -2014,7 +2179,7 @@
         },
         {
           "name": "support.function.tsx",
-          "match": "(?x)(?<!\\.|\\$)\\b(clear(Interval|Timeout)|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|escape|eval| isFinite|isNaN|parseFloat|parseInt|require|set(Interval|Timeout)|super|unescape|uneval)(?=\\s*\\()"
+          "match": "(?x)(?<!\\.|\\$)\\b(clear(Interval|Timeout)|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|escape|eval|\n  isFinite|isNaN|parseFloat|parseInt|require|set(Interval|Timeout)|super|unescape|uneval)(?=\\s*\\() "
         },
         {
           "match": "(?x)(?<!\\.|\\$)\\b(Math)(?:\\s*(\\.)\\s*(?:\n  (abs|acos|acosh|asin|asinh|atan|atan2|atanh|cbrt|ceil|clz32|cos|cosh|exp|\n  expm1|floor|fround|hypot|imul|log|log10|log1p|log2|max|min|pow|random|\n  round|sign|sin|sinh|sqrt|tan|tanh|trunc)\n  |\n  (E|LN10|LN2|LOG10E|LOG2E|PI|SQRT1_2|SQRT2)))?\\b(?!\\$)",
@@ -2166,17 +2331,19 @@
       ]
     },
     "function-call": {
-      "begin": "(?:(\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\()",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.accessor.tsx"
-        },
-        "2": {
-          "name": "entity.name.function.tsx"
-        }
-      },
-      "end": "(?<=\\))",
+      "begin": "(?=(\\.\\s*)?([_$[:alpha:]][_$[:alnum:]]*)\\s*(<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\()",
+      "end": "(?<=\\))(?!(\\.\\s*)?([_$[:alpha:]][_$[:alnum:]]*)\\s*(<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\()",
       "patterns": [
+        {
+          "include": "#support-objects"
+        },
+        {
+          "include": "#punctuation-accessor"
+        },
+        {
+          "name": "entity.name.function.tsx",
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)"
+        },
         {
           "include": "#comment"
         },
@@ -2221,7 +2388,7 @@
               "name": "punctuation.accessor.tsx"
             },
             "2": {
-              "name": "constant.other.object.property.tsx"
+              "name": "variable.other.constant.object.property.tsx"
             },
             "3": {
               "name": "variable.other.object.property.tsx"
@@ -2229,7 +2396,7 @@
           }
         },
         {
-          "match": "(?x)(?:(\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*( (async\\s+)|(function\\s+)| ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)| ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>)))",
+          "match": "(?x)(?:(\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  (async\\s+)|(function\\s*[(<])|(function\\s+)|\n  ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)|\n  ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>)))",
           "captures": {
             "1": {
               "name": "punctuation.accessor.tsx"
@@ -2246,7 +2413,7 @@
               "name": "punctuation.accessor.tsx"
             },
             "2": {
-              "name": "constant.other.property.tsx"
+              "name": "variable.other.constant.property.tsx"
             }
           }
         },
@@ -2265,7 +2432,7 @@
           "match": "(?x)(?:\n  ([[:upper:]][_$[:digit:][:upper:]]*) |\n  ([_$[:alpha:]][_$[:alnum:]]*)\n)(?=\\s*\\.\\s*[_$[:alpha:]][_$[:alnum:]]*)",
           "captures": {
             "1": {
-              "name": "constant.other.object.tsx"
+              "name": "variable.other.constant.object.tsx"
             },
             "2": {
               "name": "variable.other.object.tsx"
@@ -2273,7 +2440,7 @@
           }
         },
         {
-          "name": "constant.other.tsx",
+          "name": "variable.other.constant.tsx",
           "match": "([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])"
         },
         {
@@ -2302,6 +2469,9 @@
         {
           "include": "#paren-expression"
         },
+        {
+          "include": "#class-or-interface-declaration"
+        },
         {
           "include": "#type"
         }
@@ -2313,16 +2483,16 @@
           "include": "#comment"
         },
         {
-          "include": "#method-declaration"
+          "include": "#object-literal-method-declaration"
         },
         {
           "name": "meta.object.member.tsx",
-          "begin": "(?=(?:(?:\\'[^']*\\')|(?:\\\"[^\"]*\\\")|(?:\\[[^\\]]*\\]))\\s*:)",
+          "begin": "(?=(?:(?:\\'[^']*\\')|(?:\\\"[^\"]*\\\")|(?:\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*:)",
           "end": "(?=,|\\})",
           "patterns": [
             {
               "name": "meta.object-literal.key.tsx",
-              "begin": "(?=(?:(?:\\'[^']*\\')|(?:\\\"[^\"]*\\\")|(?:\\[[^\\]]*\\]))\\s*:)",
+              "begin": "(?=(?:(?:\\'[^']*\\')|(?:\\\"[^\"]*\\\")|(?:\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*:)",
               "end": ":",
               "endCaptures": {
                 "0": {
@@ -2345,7 +2515,7 @@
         },
         {
           "name": "meta.object.member.tsx",
-          "begin": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(:)(?=\\s*( (async\\s+)|(function\\s+)| ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)| ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>))))",
+          "begin": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(:)(?=\\s*(\n  (async\\s+)|(function\\s*[(<])|(function\\s+)|\n  ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)|\n  ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>))))",
           "beginCaptures": {
             "0": {
               "name": "meta.object-literal.key.tsx"
@@ -2505,6 +2675,14 @@
         {
           "name": "keyword.operator.arithmetic.tsx",
           "match": "%|\\*|/|-|\\+"
+        },
+        {
+          "match": "(?<=[_$[:alnum:])])\\s*(/)(?![/*])",
+          "captures": {
+            "1": {
+              "name": "keyword.operator.arithmetic.tsx"
+            }
+          }
         }
       ]
     },
@@ -2676,7 +2854,7 @@
       "patterns": [
         {
           "name": "string.regex.tsx",
-          "begin": "(?<=[=(:,\\[?+!]|return|case|=>|&&|\\|\\||\\*\\/)\\s*(/)(?![/*+?])(?=.*/)",
+          "begin": "(?<=[=(:,\\[?+!]|return|case|=>|&&|\\|\\||\\*\\/)\\s*(/)(?![/*])(?=(?:[^/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+/(?![/*])[gimy]*(?!\\s*[a-zA-Z0-9_$]))",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.string.begin.tsx"
@@ -2699,7 +2877,7 @@
         },
         {
           "name": "string.regex.tsx",
-          "begin": "/(?![/*])(?=(?:[^/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+/(?![/*])[gimy]*(?!\\s*[a-zA-Z0-9_$]))",
+          "begin": "(?<![_$[:alnum:]])/(?![/*])(?=(?:[^/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+/(?![/*])[gimy]*(?!\\s*[a-zA-Z0-9_$]))",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.tsx"
@@ -2865,7 +3043,6 @@
       ]
     },
     "string": {
-      "name": "string.tsx",
       "patterns": [
         {
           "include": "#qstring-single"
@@ -3072,8 +3249,13 @@
         {
           "name": "comment.block.documentation.tsx",
           "begin": "/\\*\\*(?!/)",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.comment.tsx"
+            }
+          },
           "end": "\\*/",
-          "captures": {
+          "endCaptures": {
             "0": {
               "name": "punctuation.definition.comment.tsx"
             }
@@ -3087,8 +3269,13 @@
         {
           "name": "comment.block.tsx",
           "begin": "/\\*",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.comment.tsx"
+            }
+          },
           "end": "\\*/",
-          "captures": {
+          "endCaptures": {
             "0": {
               "name": "punctuation.definition.comment.tsx"
             }
@@ -3117,14 +3304,75 @@
         }
       ]
     },
+    "directives": {
+      "name": "comment.line.triple-slash.directive.tsx",
+      "begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|name)\\s*=\\s*((\\'[^']*\\')|(\\\"[^\"]*\\\")))+\\s*/>\\s*$)",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.definition.comment.tsx"
+        }
+      },
+      "end": "(?=$)",
+      "patterns": [
+        {
+          "name": "meta.tag.tsx",
+          "begin": "(<)(reference|amd-dependency|amd-module)",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.tag.directive.tsx"
+            },
+            "2": {
+              "name": "entity.name.tag.directive.tsx"
+            }
+          },
+          "end": "/>",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.tag.directive.tsx"
+            }
+          },
+          "patterns": [
+            {
+              "name": "entity.other.attribute-name.directive.tsx",
+              "match": "path|types|no-default-lib|name"
+            },
+            {
+              "name": "keyword.operator.assignment.tsx",
+              "match": "="
+            },
+            {
+              "include": "#string"
+            }
+          ]
+        }
+      ]
+    },
     "docblock": {
       "patterns": [
         {
           "name": "storage.type.class.jsdoc",
-          "match": "(?<!\\w)@(abstract|access|alias|arg|argument|async|attribute|augments|author|beta|borrows|bubbes|callback|chainable|class|classdesc|code|config|const|constant|constructor|constructs|copyright|default|defaultvalue|define|deprecated|desc|description|dict|emits|enum|event|example|exports?|extends|extension|extension_for|extensionfor|external|file|fileoverview|final|fires|for|function|global|host|ignore|implements|inherit[Dd]oc|inner|instance|interface|kind|lends|license|listens|main|member|memberof|method|mixex|mixins?|module|name|namespace|nocollapse|nosideeffects|override|overview|package|param|preserve|private|prop|property|protected|public|read[Oo]nly|record|require[ds]|returns?|see|since|static|struct|submodule|summary|template|this|throws|todo|tutorial|type|typedef|unrestricted|uses|var|variation|version|virtual|writeOnce)\\b"
+          "match": "(?x)(?<!\\w)@(\n  abstract|access|alias|arg|argument|async|attribute|augments|author|beta|borrows|bubbes|callback|chainable|class\n  |classdesc|code|config|const|constant|constructor|constructs|copyright|default|defaultvalue|define|deprecated|desc\n  |description|dict|emits|enum|event|example|exports?|extends|extension|extension_for|extensionfor|external|file\n  |fileoverview|final|fires|for|function|global|host|ignore|implements|implicitCast|inherit[Dd]oc|inner|instance\n  |interface|kind|lends|license|listens|main|member|memberof|method|mixex|mixins?|modifies|module|name|namespace\n  |noalias|nocollapse|nocompile|nosideeffects|override|overview|package|param|preserve|private|prop|property\n  |protected|public|read[Oo]nly|record|require[ds]|returns?|see|since|static|struct|submodule|summary|suppress\n  |template|this|throws|todo|type|typedef|unrestricted|uses|var|variation|version|virtual|writeOnce)\\b"
+        },
+        {
+          "name": "other.meta.jsdoc",
+          "match": "(?x)\n(\n  \\[\n    [^\\]]+            # Optional [link text] preceding {@link syntax}\n  \\]\n\n  (?!                  # Check to avoid highlighting two sets of link text\n    {\n      @\\w+            # Tagname\n      \\s+\n      [^\\s|}]+        # Namepath/URL\n      [\\s|]           # Whitespace or bar delimiting description\n      [^}]*\n    }\n  )\n)?\n\n(?:\n  {\n    (\n      @\n      (?: link         # Name of tag\n        | linkcode\n        | linkplain\n        | tutorial\n      )\n    )\n\n    \\s+\n\n    ([^\\s|}]+)        # Namepath or URL\n\n    (?:                # Optional link text following link target\n      [\\s|]           # Bar or space separating target and text\n      [^}]*            # Actual text\n    )?\n  }\n)",
+          "captures": {
+            "0": {
+              "name": "entity.name.type.instance.jsdoc"
+            },
+            "1": {
+              "name": "constant.other.description.jsdoc"
+            },
+            "2": {
+              "name": "storage.type.class.jsdoc"
+            },
+            "3": {
+              "name": "variable.other.description.jsdoc"
+            }
+          }
         },
         {
-          "match": "(?x)\n(?:(?<=@param)|(?<=@arg)|(?<=@argument)|(?<=@type))\n\\s+\n({(?:\n  \\* |                                        # {*} any type\n  \\? |                                        # {?} unknown type\n  (?:                                         # Check for a prefix\n    \\? |                                      # {?string} nullable type\n    !   |                                     # {!string} non-nullable type\n    \\.{3}                                     # {...string} variable number of parameters\n  )?\n  (?:\n    \\(                                        # Opening bracket of multiple types with parenthesis {(string|number)}\n      [a-zA-Z_$]+\n      (?:\n        (?:\n          [\\w$]*\n          (?:\\[\\])?                           # {(string[]|number)} type application, an array of strings or a number\n        ) |\n        \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>            # {Array<string>} or {Object<string, number>} type application (optional .)\n      )\n      (?:\n        [\\.|~]                                # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback\n        [a-zA-Z_$]+\n        (?:\n          (?:\n            [\\w$]*\n            (?:\\[\\])?                        # {(string|number[])} type application, a string or an array of numbers\n          ) |\n          \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>         # {Array<string>} or {Object<string, number>} type application (optional .)\n        )\n      )*\n    \\) |\n    [a-zA-Z_$]+\n    (?:\n      (?:\n        [\\w$]*\n        (?:\\[\\])?                            # {string[]|number} type application, an array of strings or a number\n      ) |\n      \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>             # {Array<string>} or {Object<string, number>} type application (optional .)\n    )\n    (?:\n      [\\.|~]                                 # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback\n      [a-zA-Z_$]+\n      (?:\n        [\\w$]* |\n        \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>           # {Array<string>} or {Object<string, number>} type application (optional .)\n      )\n    )*\n  )\n                                             # Check for suffix\n  (?:\\[\\])?                                  # {string[]} type application, an array of strings\n  =?                                         # {string=} optional parameter\n)})\n\\s+\n(\n  \\[                                         # [foo] optional parameter\n    \\s*\n    (?:\n      [a-zA-Z_$][\\w$]*\n      (?:\n        (?:\\[\\])?                            # Foo[].bar properties within an array\n        \\.                                   # Foo.Bar namespaced parameter\n        [a-zA-Z_$][\\w$]*\n      )*\n      (?:\n        \\s*\n        =                                    # [foo=bar] Default parameter value\n        \\s*\n        [\\w$\\s]*\n      )?\n    )\n    \\s*\n  \\] |\n  (?:\n    [a-zA-Z_$][\\w$]*\n    (?:\n      (?:\\[\\])?                              # Foo[].bar properties within an array\n      \\.                                     # Foo.Bar namespaced parameter\n      [a-zA-Z_$][\\w$]*\n    )*\n  )?\n)\n\\s+\n(?:-\\s+)?                                    # optional hyphen before the description\n((?:(?!\\*\\/).)*)                             # The type description",
+          "match": "(?x)\n\n(?:(?<=@param)|(?<=@arg)|(?<=@argument)|(?<=@type)|(?<=@property)|(?<=@prop))\n\n\\s+\n\n({(?:\n  \\* |                                       # {*} any type\n  \\? |                                       # {?} unknown type\n\n  (?:\n    (?:                                       # Check for a prefix\n      \\? |                                   # {?string} nullable type\n      !   |                                   # {!string} non-nullable type\n      \\.{3}                                  # {...string} variable number of parameters\n    )?\n\n    (?:\n      (?:\n        function                              # {function(string, number)} function type\n        \\s*\n        \\(\n        \\s*\n        (?:\n          [a-zA-Z_$][\\w$]*\n          (?:\n            \\s*,\\s*\n            [a-zA-Z_$][\\w$]*\n          )*\n        )?\n        \\s*\n        \\)\n        (?:                                   # {function(): string} function return type\n          \\s*:\\s*\n          [a-zA-Z_$][\\w$]*\n        )?\n      )?\n      |\n      (?:\n        \\(                                   # Opening bracket of multiple types with parenthesis {(string|number)}\n          [a-zA-Z_$]+\n          (?:\n            (?:\n              [\\w$]*\n              (?:\\[\\])?                     # {(string[]|number)} type application, an array of strings or a number\n            ) |\n            \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>    # {Array<string>} or {Object<string, number>} type application (optional .)\n          )\n          (?:\n            [\\.|~]                           # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback\n            [a-zA-Z_$]+\n            (?:\n              (?:\n                [\\w$]*\n                (?:\\[\\])?                   # {(string|number[])} type application, a string or an array of numbers\n              ) |\n              \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>  # {Array<string>} or {Object<string, number>} type application (optional .)\n            )\n          )*\n        \\) |\n        [a-zA-Z_$]+\n        (?:\n          (?:\n            [\\w$]*\n            (?:\\[\\])?                       # {(string|number[])} type application, a string or an array of numbers\n          ) |\n          \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>      # {Array<string>} or {Object<string, number>} type application (optional .)\n        )\n        (?:\n          [\\.|~]                             # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback\n          [a-zA-Z_$]+\n          (?:\n            [\\w$]* |\n            \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>    # {Array<string>} or {Object<string, number>} type application (optional .)\n          )\n        )*\n      )\n    )\n                                              # Check for suffix\n    (?:\\[\\])?                               # {string[]} type application, an array of strings\n    =?                                        # {string=} optional parameter\n  )\n)})\n\n\\s+\n\n(\n  \\[                                         # [foo] optional parameter\n    \\s*\n    (?:\n      [a-zA-Z_$][\\w$]*\n      (?:\n        (?:\\[\\])?                           # Foo[].bar properties within an array\n        \\.                                   # Foo.Bar namespaced parameter\n        [a-zA-Z_$][\\w$]*\n      )*\n      (?:\n        \\s*\n        =                                     # [foo=bar] Default parameter value\n        \\s*\n        [\\w$\\s]*\n      )?\n    )\n    \\s*\n  \\] |\n  (?:\n    [a-zA-Z_$][\\w$]*\n    (?:\n      (?:\\[\\])?                             # Foo[].bar properties within an array\n      \\.                                     # Foo.Bar namespaced parameter\n      [a-zA-Z_$][\\w$]*\n    )*\n  )?\n)\n\n\\s+\n\n(?:-\\s+)?                                     # optional hyphen before the description\n\n((?:(?!\\*\\/).)*)                             # The type description",
           "captures": {
             "0": {
               "name": "other.meta.jsdoc"
@@ -3141,7 +3389,7 @@
           }
         },
         {
-          "match": "(?x)\n({(?:\n  \\* |                                       # {*} any type\n  \\? |                                       # {?} unknown type\n\n  (?:                                        # Check for a prefix\n    \\? |                                     # {?string} nullable type\n    !   |                                    # {!string} non-nullable type\n    \\.{3}                                    # {...string} variable number of parameters\n  )?\n\n  (?:\n    \\(                                       # Opening bracket of multiple types with parenthesis {(string|number)}\n      [a-zA-Z_$]+\n      (?:\n        [\\w$]* |\n        \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>           # {Array<string>} or {Object<string, number>} type application (optional .)\n      )\n      (?:\n        [\\.|~]                               # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback\n        [a-zA-Z_$]+\n        (?:\n          [\\w$]* |\n          \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>         # {Array<string>} or {Object<string, number>} type application (optional .)\n        )\n      )*\n    \\) |\n    [a-zA-Z_$]+\n    (?:\n      [\\w$]* |\n      \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>             # {Array<string>} or {Object<string, number>} type application (optional .)\n    )\n    (?:\n      [\\.|~]                                 # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback\n      [a-zA-Z_$]+\n      (?:\n        [\\w$]* |\n        \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>           # {Array<string>} or {Object<string, number>} type application (optional .)\n      )\n    )*\n  )\n                                             # Check for suffix\n  (?:\\[\\])?                                  # {string[]} type application, an array of strings\n  =?                                         # {string=} optional parameter\n)})\n\\s+\n(?:-\\s+)?                                    # optional hyphen before the description\n((?:(?!\\*\\/).)*)                             # The type description",
+          "match": "(?x)\n\n({(?:\n  \\* |                                       # {*} any type\n  \\? |                                       # {?} unknown type\n\n  (?:\n    (?:                                       # Check for a prefix\n      \\? |                                   # {?string} nullable type\n      !   |                                   # {!string} non-nullable type\n      \\.{3}                                  # {...string} variable number of parameters\n    )?\n\n    (?:\n      (?:\n        function                              # {function(string, number)} function type\n        \\s*\n        \\(\n        \\s*\n        (?:\n          [a-zA-Z_$][\\w$]*\n          (?:\n            \\s*,\\s*\n            [a-zA-Z_$][\\w$]*\n          )*\n        )?\n        \\s*\n        \\)\n        (?:                                   # {function(): string} function return type\n          \\s*:\\s*\n          [a-zA-Z_$][\\w$]*\n        )?\n      )?\n      |\n      (?:\n        \\(                                   # Opening bracket of multiple types with parenthesis {(string|number)}\n          [a-zA-Z_$]+\n          (?:\n            [\\w$]* |\n            \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>    # {Array<string>} or {Object<string, number>} type application (optional .)\n          )\n          (?:\n            [\\.|~]                           # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback\n            [a-zA-Z_$]+\n            (?:\n              [\\w$]* |\n              \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>  # {Array<string>} or {Object<string, number>} type application (optional .)\n            )\n          )*\n        \\) |\n        [a-zA-Z_$]+\n        (?:\n          [\\w$]* |\n          \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>      # {Array<string>} or {Object<string, number>} type application (optional .)\n        )\n        (?:\n          [\\.|~]                             # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback\n          [a-zA-Z_$]+\n          (?:\n            [\\w$]* |\n            \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>    # {Array<string>} or {Object<string, number>} type application (optional .)\n          )\n        )*\n      )\n    )\n                                              # Check for suffix\n    (?:\\[\\])?                               # {string[]} type application, an array of strings\n    =?                                        # {string=} optional parameter\n  )\n)})\n\n\\s+\n\n(?:-\\s+)?                                    # optional hyphen before the description\n\n((?:(?!\\*\\/).)*)                            # The type description",
           "captures": {
             "0": {
               "name": "other.meta.jsdoc"
@@ -3176,7 +3424,6 @@
       ]
     },
     "jsx-tag-attribute-name": {
-      "name": "meta.tag.attribute-name.tsx",
       "match": "(?x)\n  \\s*\n  ([_$a-zA-Z][-$\\w]*)\n  (?=\\s|=|/?>|/\\*|//)",
       "captures": {
         "1": {
@@ -3189,42 +3436,42 @@
       "match": "=(?=\\s*(?:'|\"|{|/\\*|//|\\n))"
     },
     "jsx-string-double-quoted": {
-      "name": "string.jsxAttributeValue.quoted.double.tsx",
+      "name": "string.quoted.double.tsx",
       "begin": "\"",
       "end": "\"",
       "beginCaptures": {
         "0": {
-          "name": "punctuation.definition.string.jsxAttributeValue.begin.tsx"
+          "name": "punctuation.definition.string.begin.tsx"
         }
       },
       "endCaptures": {
         "0": {
-          "name": "punctuation.definition.string.jsxAttributeValue.end.tsx"
+          "name": "punctuation.definition.string.end.tsx"
         }
       },
       "patterns": [
         {
-          "include": "#jsx-attributeValue-entities"
+          "include": "#jsx-entities"
         }
       ]
     },
     "jsx-string-single-quoted": {
-      "name": "string.jsxAttributeValue.quoted.single.tsx",
+      "name": "string.quoted.single.tsx",
       "begin": "'",
       "end": "'",
       "beginCaptures": {
         "0": {
-          "name": "punctuation.definition.string.jsxAttributeValue.begin.tsx"
+          "name": "punctuation.definition.string.begin.tsx"
         }
       },
       "endCaptures": {
         "0": {
-          "name": "punctuation.definition.string.jsxAttributeValue.end.tsx"
+          "name": "punctuation.definition.string.end.tsx"
         }
       },
       "patterns": [
         {
-          "include": "#jsx-attributeValue-entities"
+          "include": "#jsx-entities"
         }
       ]
     },
@@ -3248,30 +3495,10 @@
         }
       ]
     },
-    "jsx-attributeValue-entities": {
-      "patterns": [
-        {
-          "name": "constant.character.entity.jsxAttributeValue.tsx",
-          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
-          "captures": {
-            "1": {
-              "name": "punctuation.definition.entity.jsxAttributeValue.tsx"
-            },
-            "3": {
-              "name": "punctuation.definition.entity.jsxAttributeValue.tsx"
-            }
-          }
-        },
-        {
-          "name": "invalid.illegal.bad-ampersand.jsxAttributeValue.tsx",
-          "match": "&"
-        }
-      ]
-    },
     "jsx-evaluated-code": {
       "name": "meta.embedded.expression.tsx",
-      "begin": "{",
-      "end": "}",
+      "begin": "\\{",
+      "end": "\\}",
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.embedded.begin.tsx"
@@ -3326,7 +3553,7 @@
       ]
     },
     "jsx-tag-in-expression": {
-      "begin": "(?x)\n  (?<=[({\\[,?=>]|&&|\\|\\||\\?|\\Wreturn|^return|\\Wdefault|^)\\s*\n  (?!(<)\\s*([_$a-zA-Z][-$\\w.]*(?<!\\.|-))\\s*(>)) #look ahead is not start of tag without attributes\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*\n  ([_$a-zA-Z][-$\\w.]*(?<!\\.|-))\n  (?=\\s+(?!\\?)|/?>))",
+      "begin": "(?x)\n  (?<=[({\\[,?=>:*]|&&|\\|\\||\\?|\\Wreturn|^return|\\Wdefault|^)\\s*\n  (?!(<)\\s*([_$a-zA-Z][-$\\w.]*(?<!\\.|-))\\s*(>)) #look ahead is not start of tag without attributes\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*\n  ([_$a-zA-Z][-$\\w.]*(?<!\\.|-))\n  (?=\\s+(?!\\?)|/?>))",
       "end": "(/>)|(?:(</)\\s*([_$a-zA-Z][-$\\w.]*(?<!\\.|-))\\s*(>))",
       "endCaptures": {
         "0": {