github-linguist 5.0.8 → 5.0.9

data/grammars/source.tsx.json

@@ -34,9 +34,6 @@
         {
           "include": "#comment"
         },
-        {
-          "include": "#literal"
-        },
         {
           "include": "#declaration"
         },
@@ -97,7 +94,7 @@
       "patterns": [
         {
           "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)",
+          "begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n  (=\\s*(\n    (async\\s+) |\n    (function\\s*[(<]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>) |\n    ([(]\\s*(([)]\\s*:)|([_$[:alpha:]][_$[:alnum:]]*\\s*:)|(\\.\\.\\.) )) |\n    ([<]\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s*[^=>])|(\\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"
@@ -106,13 +103,7 @@
           "end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
           "patterns": [
             {
-              "include": "#type-annotation"
-            },
-            {
-              "include": "#string"
-            },
-            {
-              "include": "#comment"
+              "include": "#var-single-variable-type-annotation"
             }
           ]
         },
@@ -124,7 +115,12 @@
               "name": "meta.definition.variable.tsx variable.other.constant.tsx"
             }
           },
-          "end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))"
+          "end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
+          "patterns": [
+            {
+              "include": "#var-single-variable-type-annotation"
+            }
+          ]
         },
         {
           "name": "meta.var-single-variable.expr.tsx",
@@ -137,18 +133,25 @@
           "end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
           "patterns": [
             {
-              "include": "#type-annotation"
-            },
-            {
-              "include": "#string"
-            },
-            {
-              "include": "#comment"
+              "include": "#var-single-variable-type-annotation"
             }
           ]
         }
       ]
     },
+    "var-single-variable-type-annotation": {
+      "patterns": [
+        {
+          "include": "#type-annotation"
+        },
+        {
+          "include": "#string"
+        },
+        {
+          "include": "#comment"
+        }
+      ]
+    },
     "destructuring-variable": {
       "patterns": [
         {
@@ -334,7 +337,6 @@
       ]
     },
     "expression": {
-      "name": "meta.expression.tsx",
       "patterns": [
         {
           "include": "#jsx"
@@ -352,10 +354,7 @@
           "include": "#comment"
         },
         {
-          "include": "#literal"
-        },
-        {
-          "include": "#function-declaration"
+          "include": "#function-expression"
         },
         {
           "include": "#class-or-interface-declaration"
@@ -381,6 +380,9 @@
         {
           "include": "#function-call"
         },
+        {
+          "include": "#literal"
+        },
         {
           "include": "#support-objects"
         },
@@ -412,17 +414,6 @@
           "name": "keyword.control.flow.tsx",
           "match": "(?<!\\.|\\$)\\b(return)\\b(?!\\$)"
         },
-        {
-          "match": "(?<!\\.|\\$)\\b(yield)\\b(?!\\$)(?:\\s*(\\*))?",
-          "captures": {
-            "1": {
-              "name": "keyword.control.flow.tsx"
-            },
-            "2": {
-              "name": "keyword.generator.asterisk.tsx"
-            }
-          }
-        },
         {
           "name": "keyword.control.switch.tsx",
           "match": "(?<!\\.|\\$)\\b(case|default|switch)\\b(?!\\$)"
@@ -446,7 +437,6 @@
       ]
     },
     "declaration": {
-      "name": "meta.declaration.tsx",
       "patterns": [
         {
           "include": "#decorator"
@@ -613,7 +603,7 @@
     },
     "namespace-declaration": {
       "name": "meta.namespace.declaration.tsx",
-      "begin": "(?<!\\.|\\$)(?:(\\bexport)\\s+)?\\b(namespace|module)\\s+",
+      "begin": "(?<!\\.|\\$)(?:(\\bexport)\\s+)?\\b(namespace|module)\\s+(?=[_$[:alpha:]\"'`])",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.export.tsx"
@@ -883,7 +873,7 @@
     },
     "class-or-interface-declaration": {
       "name": "meta.class.tsx",
-      "begin": "(?<!\\.|\\$)\\b(?:(export)\\s+)?\\b(?:(abstract)\\s+)?\\b(?:(class)|(interface))\\b",
+      "begin": "(?<!\\.|\\$)\\b(?:(export)\\s+)?\\b(?:(abstract)\\s+)?\\b(?:(class)|(interface))\\b(?=\\s+|/[/*])",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.export.tsx"
@@ -1018,6 +1008,12 @@
         {
           "include": "#property-accessor"
         },
+        {
+          "include": "#after-operator-block"
+        },
+        {
+          "include": "#decl-block"
+        },
         {
           "include": "#expression"
         },
@@ -1125,7 +1121,7 @@
             },
             {
               "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)"
+              "match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=(\\?\\s*)?\\s*\n  (=\\s*(\n    (async\\s+) |\n    (function\\s*[(<]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>) |\n    ([(]\\s*(([)]\\s*:)|([_$[:alpha:]][_$[:alnum:]]*\\s*:)|(\\.\\.\\.) )) |\n    ([<]\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s*[^=>])|(\\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",
@@ -1165,7 +1161,7 @@
           "name": "keyword.generator.asterisk.tsx"
         }
       },
-      "end": "(?=\\}|;|,)|(?<=\\})",
+      "end": "(?=\\}|;|,|$)|(?<=\\})",
       "patterns": [
         {
           "include": "#method-declaration-name"
@@ -1182,46 +1178,11 @@
         {
           "include": "#return-type"
         },
-        {
-          "include": "#method-overload-declaration"
-        },
         {
           "include": "#decl-block"
         }
       ]
     },
-    "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*[\\(\\<]))",
-      "beginCaptures": {
-        "1": {
-          "name": "storage.modifier.tsx"
-        },
-        "2": {
-          "name": "storage.modifier.tsx"
-        },
-        "3": {
-          "name": "storage.modifier.async.tsx"
-        },
-        "4": {
-          "name": "storage.type.property.tsx"
-        },
-        "5": {
-          "name": "keyword.operator.new.tsx"
-        },
-        "6": {
-          "name": "storage.type.tsx"
-        },
-        "7": {
-          "name": "keyword.generator.asterisk.tsx"
-        }
-      },
-      "end": "(?=\\(|\\<)",
-      "patterns": [
-        {
-          "include": "#method-declaration-name"
-        }
-      ]
-    },
     "method-declaration-name": {
       "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\\'[^']*\\')|(\\\"[^\"]*\\\")|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])+\\]))\\s*(\\??)\\s*[\\(\\<])",
       "end": "(?=\\(|\\<)",
@@ -1274,7 +1235,7 @@
           "include": "#return-type"
         },
         {
-          "include": "#method-overload-declaration"
+          "include": "#object-literal-method-overload-declaration"
         },
         {
           "include": "#decl-block"
@@ -1382,7 +1343,7 @@
           "name": "meta.definition.function.tsx entity.name.function.tsx"
         }
       },
-      "end": "(?=;|\\})|(?<=\\})",
+      "end": "(?=$|;)|(?<=\\})",
       "patterns": [
         {
           "include": "#comment"
@@ -1396,34 +1357,46 @@
         {
           "include": "#return-type"
         },
-        {
-          "include": "#function-overload-declaration"
-        },
         {
           "include": "#decl-block"
         }
       ]
     },
-    "function-overload-declaration": {
-      "name": "meta.function.overload.tsx",
-      "match": "(?<!\\.|\\$)\\b(?:(export)\\s+)?(?:(async)\\s+)?(function\\b)(?:\\s*(\\*))?(?:(?:\\s+|(?<=\\*))([_$[:alpha:]][_$[:alnum:]]*))?\\s*",
-      "captures": {
+    "function-expression": {
+      "name": "meta.function.expression.tsx",
+      "begin": "(?<!\\.|\\$)\\b(?:(async)\\s+)?(function\\b)(?:\\s*(\\*))?(?:(?:\\s+|(?<=\\*))([_$[:alpha:]][_$[:alnum:]]*))?\\s*",
+      "beginCaptures": {
         "1": {
-          "name": "keyword.control.export.tsx"
-        },
-        "2": {
           "name": "storage.modifier.async.tsx"
         },
-        "3": {
+        "2": {
           "name": "storage.type.function.tsx"
         },
-        "4": {
+        "3": {
           "name": "keyword.generator.asterisk.tsx"
         },
-        "5": {
+        "4": {
           "name": "meta.definition.function.tsx entity.name.function.tsx"
         }
-      }
+      },
+      "end": "(?<=\\})",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#type-parameters"
+        },
+        {
+          "include": "#function-parameters"
+        },
+        {
+          "include": "#return-type"
+        },
+        {
+          "include": "#decl-block"
+        }
+      ]
     },
     "object-literal": {
       "name": "meta.objectliteral.tsx",
@@ -1496,7 +1469,7 @@
           }
         },
         {
-          "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)",
+          "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*:)|([_$[:alpha:]][_$[:alnum:]]*\\s*:)|(\\.\\.\\.) )) |\n    ([<]\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s*[^=>])|(\\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"
@@ -1694,7 +1667,7 @@
           "name": "keyword.operator.type.annotation.tsx"
         }
       },
-      "end": "(?<!:)((?=$)|(?=\\{|;|//|\\}))",
+      "end": "(?<!:)((?=$)|(?=[{};,]|//))",
       "patterns": [
         {
           "include": "#comment"
@@ -1750,7 +1723,6 @@
       ]
     },
     "type": {
-      "name": "meta.type.tsx",
       "patterns": [
         {
           "include": "#comment"
@@ -1838,7 +1810,7 @@
     },
     "type-builtin-literals": {
       "name": "support.type.builtin.tsx",
-      "match": "(?<!\\.|\\$)\\b(this|true|false|undefined|null)\\b(?!\\$)"
+      "match": "(?<!\\.|\\$)\\b(this|true|false|undefined|null|object)\\b(?!\\$)"
     },
     "type-paren-or-function-parameters": {
       "name": "meta.type.paren.cover.tsx",
@@ -1889,16 +1861,6 @@
             }
           ]
         },
-        {
-          "name": "meta.type.function.tsx",
-          "begin": "(?<=\\>)\\s*(?=\\()",
-          "end": "(?<=\\))",
-          "patterns": [
-            {
-              "include": "#function-parameters"
-            }
-          ]
-        },
         {
           "name": "meta.type.function.tsx",
           "begin": "(?x)(\n  (?=\n    [(]\\s*(\n      ([)]) | \n      (\\.\\.\\.) |\n      ([_$[:alnum:]]+\\s*(\n        ([:,?=])|\n        ([)]\\s*=>)\n      ))\n    )\n  )\n)",
@@ -2031,6 +1993,10 @@
           "name": "storage.modifier.tsx",
           "match": "(?<!\\.|\\$)\\b(extends)\\b(?!\\$)"
         },
+        {
+          "name": "keyword.operator.assignment.tsx",
+          "match": "\\=(?!>)"
+        },
         {
           "include": "#type"
         },
@@ -2040,16 +2006,34 @@
       ]
     },
     "variable-initializer": {
-      "begin": "(?<!=|!)(=)(?!=)",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.operator.assignment.tsx"
-        }
-      },
-      "end": "(?=$|[,);}\\]])",
       "patterns": [
         {
-          "include": "#expression"
+          "begin": "(?<!=|!)(=)(?!=)(?=\\s*\\S)",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.operator.assignment.tsx"
+            }
+          },
+          "end": "(?=$|[,);}\\]])",
+          "patterns": [
+            {
+              "include": "#expression"
+            }
+          ]
+        },
+        {
+          "begin": "(?<!=|!)(=)(?!=)",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.operator.assignment.tsx"
+            }
+          },
+          "end": "(?=[,);}\\]])|(?=^\\s*$)",
+          "patterns": [
+            {
+              "include": "#expression"
+            }
+          ]
         }
       ]
     },
@@ -2269,10 +2253,6 @@
           "name": "support.class.node.tsx",
           "match": "(?x)(?<!\\.|\\$)\\b(Buffer|EventEmitter|Server|Pipe|Socket|REPLServer|ReadStream|WriteStream|Stream\n  |Inflate|Deflate|InflateRaw|DeflateRaw|GZip|GUnzip|Unzip|Zip)\\b(?!\\$)"
         },
-        {
-          "name": "support.module.node.tsx",
-          "match": "(?x)(?<!\\.|\\$)\\b(assert|buffer|child_process|cluster|constants|crypto|dgram|dns|domain|events|fs|http|https|net\n  |os|path|punycode|querystring|readline|repl|stream|string_decoder|timers|tls|tty|url|util|vm|zlib)\\b(?!\\$)"
-        },
         {
           "match": "(?x)(?<!\\.|\\$)\\b(process)(?:(\\.)(?:\n  (arch|argv|config|connected|env|execArgv|execPath|exitCode|mainModule|pid|platform|release|stderr|stdin|stdout|title|version|versions)\n  |\n  (abort|chdir|cwd|disconnect|exit|[sg]ete?[gu]id|send|[sg]etgroups|initgroups|kill|memoryUsage|nextTick|umask|uptime|hrtime)\n))?\\b(?!\\$)",
           "captures": {
@@ -2331,12 +2311,18 @@
       ]
     },
     "function-call": {
-      "begin": "(?=(\\.\\s*)?([_$[:alpha:]][_$[:alnum:]]*)\\s*(<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\()",
-      "end": "(?<=\\))(?!(\\.\\s*)?([_$[:alpha:]][_$[:alnum:]]*)\\s*(<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\()",
+      "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\.\\s*)*|(\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\()",
+      "end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\.\\s*)*|(\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\()",
       "patterns": [
+        {
+          "include": "#literal"
+        },
         {
           "include": "#support-objects"
         },
+        {
+          "include": "#object-identifiers"
+        },
         {
           "include": "#punctuation-accessor"
         },
@@ -2378,53 +2364,68 @@
     "identifiers": {
       "patterns": [
         {
-          "name": "support.class.tsx",
-          "match": "([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\\.\\s*prototype\\b(?!\\$))"
+          "include": "#object-identifiers"
         },
         {
-          "match": "(?x)(\\.)\\s*(?:\n  ([[:upper:]][_$[:digit:][:upper:]]*) |\n  ([_$[:alpha:]][_$[:alnum:]]*)\n)(?=\\s*\\.\\s*[_$[:alpha:]][_$[:alnum:]]*)",
+          "match": "(?x)(?:(\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  (async\\s+)|(function\\s*[(<])|(function\\s+)|\n  ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)|\n  ([(]\\s*(([)]\\s*:)|([_$[:alpha:]][_$[:alnum:]]*\\s*:)|(\\.\\.\\.) )) |\n  ([<]\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s*[^=>])|(\\s*[,]))) |\n  ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>)))",
           "captures": {
             "1": {
               "name": "punctuation.accessor.tsx"
             },
             "2": {
-              "name": "variable.other.constant.object.property.tsx"
-            },
-            "3": {
-              "name": "variable.other.object.property.tsx"
+              "name": "entity.name.function.tsx"
             }
           }
         },
         {
-          "match": "(?x)(?:(\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  (async\\s+)|(function\\s*[(<])|(function\\s+)|\n  ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)|\n  ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>)))",
+          "match": "(\\.)\\s*([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])",
           "captures": {
             "1": {
               "name": "punctuation.accessor.tsx"
             },
             "2": {
-              "name": "entity.name.function.tsx"
+              "name": "variable.other.constant.property.tsx"
             }
           }
         },
         {
-          "match": "(\\.)\\s*([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])",
+          "match": "(\\.)\\s*([_$[:alpha:]][_$[:alnum:]]*)",
           "captures": {
             "1": {
               "name": "punctuation.accessor.tsx"
             },
             "2": {
-              "name": "variable.other.constant.property.tsx"
+              "name": "variable.other.property.tsx"
             }
           }
         },
         {
-          "match": "(\\.)\\s*([_$[:alpha:]][_$[:alnum:]]*)",
+          "name": "variable.other.constant.tsx",
+          "match": "([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])"
+        },
+        {
+          "name": "variable.other.readwrite.tsx",
+          "match": "[_$[:alpha:]][_$[:alnum:]]*"
+        }
+      ]
+    },
+    "object-identifiers": {
+      "patterns": [
+        {
+          "name": "support.class.tsx",
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\\.\\s*prototype\\b(?!\\$))"
+        },
+        {
+          "match": "(?x)(\\.)\\s*(?:\n  ([[:upper:]][_$[:digit:][:upper:]]*) |\n  ([_$[:alpha:]][_$[:alnum:]]*)\n)(?=\\s*\\.\\s*[_$[:alpha:]][_$[:alnum:]]*)",
           "captures": {
             "1": {
               "name": "punctuation.accessor.tsx"
             },
             "2": {
-              "name": "variable.other.property.tsx"
+              "name": "variable.other.constant.object.property.tsx"
+            },
+            "3": {
+              "name": "variable.other.object.property.tsx"
             }
           }
         },
@@ -2438,14 +2439,6 @@
               "name": "variable.other.object.tsx"
             }
           }
-        },
-        {
-          "name": "variable.other.constant.tsx",
-          "match": "([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])"
-        },
-        {
-          "name": "variable.other.readwrite.tsx",
-          "match": "[_$[:alpha:]][_$[:alnum:]]*"
         }
       ]
     },
@@ -2464,7 +2457,7 @@
           "name": "keyword.operator.new.tsx"
         }
       },
-      "end": "(?<=\\))|(?=[;),]|$|((?<!\\.|\\$)\\bnew\\b(?!\\$)))",
+      "end": "(?<=\\))|(?=[;),}]|$|((?<!\\.|\\$)\\bnew\\b(?!\\$)))",
       "patterns": [
         {
           "include": "#paren-expression"
@@ -2515,7 +2508,7 @@
         },
         {
           "name": "meta.object.member.tsx",
-          "begin": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(:)(?=\\s*(\n  (async\\s+)|(function\\s*[(<])|(function\\s+)|\n  ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)|\n  ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>))))",
+          "begin": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(:)(?=\\s*(\n  (async\\s+)|(function\\s*[(<])|(function\\s+)|\n  ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)|\n  ([(]\\s*(([)]\\s*:)|([_$[:alpha:]][_$[:alnum:]]*\\s*:)|(\\.\\.\\.) )) |\n  ([<]\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s*[^=>])|(\\s*[,]))) |\n  ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>))))",
           "beginCaptures": {
             "0": {
               "name": "meta.object-literal.key.tsx"
@@ -2587,6 +2580,17 @@
           "name": "keyword.control.flow.tsx",
           "match": "(?<!\\.|\\$)\\b(await)\\b(?!\\$)"
         },
+        {
+          "match": "(?<!\\.|\\$)\\b(yield)\\b(?!\\$)(?:\\s*(\\*))?",
+          "captures": {
+            "1": {
+              "name": "keyword.control.flow.tsx"
+            },
+            "2": {
+              "name": "keyword.generator.asterisk.tsx"
+            }
+          }
+        },
         {
           "name": "keyword.operator.expression.delete.tsx",
           "match": "(?<!\\.|\\$)\\bdelete\\b(?!\\$)"
@@ -2692,15 +2696,6 @@
     },
     "arrow-function": {
       "patterns": [
-        {
-          "name": "meta.arrow.tsx",
-          "match": "(?<!\\.|\\$)(\\basync)(?=\\s*[<(])",
-          "captures": {
-            "1": {
-              "name": "storage.modifier.async.tsx"
-            }
-          }
-        },
         {
           "name": "meta.arrow.tsx",
           "match": "(?:(?<!\\.|\\$)(\\basync)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)\\s*(?==>)",
@@ -2715,8 +2710,13 @@
         },
         {
           "name": "meta.arrow.tsx",
-          "begin": "(?x)\\s*(?=(<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>)",
-          "end": "(?==>)",
+          "begin": "(?x) (?:\n  (?<!\\.|\\$)(\\basync)(?=\\s*[<(])\n) | ((?<![})\\]])\\s*\n  (?=\n    # sure shot arrow functions even if => is on new line\n    (\n      [(]\\s*\n      (\n        ([)]\\s*:) |                               # ():\n        ([_$[:alpha:]][_$[:alnum:]]*\\s*:) |       # [(]param:\n        (\\.\\.\\.)                                  # [(]...\n      )\n    ) |\n    (\n      [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends \n    ) |\n    # arrow function possible to detect only with => on same line\n    (\n      (<([^<>]|\\<[^<>]+\\>)+>\\s*)?                 # typeparameters\n      \\(([^()]|\\([^()]*\\))*\\)                     # parameteres\n      (\\s*:\\s*(.)*)?                              # return type\n      \\s*=>                                       # arrow operator\n    )\n  )\n)",
+          "beginCaptures": {
+            "1": {
+              "name": "storage.modifier.async.tsx"
+            }
+          },
+          "end": "(?==>|\\{)",
           "patterns": [
             {
               "include": "#comment"
@@ -2760,8 +2760,28 @@
           "name": "keyword.operator.type.annotation.tsx"
         }
       },
-      "end": "(?<!:)((?=$)|(?==>|;|//))",
+      "end": "(?==>|\\{)",
       "patterns": [
+        {
+          "name": "meta.object.type.tsx",
+          "begin": "(?<=:)\\s*(\\{)",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.block.tsx"
+            }
+          },
+          "end": "\\}",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.block.tsx"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#type-object-members"
+            }
+          ]
+        },
         {
           "include": "#type-predicate-operator"
         },
@@ -2853,7 +2873,7 @@
     "regex": {
       "patterns": [
         {
-          "name": "string.regex.tsx",
+          "name": "string.regexp.tsx",
           "begin": "(?<=[=(:,\\[?+!]|return|case|=>|&&|\\|\\||\\*\\/)\\s*(/)(?![/*])(?=(?:[^/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+/(?![/*])[gimy]*(?!\\s*[a-zA-Z0-9_$]))",
           "beginCaptures": {
             "1": {
@@ -2876,7 +2896,7 @@
           ]
         },
         {
-          "name": "string.regex.tsx",
+          "name": "string.regexp.tsx",
           "begin": "(?<![_$[:alnum:]])/(?![/*])(?=(?:[^/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+/(?![/*])[gimy]*(?!\\s*[a-zA-Z0-9_$]))",
           "beginCaptures": {
             "0": {
@@ -3103,7 +3123,6 @@
       ]
     },
     "literal": {
-      "name": "literal.tsx",
       "patterns": [
         {
           "include": "#numeric-literal"