github-linguist 4.8.15 → 4.8.16

data/grammars/source.ts.json

@@ -1,202 +1,303 @@
 {
+  "name": "TypeScript",
+  "scopeName": "source.ts",
   "fileTypes": [
     "ts"
   ],
-  "name": "TypeScript",
+  "uuid": "ef98eb90-bf9b-11e4-bb52-0800200c9a66",
   "patterns": [
     {
-      "include": "#expression"
+      "include": "#statements"
     }
   ],
   "repository": {
-    "access-modifier": {
-      "match": "\\b(public|protected|private)\\b",
-      "name": "storage.modifier.ts"
-    },
-    "arithmetic-operator": {
-      "match": "\\*|/|\\-\\-|\\-|\\+\\+|\\+|%",
-      "name": "keyword.operator.arithmetic.ts"
-    },
-    "array-literal": {
-      "begin": "\\[",
-      "beginCaptures": {
-        "0": {
-          "name": "meta.brace.square.ts"
-        }
-      },
-      "end": "\\]",
-      "endCaptures": {
-        "0": {
-          "name": "meta.brace.square.ts"
-        }
-      },
-      "name": "meta.array.literal.ts",
+    "statements": {
       "patterns": [
+        {
+          "include": "#string"
+        },
+        {
+          "include": "#regex"
+        },
+        {
+          "include": "#template"
+        },
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#literal"
+        },
+        {
+          "include": "#declaration"
+        },
+        {
+          "include": "#switch-statement"
+        },
+        {
+          "include": "#for-loop"
+        },
+        {
+          "include": "#after-operator-block"
+        },
+        {
+          "include": "#decl-block"
+        },
+        {
+          "include": "#control-statement"
+        },
         {
           "include": "#expression"
+        },
+        {
+          "include": "#punctuation-semicolon"
         }
       ]
     },
-    "assignment-operator": {
-      "match": "<<=|>>>=|>>=|\\*=|(?<!\\()/=|%=|\\+=|\\-=|&=|\\^=",
-      "name": "keyword.operator.assignment.ts"
-    },
-    "await-modifier": {
-      "match": "\\bawait\\b",
-      "name": "storage.modifier.ts"
-    },
-    "block": {
-      "begin": "\\{",
+    "var-expr": {
+      "name": "meta.var.expr.ts",
+      "begin": "(?<!\\.|\\$)(?:(\\bexport)\\s+)?\\b(var|let|const(?!\\s+enum\\b))\\b(?!\\$)",
       "beginCaptures": {
-        "0": {
-          "name": "meta.brace.curly.ts"
-        }
-      },
-      "end": "\\}",
-      "endCaptures": {
-        "0": {
-          "name": "meta.brace.curly.ts"
+        "1": {
+          "name": "keyword.control.export.ts"
+        },
+        "2": {
+          "name": "storage.type.ts"
         }
       },
-      "name": "meta.block.ts",
+      "end": "(?=$|;|}|(\\s+(of|in)\\s+))",
       "patterns": [
         {
-          "include": "#object-member"
+          "include": "#destructuring-variable"
         },
         {
-          "include": "#expression"
+          "include": "#var-single-variable"
+        },
+        {
+          "include": "#variable-initializer"
+        },
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#punctuation-comma"
         }
       ]
     },
-    "boolean-literal": {
-      "match": "\\b(false|true)\\b",
-      "name": "constant.language.boolean.ts"
-    },
-    "case-clause": {
-      "begin": "(?<!\\.)\\b(case|default(?=:))\\b",
+    "var-single-variable": {
+      "name": "meta.var-single-variable.expr.ts",
+      "begin": "([_$[:alpha:]][_$[:alnum:]]*)",
       "beginCaptures": {
         "1": {
-          "name": "keyword.control.ts"
+          "name": "meta.definition.variable.ts variable.other.readwrite.ts"
         }
       },
-      "end": ":",
-      "name": "case-clause.expr.ts",
+      "end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
       "patterns": [
         {
-          "include": "#expression-type"
+          "include": "#type-annotation"
+        },
+        {
+          "include": "#string"
+        },
+        {
+          "include": "#comment"
         }
       ]
     },
-    "cast": {
-      "begin": "(?:(?<=return|throw|yield|await|[=(,:>]))\\s*(<)(?!<?\\=)",
-      "beginCaptures": {
-        "1": {
-          "name": "meta.brace.angle.ts"
-        }
-      },
-      "end": ">",
-      "endCaptures": {
-        "0": {
-          "name": "meta.brace.angle.ts"
-        }
-      },
-      "name": "cast.expr.ts",
+    "destructuring-variable": {
       "patterns": [
         {
-          "include": "#type"
+          "name": "meta.object-binding-pattern-variable.ts",
+          "begin": "(?<!=|:|of|in)\\s*(?=\\{)",
+          "end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
+          "patterns": [
+            {
+              "include": "#object-binding-pattern"
+            },
+            {
+              "include": "#type-annotation"
+            },
+            {
+              "include": "#comment"
+            }
+          ]
+        },
+        {
+          "name": "meta.array-binding-pattern-variable.ts",
+          "begin": "(?<!=|:|of|in)\\s*(?=\\[)",
+          "end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
+          "patterns": [
+            {
+              "include": "#array-binding-pattern"
+            },
+            {
+              "include": "#type-annotation"
+            },
+            {
+              "include": "#comment"
+            }
+          ]
         }
       ]
     },
-    "comment": {
-      "name": "comment.ts",
+    "object-binding-element": {
       "patterns": [
         {
-          "include": "#comment-block-doc"
+          "include": "#comment"
+        },
+        {
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(:)",
+          "beginCaptures": {
+            "1": {
+              "name": "variable.object.property.ts"
+            },
+            "2": {
+              "name": "punctuation.destructuring.ts"
+            }
+          },
+          "end": "(?=,|\\})",
+          "patterns": [
+            {
+              "include": "#object-binding-pattern"
+            },
+            {
+              "include": "#array-binding-pattern"
+            },
+            {
+              "name": "meta.definition.variable.ts variable.other.readwrite.ts",
+              "match": "([_$[:alpha:]][_$[:alnum:]]*)"
+            },
+            {
+              "include": "#variable-initializer"
+            }
+          ]
         },
         {
-          "include": "#comment-block"
+          "include": "#object-binding-pattern"
         },
         {
-          "include": "#comment-line"
+          "include": "#destructuring-variable-rest"
+        },
+        {
+          "include": "#variable-initializer"
+        },
+        {
+          "include": "#punctuation-comma"
         }
       ]
     },
-    "comment-block": {
-      "begin": "/\\*",
-      "end": "\\*/",
-      "name": "comment.block.ts"
-    },
-    "comment-block-doc": {
-      "begin": "/\\*\\*(?!/)",
-      "end": "\\*/",
-      "name": "comment.block.documentation.ts"
-    },
-    "comment-line": {
-      "match": "(//).*$\\n?",
-      "name": "comment.line.ts"
+    "array-binding-element": {
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#object-binding-pattern"
+        },
+        {
+          "include": "#array-binding-pattern"
+        },
+        {
+          "include": "#destructuring-variable-rest"
+        },
+        {
+          "include": "#variable-initializer"
+        },
+        {
+          "include": "#punctuation-comma"
+        }
+      ]
     },
-    "control-statement": {
-      "match": "(?<!\\.)\\b(break|catch|continue|debugger|declare|do|else|finally|for|if|return|switch|throw|try|while|with|super|case|default|yield)\\b",
-      "name": "keyword.control.ts"
+    "destructuring-variable-rest": {
+      "match": "(?:(\\.\\.\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)",
+      "captures": {
+        "1": {
+          "name": "keyword.operator.rest.ts"
+        },
+        "2": {
+          "name": "meta.definition.variable.ts variable.other.readwrite.ts"
+        }
+      }
     },
-    "decl-block": {
-      "begin": "\\{",
+    "object-binding-pattern": {
+      "begin": "(?:(\\.\\.\\.)\\s*)?(\\{)",
       "beginCaptures": {
-        "0": {
-          "name": "meta.brace.curly.ts"
+        "1": {
+          "name": "keyword.operator.rest.ts"
+        },
+        "2": {
+          "name": "punctuation.definition.binding-pattern.object.ts"
         }
       },
       "end": "\\}",
       "endCaptures": {
         "0": {
-          "name": "meta.brace.curly.ts"
+          "name": "punctuation.definition.binding-pattern.object.ts"
         }
       },
-      "name": "meta.decl.block.ts",
       "patterns": [
         {
-          "include": "#expression"
+          "include": "#object-binding-element"
         }
       ]
     },
-    "declaration": {
-      "name": "meta.declaration.ts",
-      "patterns": [
-        {
-          "include": "#function-declaration"
+    "array-binding-pattern": {
+      "begin": "(?:(\\.\\.\\.)\\s*)?(\\[)",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.operator.rest.ts"
         },
+        "2": {
+          "name": "punctuation.definition.binding-pattern.array.ts"
+        }
+      },
+      "end": "\\]",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.binding-pattern.array.ts"
+        }
+      },
+      "patterns": [
         {
-          "include": "#object-declaration"
-        },
+          "include": "#array-binding-element"
+        }
+      ]
+    },
+    "ternary-expression": {
+      "begin": "(?=\\?)",
+      "end": "(?=$|[;,})\\]])",
+      "patterns": [
         {
-          "include": "#type-declaration"
+          "include": "#ternary-operator"
         },
         {
-          "include": "#enum-declaration"
+          "include": "#expression"
         }
       ]
     },
-    "enum-declaration": {
-      "captures": {
-        "1": {
-          "name": "storage.modifier.ts"
-        },
-        "2": {
-          "name": "storage.type.ts"
-        },
-        "3": {
-          "name": "entity.name.class.ts"
+    "ternary-operator": {
+      "begin": "(\\?)",
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.operator.ternary.ts"
+        }
+      },
+      "end": "(:)",
+      "endCaptures": {
+        "0": {
+          "name": "keyword.operator.ternary.ts"
         }
       },
-      "match": "(?:\\b(const)\\s+)?\\b(enum)\\s+([a-zA-Z_$][\\w$]*)",
-      "name": "meta.enum.declaration.ts"
+      "patterns": [
+        {
+          "include": "#expression"
+        }
+      ]
     },
     "expression": {
       "name": "meta.expression.ts",
       "patterns": [
-        {
-          "include": "#for-in-simple"
-        },
         {
           "include": "#string"
         },
@@ -213,442 +314,633 @@
           "include": "#literal"
         },
         {
-          "include": "#paren-expression"
+          "include": "#function-declaration"
         },
         {
-          "include": "#var-expr"
+          "include": "#class-or-interface-declaration"
         },
         {
-          "include": "#declaration"
+          "include": "#arrow-function"
         },
         {
           "include": "#cast"
         },
         {
-          "include": "#new-expr"
-        },
-        {
-          "include": "#switch-statement"
+          "include": "#ternary-expression"
         },
         {
-          "include": "#block"
+          "include": "#new-expr"
         },
         {
-          "include": "#import-operator"
+          "include": "#object-literal"
         },
         {
-          "include": "#expression-operator"
+          "include": "#expression-operators"
         },
         {
-          "include": "#imply-operator"
+          "include": "#support-objects"
         },
         {
-          "include": "#relational-operator"
+          "include": "#function-call"
         },
         {
-          "include": "#arithmetic-operator"
+          "include": "#identifiers"
         },
         {
-          "include": "#logic-operator"
+          "include": "#paren-expression"
         },
         {
-          "include": "#assignment-operator"
+          "include": "#punctuation-comma"
         },
         {
-          "include": "#storage-keyword"
-        },
+          "include": "#punctuation-accessor"
+        }
+      ]
+    },
+    "control-statement": {
+      "patterns": [
         {
-          "include": "#type-primitive"
+          "name": "keyword.control.trycatch.ts",
+          "match": "(?<!\\.|\\$)\\b(catch|finally|throw|try)\\b(?!\\$)"
         },
         {
-          "include": "#function-call"
+          "name": "keyword.control.loop.ts",
+          "match": "(?<!\\.|\\$)\\b(break|continue|do|goto|while)\\b(?!\\$)"
         },
         {
-          "include": "#case-clause"
+          "name": "keyword.control.flow.ts",
+          "match": "(?<!\\.|\\$)\\b(return)\\b(?!\\$)"
         },
         {
-          "include": "#control-statement"
-        }
-      ]
-    },
-    "expression-operator": {
-      "match": "\\b(delete|in|instanceof|new|typeof|as|is|of)\\b",
-      "name": "keyword.others.ts"
-    },
-    "expression-type": {
-      "name": "meta.expression.ts",
-      "patterns": [
-        {
-          "include": "#string"
+          "match": "(?<!\\.|\\$)\\b(yield)\\b(?!\\$)(?:\\s*(\\*))?",
+          "captures": {
+            "1": {
+              "name": "keyword.control.flow.ts"
+            },
+            "2": {
+              "name": "keyword.generator.asterisk.ts"
+            }
+          }
         },
         {
-          "include": "#regex"
+          "name": "keyword.control.switch.ts",
+          "match": "(?<!\\.|\\$)\\b(case|default|switch)\\b(?!\\$)"
         },
         {
-          "include": "#template"
+          "name": "keyword.control.conditional.ts",
+          "match": "(?<!\\.|\\$)\\b(else|if)\\b(?!\\$)"
         },
         {
-          "include": "#comment"
+          "name": "keyword.control.with.ts",
+          "match": "(?<!\\.|\\$)\\b(with)\\b(?!\\$)"
         },
         {
-          "include": "#literal"
+          "name": "keyword.other.debugger.ts",
+          "match": "(?<!\\.|\\$)\\b(debugger)\\b(?!\\$)"
         },
         {
-          "include": "#paren-expression"
-        },
+          "name": "storage.modifier.ts",
+          "match": "(?<!\\.|\\$)\\b(declare)\\b(?!\\$)"
+        }
+      ]
+    },
+    "declaration": {
+      "name": "meta.declaration.ts",
+      "patterns": [
         {
-          "include": "#ternary-expression"
+          "include": "#decorator"
         },
         {
-          "include": "#import-operator"
+          "include": "#var-expr"
         },
         {
-          "include": "#expression-operator"
+          "include": "#function-declaration"
         },
         {
-          "include": "#imply-operator"
+          "include": "#class-or-interface-declaration"
         },
         {
-          "include": "#relational-operator"
+          "include": "#type-declaration"
         },
         {
-          "include": "#arithmetic-operator"
+          "include": "#enum-declaration"
         },
         {
-          "include": "#logic-operator"
+          "include": "#namespace-declaration"
         },
         {
-          "include": "#assignment-operator"
+          "include": "#import-equals-declaration"
         },
         {
-          "include": "#type-primitive"
+          "include": "#import-declaration"
         },
         {
-          "include": "#function-call"
+          "include": "#export-declaration"
         }
       ]
     },
-    "field-declaration": {
-      "begin": "(?<!\\()\\s*((?:\\b[a-zA-Z_$][\\w$]*)|(?:\\'[^']*\\')|(?:\\\"[^\"]*\\\"))\\s*(\\?\\s*)?(?=(=|:))",
+    "decorator": {
+      "name": "meta.decorator.ts",
+      "begin": "(?<!\\.|\\$)\\@",
       "beginCaptures": {
-        "1": {
-          "name": "variable.ts"
-        },
-        "2": {
-          "name": "keyword.others.ts"
+        "0": {
+          "name": "punctuation.decorator.ts"
         }
       },
-      "end": "(?=\\}|;|,|$)|(?<=\\})",
-      "name": "meta.field.declaration.ts",
+      "end": "(?=\\s)",
       "patterns": [
         {
           "include": "#expression"
         }
       ]
     },
-    "for-in-simple": {
-      "captures": {
+    "type-declaration": {
+      "name": "meta.type.declaration.ts",
+      "begin": "(?<!\\.|\\$)(?:(\\bexport)\\s+)?\\b(type)\\b\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*",
+      "beginCaptures": {
         "1": {
-          "name": "storage.type.ts"
+          "name": "keyword.control.export.ts"
+        },
+        "2": {
+          "name": "storage.type.type.ts"
         },
         "3": {
-          "name": "keyword.others.ts"
+          "name": "entity.name.type.ts"
         }
       },
-      "match": "(?<=\\()\\s*\\b(var|let|const)\\s+([a-zA-Z_$][\\w$]*)\\s+(in|of)\\b",
-      "name": "forin.expr.ts"
-    },
-    "function-call": {
-      "name": "functioncall.expr.ts",
+      "end": "(?=[};]|\\bvar\\b|\\blet\\b|\\bconst\\b|\\btype\\b|\\bfunction\\b|\\bclass\\b|\\binterface\\b|\\bnamespace\\b|\\bmodule\\b|\\bimport\\b|\\benum\\b|\\bdeclare\\b|\\bexport\\b|\\babstract\\b|\\basync\\b)",
       "patterns": [
         {
-          "include": "#await-modifier"
+          "include": "#comment"
         },
         {
           "include": "#type-parameters"
         },
         {
-          "include": "#paren-expression"
+          "include": "#type"
+        },
+        {
+          "match": "(=)\\s*",
+          "captures": {
+            "1": {
+              "name": "keyword.operator.assignment.ts"
+            }
+          }
         }
       ]
     },
-    "function-declaration": {
-      "begin": "\\b(?:(export)\\s+)?(?:(async)\\s+)?(function\\b)(?:\\s+([a-zA-Z_$][\\w$]*))?\\s*",
+    "enum-declaration": {
+      "name": "meta.enum.declaration.ts",
+      "begin": "(?<!\\.|\\$)(?:(\\bexport)\\s+)?(?:\\b(const)\\s+)?\\b(enum)\\s+([_$[:alpha:]][_$[:alnum:]]*)",
       "beginCaptures": {
         "1": {
-          "name": "storage.type.ts"
+          "name": "keyword.control.export.ts"
         },
         "2": {
           "name": "storage.modifier.ts"
         },
         "3": {
-          "name": "storage.type.function.ts"
+          "name": "storage.type.enum.ts"
         },
         "4": {
-          "name": "entity.name.function.ts"
+          "name": "entity.name.type.enum.ts"
         }
       },
-      "end": "(?=;|\\})|(?<=\\})",
-      "name": "meta.function.ts",
+      "end": "(?<=\\})",
       "patterns": [
         {
           "include": "#comment"
         },
         {
-          "include": "#type-parameters"
+          "begin": "\\{",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.block.ts"
+            }
+          },
+          "end": "\\}",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.block.ts"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#comment"
+            },
+            {
+              "begin": "([_$[:alpha:]][_$[:alnum:]]*)",
+              "beginCaptures": {
+                "0": {
+                  "name": "variable.other.enummember.ts"
+                }
+              },
+              "end": "(?=,|\\}|$)",
+              "patterns": [
+                {
+                  "include": "#comment"
+                },
+                {
+                  "include": "#variable-initializer"
+                }
+              ]
+            },
+            {
+              "begin": "(?=(?:(?:\\'[^']*\\')|(?:\\\"[^\"]*\\\")))",
+              "end": "(?=,|\\}|$)",
+              "patterns": [
+                {
+                  "include": "#string"
+                },
+                {
+                  "include": "#comment"
+                },
+                {
+                  "include": "#variable-initializer"
+                }
+              ]
+            },
+            {
+              "include": "#punctuation-comma"
+            }
+          ]
+        }
+      ]
+    },
+    "namespace-declaration": {
+      "name": "meta.namespace.declaration.ts",
+      "begin": "(?<!\\.|\\$)(?:(\\bexport)\\s+)?\\b(namespace|module)\\s+",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.export.ts"
         },
+        "2": {
+          "name": "storage.type.namespace.ts"
+        }
+      },
+      "end": "(?=$|\\{)",
+      "patterns": [
         {
-          "include": "#function-type-parameters"
+          "include": "#comment"
         },
         {
-          "include": "#return-type"
+          "include": "#string"
         },
         {
-          "include": "#function-overload-declaration"
+          "name": "entity.name.type.module.ts",
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)"
         },
         {
-          "include": "#decl-block"
+          "name": "punctuation.accessor.ts",
+          "match": "\\."
         }
       ]
     },
-    "function-overload-declaration": {
-      "captures": {
+    "import-equals-declaration": {
+      "patterns": [
+        {
+          "name": "meta.import-equals.external.ts",
+          "begin": "(?<!\\.|\\$)(?:(\\bexport)\\s+)?\\b(import)\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*(=)\\s*(require)\\s*(\\()",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.export.ts"
+            },
+            "2": {
+              "name": "keyword.control.import.ts"
+            },
+            "3": {
+              "name": "variable.other.readwrite.alias.ts"
+            },
+            "4": {
+              "name": "keyword.operator.assignment.ts"
+            },
+            "5": {
+              "name": "keyword.control.require.ts"
+            },
+            "6": {
+              "name": "meta.brace.round.ts"
+            }
+          },
+          "end": "\\)",
+          "endCaptures": {
+            "0": {
+              "name": "meta.brace.round.ts"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#comment"
+            },
+            {
+              "include": "#string"
+            }
+          ]
+        },
+        {
+          "name": "meta.import-equals.internal.ts",
+          "begin": "(?<!\\.|\\$)(?:(\\bexport)\\s+)?\\b(import)\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s*(=)\\s*(?!require\\b)",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.export.ts"
+            },
+            "2": {
+              "name": "keyword.control.import.ts"
+            },
+            "3": {
+              "name": "variable.other.readwrite.alias.ts"
+            },
+            "4": {
+              "name": "keyword.operator.assignment.ts"
+            }
+          },
+          "end": "(?=;|$)",
+          "patterns": [
+            {
+              "include": "#comment"
+            },
+            {
+              "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\.)",
+              "captures": {
+                "1": {
+                  "name": "entity.name.type.module.ts"
+                },
+                "2": {
+                  "name": "punctuation.accessor.ts"
+                }
+              }
+            },
+            {
+              "name": "variable.other.readwrite.ts",
+              "match": "([_$[:alpha:]][_$[:alnum:]]*)"
+            }
+          ]
+        }
+      ]
+    },
+    "import-declaration": {
+      "name": "meta.import.ts",
+      "begin": "(?<!\\.|\\$)(?:(\\bexport)\\s+)?\\b(import)(?!(\\s*:)|(\\$))\\b",
+      "beginCaptures": {
         "1": {
-          "name": "storage.type.ts"
+          "name": "keyword.control.export.ts"
         },
         "2": {
-          "name": "storage.type.function.ts"
-        },
-        "3": {
-          "name": "entity.name.function.ts"
+          "name": "keyword.control.import.ts"
         }
       },
-      "match": "\\b(?:(export)\\s+)?(function\\b)(?:\\s+([a-zA-Z_$][\\w$]*))?\\s*",
-      "name": "meta.function.overload.ts"
-    },
-    "function-type-parameters": {
-      "begin": "\\(",
-      "beginCaptures": {
-        "0": {
-          "name": "meta.brace.round.ts"
+      "end": "(?=;|$)",
+      "patterns": [
+        {
+          "include": "#import-export-declaration"
         }
-      },
-      "end": "\\)",
-      "endCaptures": {
-        "0": {
-          "name": "meta.brace.round.ts"
+      ]
+    },
+    "export-declaration": {
+      "patterns": [
+        {
+          "match": "(?<!\\.|\\$)\\b(export)\\s+(as)\\s+(namespace)\\s+([_$[:alpha:]][_$[:alnum:]]*)",
+          "captures": {
+            "1": {
+              "name": "keyword.control.export.ts"
+            },
+            "2": {
+              "name": "keyword.control.as.ts"
+            },
+            "3": {
+              "name": "storage.type.namespace.ts"
+            },
+            "4": {
+              "name": "entity.name.type.module.ts"
+            }
+          }
+        },
+        {
+          "name": "meta.export.default.ts",
+          "begin": "(?<!\\.|\\$)\\b(export)(?:(?:\\s*(=))|(?:\\s+(default)(?=\\s+)))",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.export.ts"
+            },
+            "2": {
+              "name": "keyword.operator.assignment.ts"
+            },
+            "3": {
+              "name": "keyword.control.default.ts"
+            }
+          },
+          "end": "(?=;|\\bexport\\b|\\bfunction\\b|\\bclass\\b|\\binterface\\b|\\blet\\b|\\bvar\\b|\\bconst\\b|\\bimport\\b|\\benum\\b|\\bnamespace\\b|\\bmodule\\b|\\btype\\b|\\babstract\\b|\\bdeclare\\b|\\basync\\b|$)",
+          "patterns": [
+            {
+              "include": "#expression"
+            }
+          ]
+        },
+        {
+          "name": "meta.export.ts",
+          "begin": "(?<!\\.|\\$)\\b(export)(?!(\\s*:)|(\\$))\\b",
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.control.export.ts"
+            }
+          },
+          "end": "(?=;|\\bexport\\b|\\bfunction\\b|\\bclass\\b|\\binterface\\b|\\blet\\b|\\bvar\\b|\\bconst\\b|\\bimport\\b|\\benum\\b|\\bnamespace\\b|\\bmodule\\b|\\btype\\b|\\babstract\\b|\\bdeclare\\b|\\basync\\b|$)",
+          "patterns": [
+            {
+              "include": "#import-export-declaration"
+            }
+          ]
         }
-      },
-      "name": "meta.function.type.parameter.ts",
+      ]
+    },
+    "import-export-declaration": {
       "patterns": [
         {
           "include": "#comment"
         },
         {
-          "include": "#parameter-name"
+          "include": "#string"
         },
         {
-          "include": "#type-annotation"
+          "include": "#import-export-block"
         },
         {
-          "include": "#variable-initializer"
+          "name": "keyword.control.from.ts",
+          "match": "\\bfrom\\b"
+        },
+        {
+          "include": "#import-export-clause"
         }
       ]
     },
-    "imply-operator": {
-      "match": "=>",
-      "name": "keyword.operator.ts"
-    },
-    "import-operator": {
-      "match": "\\b(import|from)\\b",
-      "name": "keyword.control.import.include.ts"
-    },
-    "indexer-declaration": {
-      "begin": "\\[",
+    "import-export-block": {
+      "name": "meta.block.ts",
+      "begin": "\\{",
       "beginCaptures": {
         "0": {
-          "name": "meta.brace.square.ts"
+          "name": "punctuation.definition.block.ts"
         }
       },
-      "end": "(\\])\\s*(\\?\\s*)?|$",
+      "end": "\\}",
       "endCaptures": {
-        "1": {
-          "name": "meta.brace.square.ts"
-        },
-        "2": {
-          "name": "keyword.others.ts"
+        "0": {
+          "name": "punctuation.definition.block.ts"
         }
       },
-      "name": "meta.indexer.declaration.ts",
       "patterns": [
         {
-          "include": "#type-annotation"
-        },
-        {
-          "include": "#indexer-parameter"
-        },
-        {
-          "include": "#expression"
+          "include": "#import-export-clause"
         }
       ]
     },
-    "indexer-parameter": {
-      "captures": {
-        "1": {
-          "name": "variable.parameter.ts"
-        }
-      },
-      "match": "([a-zA-Z_$][\\w$]*)(?=\\:)",
-      "name": "meta.indexer.parameter.ts"
-    },
-    "literal": {
-      "name": "literal.ts",
+    "import-export-clause": {
       "patterns": [
         {
-          "include": "#numeric-literal"
+          "include": "#comment"
         },
         {
-          "include": "#boolean-literal"
+          "comment": "(default|*|name) as alias",
+          "match": "(?x) (?: \\b(default)\\b | (\\*) | ([_$[:alpha:]][_$[:alnum:]]*)) \\s+  (as) \\s+ (?: (\\b default \\b | \\*) | ([_$[:alpha:]][_$[:alnum:]]*))",
+          "captures": {
+            "1": {
+              "name": "keyword.control.default.ts"
+            },
+            "2": {
+              "name": "constant.language.import-export-all.ts"
+            },
+            "3": {
+              "name": "variable.other.readwrite.ts"
+            },
+            "4": {
+              "name": "keyword.control.as.ts"
+            },
+            "5": {
+              "name": "invalid.illegal.ts"
+            },
+            "6": {
+              "name": "variable.other.readwrite.alias.ts"
+            }
+          }
         },
         {
-          "include": "#null-literal"
+          "include": "#punctuation-comma"
         },
         {
-          "include": "#undefined-literal"
+          "name": "constant.language.import-export-all.ts",
+          "match": "\\*"
         },
         {
-          "include": "#array-literal"
+          "name": "keyword.control.default.ts",
+          "match": "\\b(default)\\b"
         },
         {
-          "include": "#this-literal"
+          "name": "variable.other.readwrite.alias.ts",
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)"
         }
       ]
     },
-    "logic-operator": {
-      "match": "\\!|&&|&|~|\\^|\\|\\||\\|",
-      "name": "keyword.operator.arithmetic.ts"
-    },
-    "method-declaration": {
-      "begin": "\\b(?:(abstract)\\s+)?\\b(?:(public|private|protected)\\s+)?\\b(?:(async)\\s+)?(?:(get|set)\\s+)?(?:(new)|(?:\\b(constructor)\\b)|(?:([a-zA-Z_$][\\.\\w$]*)\\s*(\\??)))?\\s*(?=\\(|\\<)",
+    "class-or-interface-declaration": {
+      "name": "meta.class.ts",
+      "begin": "(?<!\\.|\\$)\\b(?:(export)\\s+)?\\b(?:(abstract)\\s+)?\\b(?:(class)|(interface))\\b",
       "beginCaptures": {
         "1": {
-          "name": "storage.modifier.ts"
+          "name": "keyword.control.export.ts"
         },
         "2": {
           "name": "storage.modifier.ts"
         },
         "3": {
-          "name": "storage.modifier.ts"
+          "name": "storage.type.class.ts"
         },
         "4": {
-          "name": "storage.type.property.ts"
-        },
-        "5": {
-          "name": "keyword.operator.ts"
-        },
-        "6": {
-          "name": "storage.type.ts"
-        },
-        "7": {
-          "name": "entity.name.function.ts"
-        },
-        "8": {
-          "name": "keyword.operator.ts"
+          "name": "storage.type.interface.ts"
+        }
+      },
+      "end": "(?<=\\})",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.block.ts"
         }
       },
-      "end": "(?=\\}|;|,)|(?<=\\})",
-      "name": "meta.method.declaration.ts",
       "patterns": [
         {
           "include": "#comment"
         },
         {
-          "include": "#type-parameters"
-        },
-        {
-          "include": "#function-type-parameters"
+          "include": "#class-or-interface-heritage"
         },
         {
-          "include": "#type-annotation"
+          "match": "[_$[:alpha:]][_$[:alnum:]]*",
+          "captures": {
+            "0": {
+              "name": "entity.name.type.class.ts"
+            }
+          }
         },
         {
-          "include": "#method-overload-declaration"
+          "include": "#type-parameters"
         },
         {
-          "include": "#decl-block"
+          "include": "#class-or-interface-body"
         }
       ]
     },
-    "method-overload-declaration": {
-      "captures": {
+    "class-or-interface-heritage": {
+      "begin": "(?<!\\.|\\$)(?:\\b(extends|implements)\\b)(?!\\$)",
+      "beginCaptures": {
         "1": {
           "name": "storage.modifier.ts"
-        },
-        "2": {
-          "name": "storage.modifier.ts"
-        },
-        "3": {
-          "name": "storage.modifier.ts"
-        },
-        "4": {
-          "name": "storage.type.property.ts"
-        },
-        "5": {
-          "name": "keyword.operator.ts"
-        },
-        "6": {
-          "name": "storage.type.ts"
-        },
-        "7": {
-          "name": "entity.name.function.ts"
-        },
-        "8": {
-          "name": "keyword.operator.ts"
         }
       },
-      "match": "\\b(?:(abstract)\\s+)?\\b(?:(public|private|protected)\\s+)?\\b(?:(async)\\s+)?(?:(get|set)\\s+)?(?:(new)|(?:\\b(constructor)\\b)|(?:([a-zA-Z_$][\\.\\w$]*)\\s*(\\??)))?\\s*(?=\\(|\\<)",
-      "name": "meta.method.overload.declaration.ts"
-    },
-    "new-expr": {
-      "begin": "\\b(new)\\b",
-      "beginCaptures": {
+      "end": "(?=\\{)",
+      "endCaptures": {
         "1": {
-          "name": "keyword.others.ts"
+          "name": "punctuation.definition.block.ts"
         }
       },
-      "end": "(?=[(;]|$)",
-      "name": "new.expr.ts",
       "patterns": [
         {
-          "include": "#type"
+          "include": "#comment"
         },
         {
-          "include": "#comment"
+          "include": "#class-or-interface-heritage"
+        },
+        {
+          "include": "#type-parameters"
+        },
+        {
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\.)",
+          "captures": {
+            "1": {
+              "name": "entity.name.type.module.ts"
+            },
+            "2": {
+              "name": "punctuation.accessor.ts"
+            }
+          }
+        },
+        {
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)",
+          "captures": {
+            "1": {
+              "name": "entity.other.inherited-class.ts"
+            }
+          }
         }
       ]
     },
-    "null-literal": {
-      "match": "\\b(null)\\b",
-      "name": "constant.language.null.ts"
-    },
-    "numeric-literal": {
-      "match": "\\b(?<=[^$])((0(x|X)[0-9a-fA-F]+)|(0(o|O)[0-7]+)|(0(b|B)(0|1)+)|(([0-9]+(\\.[0-9]+)?))([eE]([+-]?)[0-9]+(\\.[0-9]+)?)?)\\b",
-      "name": "constant.numeric.ts"
-    },
-    "object-body": {
+    "class-or-interface-body": {
       "begin": "\\{",
       "beginCaptures": {
         "0": {
-          "name": "meta.brace.curly.ts"
+          "name": "punctuation.definition.block.ts"
         }
       },
       "end": "\\}",
       "endCaptures": {
         "0": {
-          "name": "meta.brace.curly.ts"
+          "name": "punctuation.definition.block.ts"
         }
       },
-      "name": "meta.object.body.ts",
       "patterns": [
         {
           "include": "#string"
@@ -657,7 +949,7 @@
           "include": "#comment"
         },
         {
-          "include": "#field-declaration"
+          "include": "#decorator"
         },
         {
           "include": "#method-declaration"
@@ -665,6 +957,9 @@
         {
           "include": "#indexer-declaration"
         },
+        {
+          "include": "#field-declaration"
+        },
         {
           "include": "#type-annotation"
         },
@@ -675,137 +970,967 @@
           "include": "#access-modifier"
         },
         {
-          "include": "#static-modifier"
+          "include": "#property-accessor"
         },
         {
-          "include": "#property-accessor"
+          "include": "#expression"
+        },
+        {
+          "include": "#punctuation-comma"
+        },
+        {
+          "include": "#punctuation-semicolon"
         }
       ]
     },
-    "object-declaration": {
-      "begin": "\\b(?:(export)\\s+)?\\b(?:(abstract)\\s+)?\\b(?<!\\.)(class|interface)\\b",
+    "type-object": {
+      "name": "meta.object.type.ts",
+      "begin": "\\{",
       "beginCaptures": {
-        "1": {
-          "name": "storage.type.ts"
-        },
-        "2": {
-          "name": "storage.modifier.ts"
-        },
-        "3": {
-          "name": "storage.type.ts"
+        "0": {
+          "name": "punctuation.definition.block.ts"
         }
       },
-      "end": "(?<=\\})",
+      "end": "\\}",
       "endCaptures": {
-        "1": {
-          "name": "brace.curly.ts"
+        "0": {
+          "name": "punctuation.definition.block.ts"
         }
       },
-      "name": "meta.declaration.object.ts",
+      "patterns": [
+        {
+          "include": "#type-object-members"
+        }
+      ]
+    },
+    "type-object-members": {
       "patterns": [
         {
           "include": "#comment"
         },
         {
-          "include": "#object-heritage"
+          "include": "#method-declaration"
         },
         {
-          "include": "#object-name"
+          "include": "#indexer-declaration"
         },
         {
-          "include": "#type-parameters"
+          "include": "#field-declaration"
         },
         {
-          "include": "#object-body"
-        }
-      ]
-    },
-    "object-heritage": {
-      "begin": "(?:\\b(extends|implements)\\b)",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.ts"
-        }
-      },
-      "end": "(?=\\{)",
-      "endCaptures": {
-        "1": {
-          "name": "brace.curly.ts"
-        }
-      },
-      "name": "meta.object.heritage.ts",
-      "patterns": [
-        {
-          "include": "#comment"
+          "include": "#type-annotation"
         },
         {
-          "include": "#object-heritage"
+          "begin": "\\.\\.\\.",
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.operator.spread.ts"
+            }
+          },
+          "end": "(?=\\}|;|,|$)|(?<=\\})",
+          "patterns": [
+            {
+              "include": "#type"
+            }
+          ]
         },
         {
-          "include": "#type-parameters"
+          "include": "#punctuation-comma"
         },
         {
-          "include": "#object-heritage-type"
+          "include": "#punctuation-semicolon"
         }
       ]
     },
-    "object-heritage-type": {
-      "captures": {
+    "field-declaration": {
+      "name": "meta.field.declaration.ts",
+      "begin": "(?<!\\()(?:(?<!\\.|\\$)\\b(readonly)\\s+)?(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\\'[^']*\\')|(\\\"[^\"]*\\\")|(\\[[^\\]]*\\]))\\s*(\\?\\s*)?(=|:))",
+      "beginCaptures": {
         "1": {
-          "name": "support.type.ts"
+          "name": "storage.modifier.ts"
         }
       },
-      "match": "(?:\\b([a-zA-Z_$][\\w$]*)\\b)",
-      "name": "meta.object.heritage.parent.ts"
-    },
-    "object-member": {
-      "begin": "[a-zA-Z_$][\\w$]*\\s*:",
-      "end": "(?=,|\\})",
-      "name": "meta.object.member.ts",
+      "end": "(?=\\}|;|,|$)|(?<=\\})",
       "patterns": [
         {
-          "include": "#expression"
+          "include": "#variable-initializer"
+        },
+        {
+          "begin": "(?=((?:[_$[:alpha:]][_$[:alnum:]]*)|(?:\\'[^']*\\')|(?:\\\"[^\"]*\\\")|(\\[[^\\]]*\\]))\\s*(\\?\\s*)?(=|:))",
+          "end": "(?=[};,=]|$)|(?<=\\})",
+          "patterns": [
+            {
+              "include": "#type-annotation"
+            },
+            {
+              "include": "#string"
+            },
+            {
+              "include": "#array-literal"
+            },
+            {
+              "include": "#comment"
+            },
+            {
+              "name": "meta.definition.property.ts variable.object.property.ts",
+              "match": "[_$[:alpha:]][_$[:alnum:]]*"
+            },
+            {
+              "name": "keyword.operator.optional.ts",
+              "match": "\\?"
+            }
+          ]
         }
       ]
     },
-    "object-name": {
-      "captures": {
-        "0": {
-          "name": "entity.name.class.ts"
-        }
-      },
-      "match": "[a-zA-Z_$][\\w$]*",
-      "name": "meta.object.name.ts"
-    },
-    "parameter-name": {
-      "captures": {
+    "method-declaration": {
+      "name": "meta.method.declaration.ts",
+      "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.ts"
         },
         "2": {
-          "name": "keyword.others.ts"
+          "name": "storage.modifier.ts"
+        },
+        "3": {
+          "name": "storage.modifier.async.ts"
+        },
+        "4": {
+          "name": "storage.type.property.ts"
+        },
+        "5": {
+          "name": "keyword.operator.new.ts"
+        },
+        "6": {
+          "name": "storage.type.ts"
+        },
+        "7": {
+          "name": "keyword.generator.asterisk.ts"
+        }
+      },
+      "end": "(?=\\}|;|,)|(?<=\\})",
+      "patterns": [
+        {
+          "include": "#method-declaration-name"
+        },
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#type-parameters"
+        },
+        {
+          "include": "#function-parameters"
+        },
+        {
+          "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.ts"
+        },
+        "2": {
+          "name": "storage.modifier.ts"
+        },
+        "3": {
+          "name": "storage.modifier.async.ts"
+        },
+        "4": {
+          "name": "storage.type.property.ts"
+        },
+        "5": {
+          "name": "keyword.operator.new.ts"
+        },
+        "6": {
+          "name": "storage.type.ts"
+        },
+        "7": {
+          "name": "keyword.generator.asterisk.ts"
+        }
+      },
+      "end": "(?=\\(|\\<)",
+      "patterns": [
+        {
+          "include": "#method-declaration-name"
+        }
+      ]
+    },
+    "method-declaration-name": {
+      "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\\'[^']*\\')|(\\\"[^\"]*\\\")|(\\[[^\\]]*\\]))\\s*(\\??)\\s*[\\(\\<])",
+      "end": "(?=\\(|\\<)",
+      "patterns": [
+        {
+          "include": "#string"
+        },
+        {
+          "include": "#array-literal"
+        },
+        {
+          "name": "meta.definition.method.ts entity.name.function.ts",
+          "match": "[_$[:alpha:]][_$[:alnum:]]*"
+        },
+        {
+          "name": "keyword.operator.optional.ts",
+          "match": "\\?"
+        }
+      ]
+    },
+    "indexer-declaration": {
+      "name": "meta.indexer.declaration.ts",
+      "begin": "(?:(?<!\\.|\\$)\\b(readonly)\\s*)?(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:)",
+      "beginCaptures": {
+        "1": {
+          "name": "storage.modifier.ts"
+        },
+        "2": {
+          "name": "meta.brace.square.ts"
+        },
+        "3": {
+          "name": "variable.parameter.ts"
+        }
+      },
+      "end": "(\\])\\s*(\\?\\s*)?|$",
+      "endCaptures": {
+        "1": {
+          "name": "meta.brace.square.ts"
+        },
+        "2": {
+          "name": "keyword.operator.optional.ts"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#type-annotation"
+        }
+      ]
+    },
+    "function-declaration": {
+      "name": "meta.function.ts",
+      "begin": "(?<!\\.|\\$)\\b(?:(export)\\s+)?(?:(async)\\s+)?(function\\b)(?:\\s*(\\*))?(?:(?:\\s+|(?<=\\*))([_$[:alpha:]][_$[:alnum:]]*))?\\s*",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.export.ts"
+        },
+        "2": {
+          "name": "storage.modifier.async.ts"
+        },
+        "3": {
+          "name": "storage.type.function.ts"
+        },
+        "4": {
+          "name": "keyword.generator.asterisk.ts"
+        },
+        "5": {
+          "name": "meta.definition.function.ts entity.name.function.ts"
+        }
+      },
+      "end": "(?=;|\\})|(?<=\\})",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#type-parameters"
+        },
+        {
+          "include": "#function-parameters"
+        },
+        {
+          "include": "#return-type"
+        },
+        {
+          "include": "#function-overload-declaration"
+        },
+        {
+          "include": "#decl-block"
+        }
+      ]
+    },
+    "function-overload-declaration": {
+      "name": "meta.function.overload.ts",
+      "match": "(?<!\\.|\\$)\\b(?:(export)\\s+)?(?:(async)\\s+)?(function\\b)(?:\\s*(\\*))?(?:(?:\\s+|(?<=\\*))([_$[:alpha:]][_$[:alnum:]]*))?\\s*",
+      "captures": {
+        "1": {
+          "name": "keyword.control.export.ts"
+        },
+        "2": {
+          "name": "storage.modifier.async.ts"
+        },
+        "3": {
+          "name": "storage.type.function.ts"
+        },
+        "4": {
+          "name": "keyword.generator.asterisk.ts"
+        },
+        "5": {
+          "name": "meta.definition.function.ts entity.name.function.ts"
+        }
+      }
+    },
+    "object-literal": {
+      "name": "meta.objectliteral.ts",
+      "begin": "\\{",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.block.ts"
+        }
+      },
+      "end": "\\}",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.block.ts"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#object-member"
+        }
+      ]
+    },
+    "decl-block": {
+      "name": "meta.block.ts",
+      "begin": "\\{",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.block.ts"
+        }
+      },
+      "end": "\\}",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.block.ts"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#statements"
+        }
+      ]
+    },
+    "after-operator-block": {
+      "name": "meta.objectliteral.ts",
+      "begin": "(?<=[=(,\\[?+!]|await|return|yield|throw|in|of|typeof|&&|\\|\\||\\*)\\s*(\\{)",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.definition.block.ts"
+        }
+      },
+      "end": "\\}",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.block.ts"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#object-member"
+        }
+      ]
+    },
+    "parameter-name": {
+      "match": "(?:\\s*\\b(readonly)\\s+)?(?:\\s*\\b(public|private|protected)\\s+)?(\\.\\.\\.)?\\s*(?<!=|:)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\??)",
+      "captures": {
+        "1": {
+          "name": "storage.modifier.ts"
+        },
+        "2": {
+          "name": "storage.modifier.ts"
+        },
+        "3": {
+          "name": "keyword.operator.rest.ts"
+        },
+        "4": {
+          "name": "variable.parameter.ts"
+        },
+        "5": {
+          "name": "keyword.operator.optional.ts"
+        }
+      }
+    },
+    "destructuring-parameter": {
+      "patterns": [
+        {
+          "name": "meta.parameter.object-binding-pattern.ts",
+          "begin": "(?<!=|:)\\s*(\\{)",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.binding-pattern.object.ts"
+            }
+          },
+          "end": "\\}",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.binding-pattern.object.ts"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#parameter-object-binding-element"
+            }
+          ]
+        },
+        {
+          "name": "meta.paramter.array-binding-pattern.ts",
+          "begin": "(?<!=|:)\\s*(\\[)",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.binding-pattern.array.ts"
+            }
+          },
+          "end": "\\]",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.binding-pattern.array.ts"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#parameter-array-binding-element"
+            }
+          ]
+        }
+      ]
+    },
+    "parameter-object-binding-element": {
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(:)",
+          "beginCaptures": {
+            "1": {
+              "name": "variable.object.property.ts"
+            },
+            "2": {
+              "name": "punctuation.destructuring.ts"
+            }
+          },
+          "end": "(?=,|\\})",
+          "patterns": [
+            {
+              "include": "#parameter-object-binding-pattern"
+            },
+            {
+              "include": "#parameter-array-binding-pattern"
+            },
+            {
+              "name": "variable.parameter.ts",
+              "match": "([_$[:alpha:]][_$[:alnum:]]*)"
+            },
+            {
+              "include": "#variable-initializer"
+            }
+          ]
+        },
+        {
+          "include": "#parameter-object-binding-pattern"
+        },
+        {
+          "include": "#destructuring-parameter-rest"
+        },
+        {
+          "include": "#variable-initializer"
+        },
+        {
+          "include": "#punctuation-comma"
+        }
+      ]
+    },
+    "parameter-array-binding-element": {
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#parameter-object-binding-pattern"
+        },
+        {
+          "include": "#parameter-array-binding-pattern"
+        },
+        {
+          "include": "#destructuring-parameter-rest"
+        },
+        {
+          "include": "#variable-initializer"
+        },
+        {
+          "include": "#punctuation-comma"
+        }
+      ]
+    },
+    "destructuring-parameter-rest": {
+      "match": "(?:(\\.\\.\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)",
+      "captures": {
+        "1": {
+          "name": "keyword.operator.rest.ts"
+        },
+        "2": {
+          "name": "variable.parameter.ts"
+        }
+      }
+    },
+    "parameter-object-binding-pattern": {
+      "begin": "(?:(\\.\\.\\.)\\s*)?(\\{)",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.operator.rest.ts"
+        },
+        "2": {
+          "name": "punctuation.definition.binding-pattern.object.ts"
+        }
+      },
+      "end": "\\}",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.binding-pattern.object.ts"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#parameter-object-binding-element"
+        }
+      ]
+    },
+    "parameter-array-binding-pattern": {
+      "begin": "(?:(\\.\\.\\.)\\s*)?(\\[)",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.operator.rest.ts"
+        },
+        "2": {
+          "name": "punctuation.definition.binding-pattern.array.ts"
+        }
+      },
+      "end": "\\]",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.binding-pattern.array.ts"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#parameter-array-binding-element"
+        }
+      ]
+    },
+    "return-type": {
+      "name": "meta.return.type.ts",
+      "begin": "(?<=\\))\\s*(:)",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.operator.type.annotation.ts"
+        }
+      },
+      "end": "(?<!:)((?=$)|(?=\\{|;|//|\\}))",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "name": "meta.object.type.ts",
+          "begin": "(?<=:)\\s*(\\{)",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.block.ts"
+            }
+          },
+          "end": "\\}",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.block.ts"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#type-object-members"
+            }
+          ]
+        },
+        {
+          "include": "#type-predicate-operator"
+        },
+        {
+          "include": "#type"
+        }
+      ]
+    },
+    "type-predicate-operator": {
+      "name": "keyword.operator.expression.is.ts",
+      "match": "(?<!\\.|\\$)\\bis\\b(?!\\$)"
+    },
+    "type-annotation": {
+      "name": "meta.type.annotation.ts",
+      "begin": ":",
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.operator.type.annotation.ts"
+        }
+      },
+      "end": "(?=$|[,);\\}\\]]|//)|(?==[^>])|(?<=[\\}>\\]\\)]|[_$[:alpha:]])\\s*(?=\\{)",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#type"
+        }
+      ]
+    },
+    "type": {
+      "name": "meta.type.ts",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#string"
+        },
+        {
+          "include": "#numeric-literal"
+        },
+        {
+          "include": "#type-primitive"
+        },
+        {
+          "include": "#type-builtin-literals"
+        },
+        {
+          "include": "#type-parameters"
+        },
+        {
+          "include": "#type-tuple"
+        },
+        {
+          "include": "#type-object"
+        },
+        {
+          "include": "#type-operators"
+        },
+        {
+          "include": "#type-fn-type-parameters"
+        },
+        {
+          "include": "#type-paren-or-function-parameters"
+        },
+        {
+          "include": "#type-function-return-type"
+        },
+        {
+          "include": "#type-name"
+        }
+      ]
+    },
+    "function-parameters": {
+      "name": "meta.parameters.ts",
+      "begin": "\\(",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.parameters.begin.ts"
+        }
+      },
+      "end": "\\)",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.parameters.end.ts"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#decorator"
+        },
+        {
+          "include": "#destructuring-parameter"
+        },
+        {
+          "include": "#parameter-name"
+        },
+        {
+          "include": "#type-annotation"
+        },
+        {
+          "include": "#variable-initializer"
+        },
+        {
+          "name": "punctuation.separator.parameter.ts",
+          "match": ","
+        }
+      ]
+    },
+    "type-primitive": {
+      "name": "support.type.primitive.ts",
+      "match": "(?<!\\.|\\$)\\b(string|number|boolean|symbol|any|void|never)\\b(?!\\$)"
+    },
+    "type-builtin-literals": {
+      "name": "support.type.builtin.ts",
+      "match": "(?<!\\.|\\$)\\b(this|true|false|undefined|null)\\b(?!\\$)"
+    },
+    "type-paren-or-function-parameters": {
+      "name": "meta.type.paren.cover.ts",
+      "begin": "\\s*(\\()",
+      "beginCaptures": {
+        "1": {
+          "name": "meta.brace.round.ts"
+        }
+      },
+      "end": "\\)",
+      "endCaptures": {
+        "0": {
+          "name": "meta.brace.round.ts"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#type"
+        },
+        {
+          "include": "#function-parameters"
+        }
+      ]
+    },
+    "type-fn-type-parameters": {
+      "patterns": [
+        {
+          "name": "meta.type.constructor.ts",
+          "match": "(?<!\\.|\\$)\\b(new)\\b(?=\\s*\\<)",
+          "captures": {
+            "1": {
+              "name": "keyword.control.new.ts"
+            }
+          }
+        },
+        {
+          "name": "meta.type.constructor.ts",
+          "begin": "(?<!\\.|\\$)\\b(new)\\b\\s*(?=\\()",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.new.ts"
+            }
+          },
+          "end": "(?<=\\))",
+          "patterns": [
+            {
+              "include": "#function-parameters"
+            }
+          ]
+        },
+        {
+          "name": "meta.type.function.ts",
+          "begin": "(?<=\\>)\\s*(?=\\()",
+          "end": "(?<=\\))",
+          "patterns": [
+            {
+              "include": "#function-parameters"
+            }
+          ]
+        },
+        {
+          "name": "meta.type.function.ts",
+          "begin": "(?x)( \\s* (?= [(]\\s*( ([)]) |  (\\.\\.\\.) | ([_$[:alnum:]]+\\s*( ([:,?=])| ([)]\\s*=>) )) ) ) )",
+          "end": "(?<=\\))",
+          "patterns": [
+            {
+              "include": "#function-parameters"
+            }
+          ]
+        }
+      ]
+    },
+    "type-operators": {
+      "patterns": [
+        {
+          "include": "#typeof-operator"
+        },
+        {
+          "name": "keyword.operator.type.ts",
+          "match": "[&|]"
+        }
+      ]
+    },
+    "type-function-return-type": {
+      "name": "meta.type.function.return.ts",
+      "begin": "=>",
+      "beginCaptures": {
+        "0": {
+          "name": "storage.type.function.arrow.ts"
+        }
+      },
+      "end": "(?<!=>)(?=[,\\]\\)\\{\\}=;>]|//|$)",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "name": "meta.object.type.ts",
+          "begin": "(?<==>)\\s*(\\{)",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.block.ts"
+            }
+          },
+          "end": "\\}",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.block.ts"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#type-object-members"
+            }
+          ]
+        },
+        {
+          "include": "#type-predicate-operator"
         },
-        "3": {
-          "name": "variable.parameter.ts"
+        {
+          "include": "#type"
+        }
+      ]
+    },
+    "type-tuple": {
+      "name": "meta.type.tuple.ts",
+      "begin": "\\[",
+      "beginCaptures": {
+        "0": {
+          "name": "meta.brace.square.ts"
+        }
+      },
+      "end": "\\]",
+      "endCaptures": {
+        "0": {
+          "name": "meta.brace.square.ts"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#type"
         },
-        "4": {
-          "name": "keyword.others.ts"
+        {
+          "include": "#punctuation-comma"
+        }
+      ]
+    },
+    "type-name": {
+      "patterns": [
+        {
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\.)",
+          "captures": {
+            "1": {
+              "name": "entity.name.type.module.ts"
+            },
+            "2": {
+              "name": "punctuation.accessor.ts"
+            }
+          }
+        },
+        {
+          "name": "entity.name.type.ts",
+          "match": "[_$[:alpha:]][_$[:alnum:]]*"
+        }
+      ]
+    },
+    "type-parameters": {
+      "name": "meta.type.parameters.ts",
+      "begin": "(<)",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.definition.typeparameters.begin.ts"
+        }
+      },
+      "end": "(?=$)|(>)",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.typeparameters.end.ts"
         }
       },
-      "match": "(?:\\s*\\b(public|private|protected)\\b\\s+)?(\\.\\.\\.)?\\s*([a-zA-Z_$][\\w$]*)\\s*(\\??)",
-      "name": "parameter.name.ts"
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "name": "storage.modifier.ts",
+          "match": "(?<!\\.|\\$)\\b(extends)\\b(?!\\$)"
+        },
+        {
+          "include": "#type"
+        },
+        {
+          "include": "#punctuation-comma"
+        }
+      ]
     },
-    "paren-expression": {
-      "begin": "\\(",
+    "variable-initializer": {
+      "begin": "(?<!=|!)(=)(?!=)",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.operator.assignment.ts"
+        }
+      },
+      "end": "(?=$|[,);}\\]])",
+      "patterns": [
+        {
+          "include": "#expression"
+        }
+      ]
+    },
+    "for-loop": {
+      "begin": "(?<!\\.|\\$)\\b(for)\\s*(\\()",
       "beginCaptures": {
+        "1": {
+          "name": "keyword.control.loop.ts"
+        },
+        "2": {
+          "name": "meta.brace.round.ts"
+        }
+      },
+      "end": "\\)",
+      "endCaptures": {
         "0": {
-          "name": "meta.brace.paren.ts"
+          "name": "meta.brace.round.ts"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#var-expr"
+        },
+        {
+          "include": "#expression"
+        },
+        {
+          "include": "#punctuation-semicolon"
+        }
+      ]
+    },
+    "switch-expression": {
+      "name": "switch-expression.expr.ts",
+      "begin": "(?<!\\.|\\$)\\b(switch)\\s*(\\()",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.switch.ts"
+        },
+        "2": {
+          "name": "meta.brace.round.ts"
         }
       },
       "end": "\\)",
       "endCaptures": {
         "0": {
-          "name": "meta.brace.paren.ts"
+          "name": "meta.brace.round.ts"
         }
       },
       "patterns": [
@@ -814,392 +1939,1033 @@
         }
       ]
     },
-    "property-accessor": {
-      "match": "\\b(get|set)\\b",
-      "name": "storage.type.property.ts"
+    "switch-block": {
+      "name": "switch-block.expr.ts",
+      "begin": "{",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.block.ts"
+        }
+      },
+      "end": "(?=\\})",
+      "patterns": [
+        {
+          "include": "#case-clause"
+        },
+        {
+          "include": "#statements"
+        }
+      ]
     },
-    "qstring-double": {
-      "begin": "\"",
-      "end": "\"|(?:[^\\\\\\n]$)",
-      "name": "string.double.ts",
+    "case-clause": {
+      "name": "case-clause.expr.ts",
+      "begin": "(?<!\\.|\\$)\\b(case|default(?=:))\\b(?!\\$)",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.switch.ts"
+        }
+      },
+      "end": ":",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.section.case-statement.ts"
+        }
+      },
       "patterns": [
         {
-          "include": "#string-character-escape"
+          "include": "#expression"
         }
       ]
     },
-    "qstring-single": {
-      "begin": "'",
-      "end": "\\'|(?:[^\\\\\\n]$)",
-      "name": "string.single.ts",
+    "switch-statement": {
+      "name": "switch-statement.expr.ts",
+      "begin": "(?<!\\.|\\$)(?=\\bswitch\\s*\\()",
+      "end": "}",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.block.ts"
+        }
+      },
       "patterns": [
         {
-          "include": "#string-character-escape"
+          "include": "#switch-expression"
+        },
+        {
+          "include": "#switch-block"
         }
       ]
     },
-    "regex": {
-      "begin": "(?<=[=(:,\\[]|^|return|&&|\\|\\||!)\\s*(/)(?![/*+{}?])",
-      "end": "$|(/)[igm]*",
-      "name": "string.regex.ts",
+    "support-objects": {
+      "patterns": [
+        {
+          "name": "variable.language.arguments.ts",
+          "match": "(?<!\\.|\\$)\\b(arguments)\\b(?!\\$)"
+        },
+        {
+          "name": "support.class.builtin.ts",
+          "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(?!\\$)"
+        },
+        {
+          "name": "support.class.error.ts",
+          "match": "(?<!\\.|\\$)\\b((Eval|Internal|Range|Reference|Syntax|Type|URI)?Error)\\b(?!\\$)"
+        },
+        {
+          "name": "support.function.ts",
+          "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(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(?!\\$)",
+          "captures": {
+            "1": {
+              "name": "support.constant.math.ts"
+            },
+            "2": {
+              "name": "punctuation.accessor.ts"
+            },
+            "3": {
+              "name": "support.function.math.ts"
+            },
+            "4": {
+              "name": "support.constant.property.math.ts"
+            }
+          }
+        },
+        {
+          "match": "(?x)(?<!\\.|\\$)\\b(console)(?:\\s*(\\.)\\s*(\n  assert|clear|count|debug|dir|error|group|groupCollapsed|groupEnd|info|log\n  |profile|profileEnd|table|time|timeEnd|timeStamp|trace|warn))?\\b(?!\\$)",
+          "captures": {
+            "1": {
+              "name": "support.class.console.ts"
+            },
+            "2": {
+              "name": "punctuation.accessor.ts"
+            },
+            "3": {
+              "name": "support.function.console.ts"
+            }
+          }
+        },
+        {
+          "match": "(?<!\\.|\\$)\\b(JSON)(?:\\s*(\\.)\\s*(parse|stringify))?\\b(?!\\$)",
+          "captures": {
+            "1": {
+              "name": "support.constant.json.ts"
+            },
+            "2": {
+              "name": "punctuation.accessor.ts"
+            },
+            "3": {
+              "name": "support.function.json.ts"
+            }
+          }
+        },
+        {
+          "match": "(?x) (\\.) \\s* (?:\n  (constructor|length|prototype|__proto__) \n  |\n  (EPSILON|MAX_SAFE_INTEGER|MAX_VALUE|MIN_SAFE_INTEGER|MIN_VALUE|NEGATIVE_INFINITY|POSITIVE_INFINITY))\\b(?!\\$)",
+          "captures": {
+            "1": {
+              "name": "punctuation.accessor.ts"
+            },
+            "2": {
+              "name": "support.variable.property.ts"
+            },
+            "3": {
+              "name": "support.constant.ts"
+            }
+          }
+        },
+        {
+          "match": "(?x) (?<!\\.|\\$) \\b (?:\n  (document|event|navigator|performance|screen|window) \n  |\n  (AnalyserNode|ArrayBufferView|Attr|AudioBuffer|AudioBufferSourceNode|AudioContext|AudioDestinationNode|AudioListener\n  |AudioNode|AudioParam|BatteryManager|BeforeUnloadEvent|BiquadFilterNode|Blob|BufferSource|ByteString|CSS|CSSConditionRule\n  |CSSCounterStyleRule|CSSGroupingRule|CSSMatrix|CSSMediaRule|CSSPageRule|CSSPrimitiveValue|CSSRule|CSSRuleList|CSSStyleDeclaration\n  |CSSStyleRule|CSSStyleSheet|CSSSupportsRule|CSSValue|CSSValueList|CanvasGradient|CanvasImageSource|CanvasPattern\n  |CanvasRenderingContext2D|ChannelMergerNode|ChannelSplitterNode|CharacterData|ChromeWorker|CloseEvent|Comment|CompositionEvent\n  |Console|ConvolverNode|Coordinates|Credential|CredentialsContainer|Crypto|CryptoKey|CustomEvent|DOMError|DOMException\n  |DOMHighResTimeStamp|DOMImplementation|DOMString|DOMStringList|DOMStringMap|DOMTimeStamp|DOMTokenList|DataTransfer\n  |DataTransferItem|DataTransferItemList|DedicatedWorkerGlobalScope|DelayNode|DeviceProximityEvent|DirectoryEntry\n  |DirectoryEntrySync|DirectoryReader|DirectoryReaderSync|Document|DocumentFragment|DocumentTouch|DocumentType|DragEvent\n  |DynamicsCompressorNode|Element|Entry|EntrySync|ErrorEvent|Event|EventListener|EventSource|EventTarget|FederatedCredential\n  |FetchEvent|File|FileEntry|FileEntrySync|FileException|FileList|FileReader|FileReaderSync|FileSystem|FileSystemSync\n  |FontFace|FormData|GainNode|Gamepad|GamepadButton|GamepadEvent|Geolocation|GlobalEventHandlers|HTMLAnchorElement\n  |HTMLAreaElement|HTMLAudioElement|HTMLBRElement|HTMLBaseElement|HTMLBodyElement|HTMLButtonElement|HTMLCanvasElement\n  |HTMLCollection|HTMLContentElement|HTMLDListElement|HTMLDataElement|HTMLDataListElement|HTMLDialogElement|HTMLDivElement\n  |HTMLDocument|HTMLElement|HTMLEmbedElement|HTMLFieldSetElement|HTMLFontElement|HTMLFormControlsCollection|HTMLFormElement\n  |HTMLHRElement|HTMLHeadElement|HTMLHeadingElement|HTMLHtmlElement|HTMLIFrameElement|HTMLImageElement|HTMLInputElement\n  |HTMLKeygenElement|HTMLLIElement|HTMLLabelElement|HTMLLegendElement|HTMLLinkElement|HTMLMapElement|HTMLMediaElement\n  |HTMLMetaElement|HTMLMeterElement|HTMLModElement|HTMLOListElement|HTMLObjectElement|HTMLOptGroupElement|HTMLOptionElement\n  |HTMLOptionsCollection|HTMLOutputElement|HTMLParagraphElement|HTMLParamElement|HTMLPreElement|HTMLProgressElement\n  |HTMLQuoteElement|HTMLScriptElement|HTMLSelectElement|HTMLShadowElement|HTMLSourceElement|HTMLSpanElement|HTMLStyleElement\n  |HTMLTableCaptionElement|HTMLTableCellElement|HTMLTableColElement|HTMLTableDataCellElement|HTMLTableElement|HTMLTableHeaderCellElement\n  |HTMLTableRowElement|HTMLTableSectionElement|HTMLTextAreaElement|HTMLTimeElement|HTMLTitleElement|HTMLTrackElement\n  |HTMLUListElement|HTMLUnknownElement|HTMLVideoElement|HashChangeEvent|History|IDBCursor|IDBCursorWithValue|IDBDatabase\n  |IDBEnvironment|IDBFactory|IDBIndex|IDBKeyRange|IDBMutableFile|IDBObjectStore|IDBOpenDBRequest|IDBRequest|IDBTransaction\n  |IDBVersionChangeEvent|IIRFilterNode|IdentityManager|ImageBitmap|ImageBitmapFactories|ImageData|Index|InputDeviceCapabilities\n  |InputEvent|InstallEvent|InstallTrigger|KeyboardEvent|LinkStyle|LocalFileSystem|LocalFileSystemSync|Location|MIDIAccess\n  |MIDIConnectionEvent|MIDIInput|MIDIInputMap|MIDIOutputMap|MediaElementAudioSourceNode|MediaError|MediaKeyMessageEvent\n  |MediaKeySession|MediaKeyStatusMap|MediaKeySystemAccess|MediaKeySystemConfiguration|MediaKeys|MediaRecorder|MediaStream\n  |MediaStreamAudioDestinationNode|MediaStreamAudioSourceNode|MessageChannel|MessageEvent|MessagePort|MouseEvent\n  |MutationObserver|MutationRecord|NamedNodeMap|Navigator|NavigatorConcurrentHardware|NavigatorGeolocation|NavigatorID\n  |NavigatorLanguage|NavigatorOnLine|Node|NodeFilter|NodeIterator|NodeList|NonDocumentTypeChildNode|Notification\n  |OfflineAudioCompletionEvent|OfflineAudioContext|OscillatorNode|PageTransitionEvent|PannerNode|ParentNode|PasswordCredential\n  |Path2D|PaymentAddress|PaymentRequest|PaymentResponse|Performance|PerformanceEntry|PerformanceFrameTiming|PerformanceMark\n  |PerformanceMeasure|PerformanceNavigation|PerformanceNavigationTiming|PerformanceObserver|PerformanceObserverEntryList\n  |PerformanceResourceTiming|PerformanceTiming|PeriodicSyncEvent|PeriodicWave|Plugin|Point|PointerEvent|PopStateEvent\n  |PortCollection|Position|PositionError|PositionOptions|PresentationConnectionClosedEvent|PresentationConnectionList\n  |PresentationReceiver|ProcessingInstruction|ProgressEvent|PromiseRejectionEvent|PushEvent|PushRegistrationManager\n  |RTCCertificate|RTCConfiguration|RTCPeerConnection|RTCSessionDescriptionCallback|RTCStatsReport|RadioNodeList|RandomSource\n  |Range|ReadableByteStream|RenderingContext|SVGAElement|SVGAngle|SVGAnimateColorElement|SVGAnimateElement|SVGAnimateMotionElement\n  |SVGAnimateTransformElement|SVGAnimatedAngle|SVGAnimatedBoolean|SVGAnimatedEnumeration|SVGAnimatedInteger|SVGAnimatedLength\n  |SVGAnimatedLengthList|SVGAnimatedNumber|SVGAnimatedNumberList|SVGAnimatedPoints|SVGAnimatedPreserveAspectRatio\n  |SVGAnimatedRect|SVGAnimatedString|SVGAnimatedTransformList|SVGAnimationElement|SVGCircleElement|SVGClipPathElement\n  |SVGCursorElement|SVGDefsElement|SVGDescElement|SVGElement|SVGEllipseElement|SVGEvent|SVGFilterElement|SVGFontElement\n  |SVGFontFaceElement|SVGFontFaceFormatElement|SVGFontFaceNameElement|SVGFontFaceSrcElement|SVGFontFaceUriElement\n  |SVGForeignObjectElement|SVGGElement|SVGGlyphElement|SVGGradientElement|SVGHKernElement|SVGImageElement|SVGLength\n  |SVGLengthList|SVGLineElement|SVGLinearGradientElement|SVGMPathElement|SVGMaskElement|SVGMatrix|SVGMissingGlyphElement\n  |SVGNumber|SVGNumberList|SVGPathElement|SVGPatternElement|SVGPoint|SVGPolygonElement|SVGPolylineElement|SVGPreserveAspectRatio\n  |SVGRadialGradientElement|SVGRect|SVGRectElement|SVGSVGElement|SVGScriptElement|SVGSetElement|SVGStopElement|SVGStringList\n  |SVGStylable|SVGStyleElement|SVGSwitchElement|SVGSymbolElement|SVGTRefElement|SVGTSpanElement|SVGTests|SVGTextElement\n  |SVGTextPositioningElement|SVGTitleElement|SVGTransform|SVGTransformList|SVGTransformable|SVGUseElement|SVGVKernElement\n  |SVGViewElement|ServiceWorker|ServiceWorkerContainer|ServiceWorkerGlobalScope|ServiceWorkerRegistration|ServiceWorkerState\n  |ShadowRoot|SharedWorker|SharedWorkerGlobalScope|SourceBufferList|StereoPannerNode|Storage|StorageEvent|StyleSheet\n  |StyleSheetList|SubtleCrypto|SyncEvent|Text|TextMetrics|TimeEvent|TimeRanges|Touch|TouchEvent|TouchList|Transferable\n  |TreeWalker|UIEvent|USVString|VRDisplayCapabilities|ValidityState|WaveShaperNode|WebGL|WebGLActiveInfo|WebGLBuffer\n  |WebGLContextEvent|WebGLFramebuffer|WebGLProgram|WebGLRenderbuffer|WebGLRenderingContext|WebGLShader|WebGLShaderPrecisionFormat\n  |WebGLTexture|WebGLTimerQueryEXT|WebGLTransformFeedback|WebGLUniformLocation|WebGLVertexArrayObject|WebGLVertexArrayObjectOES\n  |WebSocket|WebSockets|WebVTT|WheelEvent|Window|WindowBase64|WindowEventHandlers|WindowTimers|Worker|WorkerGlobalScope\n  |WorkerLocation|WorkerNavigator|XMLHttpRequest|XMLHttpRequestEventTarget|XMLSerializer|XPathExpression|XPathResult\n  |XSLTProcessor))\\b(?!\\$)",
+          "captures": {
+            "1": {
+              "name": "support.variable.dom.ts"
+            },
+            "2": {
+              "name": "support.class.dom.ts"
+            }
+          }
+        },
+        {
+          "match": "(?x) (\\.) \\s* (?:\n  (ATTRIBUTE_NODE|CDATA_SECTION_NODE|COMMENT_NODE|DOCUMENT_FRAGMENT_NODE|DOCUMENT_NODE|DOCUMENT_TYPE_NODE\n  |DOMSTRING_SIZE_ERR|ELEMENT_NODE|ENTITY_NODE|ENTITY_REFERENCE_NODE|HIERARCHY_REQUEST_ERR|INDEX_SIZE_ERR\n  |INUSE_ATTRIBUTE_ERR|INVALID_CHARACTER_ERR|NO_DATA_ALLOWED_ERR|NO_MODIFICATION_ALLOWED_ERR|NOT_FOUND_ERR\n  |NOT_SUPPORTED_ERR|NOTATION_NODE|PROCESSING_INSTRUCTION_NODE|TEXT_NODE|WRONG_DOCUMENT_ERR)\n  |\n  (_content|[xyz]|abbr|above|accept|acceptCharset|accessKey|action|align|[av]Link(?:color)?|all|alt|anchors|appCodeName\n  |appCore|applets|appMinorVersion|appName|appVersion|archive|areas|arguments|attributes|availHeight|availLeft|availTop\n  |availWidth|axis|background|backgroundColor|backgroundImage|below|bgColor|body|border|borderBottomWidth|borderColor\n  |borderLeftWidth|borderRightWidth|borderStyle|borderTopWidth|borderWidth|bottom|bufferDepth|callee|caller|caption\n  |cellPadding|cells|cellSpacing|ch|characterSet|charset|checked|childNodes|chOff|cite|classes|className|clear\n  |clientInformation|clip|clipBoardData|closed|code|codeBase|codeType|color|colorDepth|cols|colSpan|compact|complete\n  |components|content|controllers|cookie|cookieEnabled|cords|cpuClass|crypto|current|data|dateTime|declare|defaultCharset\n  |defaultChecked|defaultSelected|defaultStatus|defaultValue|defaultView|defer|description|dialogArguments|dialogHeight\n  |dialogLeft|dialogTop|dialogWidth|dir|directories|disabled|display|docmain|doctype|documentElement|elements|embeds\n  |enabledPlugin|encoding|enctype|entities|event|expando|external|face|fgColor|filename|firstChild|fontFamily|fontSize\n  |fontWeight|form|formName|forms|frame|frameBorder|frameElement|frames|hasFocus|hash|headers|height|history|host\n  |hostname|href|hreflang|hspace|htmlFor|httpEquiv|id|ids|ignoreCase|images|implementation|index|innerHeight|innerWidth\n  |input|isMap|label|lang|language|lastChild|lastIndex|lastMatch|lastModified|lastParen|layer[sXY]|left|leftContext\n  |lineHeight|link|linkColor|links|listStyleType|localName|location|locationbar|longDesc|lowsrc|lowSrc|marginBottom\n  |marginHeight|marginLeft|marginRight|marginTop|marginWidth|maxLength|media|menubar|method|mimeTypes|multiline|multiple\n  |name|nameProp|namespaces|namespaceURI|next|nextSibling|nodeName|nodeType|nodeValue|noHref|noResize|noShade|notationName\n  |notations|noWrap|object|offscreenBuffering|onLine|onreadystatechange|opener|opsProfile|options|oscpu|outerHeight\n  |outerWidth|ownerDocument|paddingBottom|paddingLeft|paddingRight|paddingTop|page[XY]|page[XY]Offset|parent|parentLayer\n  |parentNode|parentWindow|pathname|personalbar|pixelDepth|pkcs11|platform|plugins|port|prefix|previous|previousDibling\n  |product|productSub|profile|profileend|prompt|prompter|protocol|publicId|readOnly|readyState|referrer|rel|responseText\n  |responseXML|rev|right|rightContext|rowIndex|rows|rowSpan|rules|scheme|scope|screen[XY]|screenLeft|screenTop|scripts\n  |scrollbars|scrolling|sectionRowIndex|security|securityPolicy|selected|selectedIndex|selection|self|shape|siblingAbove\n  |siblingBelow|size|source|specified|standby|start|status|statusbar|statusText|style|styleSheets|suffixes|summary\n  |systemId|systemLanguage|tagName|tags|target|tBodies|text|textAlign|textDecoration|textIndent|textTransform|tFoot|tHead\n  |title|toolbar|top|type|undefined|uniqueID|updateInterval|URL|URLUnencoded|useMap|userAgent|userLanguage|userProfile\n  |vAlign|value|valueType|vendor|vendorSub|version|visibility|vspace|whiteSpace|width|X[MS]LDocument|zIndex))\\b(?!\\$|\\s*(<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\()",
+          "captures": {
+            "1": {
+              "name": "punctuation.accessor.ts"
+            },
+            "2": {
+              "name": "support.constant.dom.ts"
+            },
+            "3": {
+              "name": "support.variable.property.dom.ts"
+            }
+          }
+        },
+        {
+          "name": "support.class.node.ts",
+          "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.ts",
+          "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": {
+            "1": {
+              "name": "support.variable.object.process.ts"
+            },
+            "2": {
+              "name": "punctuation.accessor.ts"
+            },
+            "3": {
+              "name": "support.variable.property.process.ts"
+            },
+            "4": {
+              "name": "support.function.process.ts"
+            }
+          }
+        },
+        {
+          "match": "(?<!\\.|\\$)\\b(?:(exports)|(module)(?:(\\.)(exports|id|filename|loaded|parent|children))?)\\b(?!\\$)",
+          "captures": {
+            "1": {
+              "name": "support.type.object.module.ts"
+            },
+            "2": {
+              "name": "support.type.object.module.ts"
+            },
+            "3": {
+              "name": "punctuation.accessor.ts"
+            },
+            "4": {
+              "name": "support.type.object.module.ts"
+            }
+          }
+        },
+        {
+          "name": "support.variable.object.node.ts",
+          "match": "(?<!\\.|\\$)\\b(global|GLOBAL|root|__dirname|__filename)\\b(?!\\$)"
+        },
+        {
+          "match": "(?x) (\\.) \\s* \n(?:\n (on(?:Rowsinserted|Rowsdelete|Rowenter|Rowexit|Resize|Resizestart|Resizeend|Reset|\n   Readystatechange|Mouseout|Mouseover|Mousedown|Mouseup|Mousemove|\n   Before(?:cut|deactivate|unload|update|paste|print|editfocus|activate)|\n   Blur|Scrolltop|Submit|Select|Selectstart|Selectionchange|Hover|Help|\n   Change|Contextmenu|Controlselect|Cut|Cellchange|Clock|Close|Deactivate|\n   Datasetchanged|Datasetcomplete|Dataavailable|Drop|Drag|Dragstart|Dragover|\n   Dragdrop|Dragenter|Dragend|Dragleave|Dblclick|Unload|Paste|Propertychange|Error|\n   Errorupdate|Keydown|Keyup|Keypress|Focus|Load|Activate|Afterupdate|Afterprint|Abort)\n ) |\n (shift|showModelessDialog|showModalDialog|showHelp|scroll|scrollX|scrollByPages|\n   scrollByLines|scrollY|scrollTo|stop|strike|sizeToContent|sidebar|signText|sort|\n   sup|sub|substr|substring|splice|split|send|set(?:Milliseconds|Seconds|Minutes|Hours|\n   Month|Year|FullYear|Date|UTC(?:Milliseconds|Seconds|Minutes|Hours|Month|FullYear|Date)|\n   Time|Hotkeys|Cursor|ZOptions|Active|Resizable|RequestHeader)|search|slice|\n   savePreferences|small|home|handleEvent|navigate|char|charCodeAt|charAt|concat|\n   contextual|confirm|compile|clear|captureEvents|call|createStyleSheet|createPopup|\n   createEventObject|to(?:GMTString|UTCString|String|Source|UpperCase|LowerCase|LocaleString)|\n   test|taint|taintEnabled|indexOf|italics|disableExternalCapture|dump|detachEvent|unshift|\n   untaint|unwatch|updateCommands|join|javaEnabled|pop|push|plugins.refresh|paddings|parse|\n   print|prompt|preference|enableExternalCapture|exec|execScript|valueOf|UTC|find|file|\n   fileModifiedDate|fileSize|fileCreatedDate|fileUpdatedDate|fixed|fontsize|fontcolor|\n   forward|fromCharCode|watch|link|load|lastIndexOf|anchor|attachEvent|atob|apply|alert|\n   abort|routeEvents|resize|resizeBy|resizeTo|recalc|returnValue|replace|reverse|reload|\n   releaseCapture|releaseEvents|go|get(?:Milliseconds|Seconds|Minutes|Hours|Month|Day|Year|FullYear|\n   Time|Date|TimezoneOffset|UTC(?:Milliseconds|Seconds|Minutes|Hours|Day|Month|FullYear|Date)|\n   Attention|Selection|ResponseHeader|AllResponseHeaders)|moveBy|moveBelow|moveTo|\n   moveToAbsolute|moveAbove|mergeAttributes|match|margins|btoa|big|bold|borderWidths|blink|back\n ) |\n (acceptNode|add|addEventListener|addTextTrack|adoptNode|after|animate|append|\n   appendChild|appendData|before|blur|canPlayType|captureStream|\n   caretPositionFromPoint|caretRangeFromPoint|checkValidity|clear|click|\n   cloneContents|cloneNode|cloneRange|close|closest|collapse|\n   compareBoundaryPoints|compareDocumentPosition|comparePoint|contains|\n   convertPointFromNode|convertQuadFromNode|convertRectFromNode|createAttribute|\n   createAttributeNS|createCaption|createCDATASection|createComment|\n   createContextualFragment|createDocument|createDocumentFragment|\n   createDocumentType|createElement|createElementNS|createEntityReference|\n   createEvent|createExpression|createHTMLDocument|createNodeIterator|\n   createNSResolver|createProcessingInstruction|createRange|createShadowRoot|\n   createTBody|createTextNode|createTFoot|createTHead|createTreeWalker|delete|\n   deleteCaption|deleteCell|deleteContents|deleteData|deleteRow|deleteTFoot|\n   deleteTHead|detach|disconnect|dispatchEvent|elementFromPoint|elementsFromPoint|\n   enableStyleSheetsForSet|entries|evaluate|execCommand|exitFullscreen|\n   exitPointerLock|expand|extractContents|fastSeek|firstChild|focus|forEach|get|\n   getAll|getAnimations|getAttribute|getAttributeNames|getAttributeNode|\n   getAttributeNodeNS|getAttributeNS|getBoundingClientRect|getBoxQuads|\n   getClientRects|getContext|getDestinationInsertionPoints|getElementById|\n   getElementsByClassName|getElementsByName|getElementsByTagName|\n   getElementsByTagNameNS|getItem|getNamedItem|getSelection|getStartDate|\n   getVideoPlaybackQuality|has|hasAttribute|hasAttributeNS|hasAttributes|\n   hasChildNodes|hasFeature|hasFocus|importNode|initEvent|insertAdjacentElement|\n   insertAdjacentHTML|insertAdjacentText|insertBefore|insertCell|insertData|\n   insertNode|insertRow|intersectsNode|isDefaultNamespace|isEqualNode|\n   isPointInRange|isSameNode|item|key|keys|lastChild|load|lookupNamespaceURI|\n   lookupPrefix|matches|move|moveAttribute|moveAttributeNode|moveChild|\n   moveNamedItem|namedItem|nextNode|nextSibling|normalize|observe|open|\n   parentNode|pause|play|postMessage|prepend|preventDefault|previousNode|\n   previousSibling|probablySupportsContext|queryCommandEnabled|\n   queryCommandIndeterm|queryCommandState|queryCommandSupported|queryCommandValue|\n   querySelector|querySelectorAll|registerContentHandler|registerElement|\n   registerProtocolHandler|releaseCapture|releaseEvents|remove|removeAttribute|\n   removeAttributeNode|removeAttributeNS|removeChild|removeEventListener|\n   removeItem|replace|replaceChild|replaceData|replaceWith|reportValidity|\n   requestFullscreen|requestPointerLock|reset|scroll|scrollBy|scrollIntoView|\n   scrollTo|seekToNextFrame|select|selectNode|selectNodeContents|set|setAttribute|\n   setAttributeNode|setAttributeNodeNS|setAttributeNS|setCapture|\n   setCustomValidity|setEnd|setEndAfter|setEndBefore|setItem|setNamedItem|\n   setRangeText|setSelectionRange|setSinkId|setStart|setStartAfter|setStartBefore|\n   slice|splitText|stepDown|stepUp|stopImmediatePropagation|stopPropagation|\n   submit|substringData|supports|surroundContents|takeRecords|terminate|toBlob|\n   toDataURL|toggle|toString|values|write|writeln\n )\n)(?=\\s*\\()",
+          "captures": {
+            "1": {
+              "name": "punctuation.accessor.ts"
+            },
+            "2": {
+              "name": "support.function.event-handler.ts"
+            },
+            "3": {
+              "name": "support.function.ts"
+            },
+            "4": {
+              "name": "support.function.dom.ts"
+            }
+          }
+        }
+      ]
+    },
+    "function-call": {
+      "begin": "(?:(\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\()",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.accessor.ts"
+        },
+        "2": {
+          "name": "entity.name.function.ts"
+        }
+      },
+      "end": "(?<=\\))",
       "patterns": [
         {
-          "match": "\\\\.",
-          "name": "constant.character.escape.ts"
+          "include": "#comment"
+        },
+        {
+          "name": "meta.type.parameters.ts",
+          "begin": "\\<",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.typeparameters.begin.ts"
+            }
+          },
+          "end": "\\>",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.typeparameters.end.ts"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#type"
+            },
+            {
+              "include": "#punctuation-comma"
+            }
+          ]
         },
         {
-          "match": "\\[(\\\\\\]|[^\\]])*\\]",
-          "name": "constant.character.class.ts"
+          "include": "#paren-expression"
         }
       ]
     },
-    "relational-operator": {
-      "match": "===|!==|==|!=|<=|>=|<>|=|<|>",
-      "name": "keyword.operator.comparison.ts"
+    "identifiers": {
+      "patterns": [
+        {
+          "name": "support.class.ts",
+          "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.ts"
+            },
+            "2": {
+              "name": "constant.other.object.property.ts"
+            },
+            "3": {
+              "name": "variable.other.object.property.ts"
+            }
+          }
+        },
+        {
+          "match": "(?x)(?:(\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*( (async\\s+)|(function\\s+)| ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)| ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>)))",
+          "captures": {
+            "1": {
+              "name": "punctuation.accessor.ts"
+            },
+            "2": {
+              "name": "entity.name.function.ts"
+            }
+          }
+        },
+        {
+          "match": "(\\.)\\s*([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])",
+          "captures": {
+            "1": {
+              "name": "punctuation.accessor.ts"
+            },
+            "2": {
+              "name": "constant.other.property.ts"
+            }
+          }
+        },
+        {
+          "match": "(\\.)\\s*([_$[:alpha:]][_$[:alnum:]]*)",
+          "captures": {
+            "1": {
+              "name": "punctuation.accessor.ts"
+            },
+            "2": {
+              "name": "variable.other.property.ts"
+            }
+          }
+        },
+        {
+          "match": "(?x)(?:\n  ([[:upper:]][_$[:digit:][:upper:]]*) |\n  ([_$[:alpha:]][_$[:alnum:]]*)\n)(?=\\s*\\.\\s*[_$[:alpha:]][_$[:alnum:]]*)",
+          "captures": {
+            "1": {
+              "name": "constant.other.object.ts"
+            },
+            "2": {
+              "name": "variable.other.object.ts"
+            }
+          }
+        },
+        {
+          "name": "constant.other.ts",
+          "match": "([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])"
+        },
+        {
+          "name": "variable.other.readwrite.ts",
+          "match": "[_$[:alpha:]][_$[:alnum:]]*"
+        }
+      ]
     },
-    "return-type": {
-      "begin": "(?<=\\))\\s*:",
-      "end": "(?=$)|(?=\\{|;|//)",
-      "name": "meta.return.type.ts",
+    "cast": {
+      "name": "cast.expr.ts",
+      "begin": "(?:(?<=return|throw|yield|await|default|[=(,:>*]))\\s*(<)(?!<?\\=)",
+      "beginCaptures": {
+        "1": {
+          "name": "meta.brace.angle.ts"
+        }
+      },
+      "end": ">",
+      "endCaptures": {
+        "0": {
+          "name": "meta.brace.angle.ts"
+        }
+      },
       "patterns": [
         {
           "include": "#type"
         }
       ]
     },
-    "static-modifier": {
-      "match": "\\b(static)\\b",
-      "name": "keyword.other.ts"
-    },
-    "storage-keyword": {
-      "match": "\\b(var|let|function|const|module|namespace|void|export)\\b",
-      "name": "storage.type.ts"
+    "new-expr": {
+      "name": "new.expr.ts",
+      "begin": "(?<!\\.|\\$)\\b(new)\\b(?!\\$)",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.operator.new.ts"
+        }
+      },
+      "end": "(?<=\\))|(?=[;),]|$|((?<!\\.|\\$)\\bnew\\b(?!\\$)))",
+      "patterns": [
+        {
+          "include": "#paren-expression"
+        },
+        {
+          "include": "#type"
+        }
+      ]
     },
-    "string": {
-      "name": "string.ts",
+    "object-member": {
       "patterns": [
         {
-          "include": "#qstring-single"
+          "include": "#comment"
         },
         {
-          "include": "#qstring-double"
+          "include": "#method-declaration"
+        },
+        {
+          "name": "meta.object.member.ts",
+          "begin": "(?=(?:(?:\\'[^']*\\')|(?:\\\"[^\"]*\\\")|(?:\\[[^\\]]*\\]))\\s*:)",
+          "end": "(?=,|\\})",
+          "patterns": [
+            {
+              "name": "meta.object-literal.key.ts",
+              "begin": "(?=(?:(?:\\'[^']*\\')|(?:\\\"[^\"]*\\\")|(?:\\[[^\\]]*\\]))\\s*:)",
+              "end": ":",
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.separator.key-value.ts"
+                }
+              },
+              "patterns": [
+                {
+                  "include": "#string"
+                },
+                {
+                  "include": "#array-literal"
+                }
+              ]
+            },
+            {
+              "include": "#expression"
+            }
+          ]
+        },
+        {
+          "name": "meta.object.member.ts",
+          "begin": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(:)(?=\\s*( (async\\s+)|(function\\s+)| ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)| ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>))))",
+          "beginCaptures": {
+            "0": {
+              "name": "meta.object-literal.key.ts"
+            },
+            "1": {
+              "name": "entity.name.function.ts"
+            },
+            "2": {
+              "name": "punctuation.separator.key-value.ts"
+            }
+          },
+          "end": "(?=,|\\})",
+          "patterns": [
+            {
+              "include": "#expression"
+            }
+          ]
+        },
+        {
+          "name": "meta.object.member.ts",
+          "begin": "(?:[_$[:alpha:]][_$[:alnum:]]*)\\s*(:)",
+          "beginCaptures": {
+            "0": {
+              "name": "meta.object-literal.key.ts"
+            },
+            "1": {
+              "name": "punctuation.separator.key-value.ts"
+            }
+          },
+          "end": "(?=,|\\})",
+          "patterns": [
+            {
+              "include": "#expression"
+            }
+          ]
+        },
+        {
+          "name": "meta.object.member.ts",
+          "begin": "\\.\\.\\.",
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.operator.spread.ts"
+            }
+          },
+          "end": "(?=,|\\})",
+          "patterns": [
+            {
+              "include": "#expression"
+            }
+          ]
+        },
+        {
+          "name": "meta.object.member.ts",
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=,|\\}|$)",
+          "captures": {
+            "1": {
+              "name": "variable.other.readwrite.ts"
+            }
+          }
+        },
+        {
+          "include": "#punctuation-comma"
         }
       ]
     },
-    "string-character-escape": {
-      "match": "\\\\(x\\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)",
-      "name": "constant.character.escape"
+    "expression-operators": {
+      "patterns": [
+        {
+          "name": "keyword.control.flow.ts",
+          "match": "(?<!\\.|\\$)\\b(await)\\b(?!\\$)"
+        },
+        {
+          "name": "keyword.operator.expression.delete.ts",
+          "match": "(?<!\\.|\\$)\\bdelete\\b(?!\\$)"
+        },
+        {
+          "name": "keyword.operator.expression.in.ts",
+          "match": "(?<!\\.|\\$)\\bin\\b(?!\\$)"
+        },
+        {
+          "name": "keyword.operator.expression.of.ts",
+          "match": "(?<!\\.|\\$)\\bof\\b(?!\\$)"
+        },
+        {
+          "name": "keyword.operator.expression.instanceof.ts",
+          "match": "(?<!\\.|\\$)\\binstanceof\\b(?!\\$)"
+        },
+        {
+          "name": "keyword.operator.new.ts",
+          "match": "(?<!\\.|\\$)\\bnew\\b(?!\\$)"
+        },
+        {
+          "include": "#typeof-operator"
+        },
+        {
+          "name": "keyword.operator.expression.void.ts",
+          "match": "(?<!\\.|\\$)\\bvoid\\b(?!\\$)"
+        },
+        {
+          "begin": "(?<!\\.|\\$)\\bas\\b(?!\\$)",
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.control.as.ts"
+            }
+          },
+          "end": "(?=$|[;,:})\\]])",
+          "patterns": [
+            {
+              "include": "#type"
+            }
+          ]
+        },
+        {
+          "name": "keyword.operator.spread.ts",
+          "match": "\\.\\.\\."
+        },
+        {
+          "name": "keyword.operator.assignment.compound.ts",
+          "match": "\\*=|(?<!\\()/=|%=|\\+=|\\-="
+        },
+        {
+          "name": "keyword.operator.assignment.compound.bitwise.ts",
+          "match": "\\&=|\\^=|<<=|>>=|>>>=|\\|="
+        },
+        {
+          "name": "keyword.operator.bitwise.shift.ts",
+          "match": "<<|>>>|>>"
+        },
+        {
+          "name": "keyword.operator.comparison.ts",
+          "match": "===|!==|==|!="
+        },
+        {
+          "name": "keyword.operator.relational.ts",
+          "match": "<=|>=|<>|<|>"
+        },
+        {
+          "name": "keyword.operator.logical.ts",
+          "match": "\\!|&&|\\|\\|"
+        },
+        {
+          "name": "keyword.operator.bitwise.ts",
+          "match": "\\&|~|\\^|\\|"
+        },
+        {
+          "name": "keyword.operator.assignment.ts",
+          "match": "\\="
+        },
+        {
+          "name": "keyword.operator.decrement.ts",
+          "match": "--"
+        },
+        {
+          "name": "keyword.operator.increment.ts",
+          "match": "\\+\\+"
+        },
+        {
+          "name": "keyword.operator.arithmetic.ts",
+          "match": "%|\\*|/|-|\\+"
+        }
+      ]
     },
-    "switch-block": {
-      "begin": "{",
-      "end": "(?=\\})",
-      "name": "switch-block.expr.ts",
+    "typeof-operator": {
+      "name": "keyword.operator.expression.typeof.ts",
+      "match": "(?<!\\.|\\$)\\btypeof\\b(?!\\$)"
+    },
+    "arrow-function": {
       "patterns": [
         {
-          "include": "#expression"
+          "name": "meta.arrow.ts",
+          "match": "(?<!\\.|\\$)(\\basync)(?=\\s*[<(])",
+          "captures": {
+            "1": {
+              "name": "storage.modifier.async.ts"
+            }
+          }
+        },
+        {
+          "name": "meta.arrow.ts",
+          "match": "(?:(?<!\\.|\\$)(\\basync)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)\\s*(?==>)",
+          "captures": {
+            "1": {
+              "name": "storage.modifier.async.ts"
+            },
+            "2": {
+              "name": "variable.parameter.ts"
+            }
+          }
+        },
+        {
+          "name": "meta.arrow.ts",
+          "begin": "(?x)\\s*(?=(<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>)",
+          "end": "(?==>)",
+          "patterns": [
+            {
+              "include": "#comment"
+            },
+            {
+              "include": "#type-parameters"
+            },
+            {
+              "include": "#function-parameters"
+            },
+            {
+              "include": "#arrow-return-type"
+            }
+          ]
+        },
+        {
+          "name": "meta.arrow.ts",
+          "begin": "=>",
+          "beginCaptures": {
+            "0": {
+              "name": "storage.type.function.arrow.ts"
+            }
+          },
+          "end": "(?<=\\})|((?!\\{)(?=\\S))",
+          "patterns": [
+            {
+              "include": "#decl-block"
+            },
+            {
+              "include": "#expression"
+            }
+          ]
         }
       ]
     },
-    "switch-expression": {
-      "begin": "\\b(switch)\\b\\s*\\(",
+    "arrow-return-type": {
+      "name": "meta.return.type.arrow.ts",
+      "begin": "(?<=\\))\\s*(:)",
       "beginCaptures": {
         "1": {
-          "name": "keyword.control.ts"
+          "name": "keyword.operator.type.annotation.ts"
         }
       },
-      "end": "\\)",
-      "name": "switch-expression.expr.ts",
-      "patterns": [
-        {
-          "include": "#expression"
-        }
-      ]
-    },
-    "switch-statement": {
-      "begin": "(?=\\bswitch\\b\\s*\\()",
-      "end": "}",
-      "name": "switch-statement.expr.ts",
+      "end": "(?<!:)((?=$)|(?==>|;|//))",
       "patterns": [
         {
-          "include": "#switch-expression"
+          "include": "#type-predicate-operator"
         },
         {
-          "include": "#switch-block"
+          "include": "#type"
         }
       ]
     },
-    "template": {
-      "begin": "`",
+    "punctuation-comma": {
+      "name": "punctuation.separator.comma.ts",
+      "match": ","
+    },
+    "punctuation-semicolon": {
+      "name": "punctuation.terminator.statement.ts",
+      "match": ";"
+    },
+    "punctuation-accessor": {
+      "name": "punctuation.accessor.ts",
+      "match": "\\."
+    },
+    "paren-expression": {
+      "begin": "\\(",
       "beginCaptures": {
         "0": {
-          "name": "string.template.ts"
+          "name": "meta.brace.round.ts"
         }
       },
-      "end": "`",
+      "end": "\\)",
       "endCaptures": {
         "0": {
-          "name": "string.template.ts"
+          "name": "meta.brace.round.ts"
         }
       },
-      "name": "meta.template.ts",
       "patterns": [
         {
-          "include": "#template-substitution-element"
+          "include": "#expression"
         },
         {
-          "include": "#template-string-contents"
+          "include": "#punctuation-comma"
         }
       ]
     },
-    "template-string-contents": {
-      "begin": ".*?",
-      "end": "(?=(\\$\\{|`))",
-      "name": "string.template.ts",
+    "qstring-double": {
+      "name": "string.quoted.double.ts",
+      "begin": "\"",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.ts"
+        }
+      },
+      "end": "(\")|((?:[^\\\\\\n])$)",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.string.end.ts"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.ts"
+        }
+      },
       "patterns": [
         {
           "include": "#string-character-escape"
         }
       ]
     },
-    "template-substitution-element": {
-      "begin": "\\$\\{",
+    "qstring-single": {
+      "name": "string.quoted.single.ts",
+      "begin": "'",
       "beginCaptures": {
         "0": {
-          "name": "keyword.others.ts"
+          "name": "punctuation.definition.string.begin.ts"
         }
       },
-      "end": "\\}",
+      "end": "(\\')|((?:[^\\\\\\n])$)",
       "endCaptures": {
-        "0": {
-          "name": "keyword.others.ts"
+        "1": {
+          "name": "punctuation.definition.string.end.ts"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.ts"
         }
       },
-      "name": "template.element.ts",
       "patterns": [
         {
-          "include": "#expression"
+          "include": "#string-character-escape"
         }
       ]
     },
-    "ternary-expression": {
-      "begin": "(?=\\?)",
-      "end": "(?=$|[;,])",
+    "regex": {
       "patterns": [
         {
-          "include": "#ternary-operator"
-        },
-        {
-          "include": "#expression-type"
+          "name": "string.regex.ts",
+          "begin": "(?<=[=(:,\\[?+!]|return|case|=>|&&|\\|\\||\\*\\/)\\s*(/)(?![/*+?])(?=.*/)",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.string.begin.ts"
+            }
+          },
+          "end": "(/)([gimuy]*)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.string.end.ts"
+            },
+            "2": {
+              "name": "keyword.other.ts"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#regexp"
+            }
+          ]
+        },
+        {
+          "name": "string.regex.ts",
+          "begin": "/(?![/*])(?=(?:[^/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+/(?![/*])[gimy]*(?!\\s*[a-zA-Z0-9_$]))",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.ts"
+            }
+          },
+          "end": "(/)([gimuy]*)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.string.end.ts"
+            },
+            "2": {
+              "name": "keyword.other.ts"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#regexp"
+            }
+          ]
         }
       ]
     },
-    "ternary-operator": {
-      "begin": "(\\?)",
-      "end": "(:)",
+    "regexp": {
       "patterns": [
         {
-          "include": "#expression-type"
+          "name": "keyword.control.anchor.regexp",
+          "match": "\\\\[bB]|\\^|\\$"
+        },
+        {
+          "name": "keyword.other.back-reference.regexp",
+          "match": "\\\\[1-9]\\d*"
+        },
+        {
+          "name": "keyword.operator.quantifier.regexp",
+          "match": "[?+*]|\\{(\\d+,\\d+|\\d+,|,\\d+|\\d+)\\}\\??"
+        },
+        {
+          "name": "keyword.operator.or.regexp",
+          "match": "\\|"
+        },
+        {
+          "name": "meta.group.assertion.regexp",
+          "begin": "(\\()((\\?=)|(\\?!))",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.group.regexp"
+            },
+            "2": {
+              "name": "punctuation.definition.group.assertion.regexp"
+            },
+            "3": {
+              "name": "meta.assertion.look-ahead.regexp"
+            },
+            "4": {
+              "name": "meta.assertion.negative-look-ahead.regexp"
+            }
+          },
+          "end": "(\\))",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.group.regexp"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#regexp"
+            }
+          ]
+        },
+        {
+          "name": "meta.group.regexp",
+          "begin": "\\((\\?:)?",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.group.regexp"
+            },
+            "1": {
+              "name": "punctuation.definition.group.capture.regexp"
+            }
+          },
+          "end": "\\)",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.group.regexp"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#regexp"
+            }
+          ]
+        },
+        {
+          "name": "constant.other.character-class.set.regexp",
+          "begin": "(\\[)(\\^)?",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.character-class.regexp"
+            },
+            "2": {
+              "name": "keyword.operator.negation.regexp"
+            }
+          },
+          "end": "(\\])",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.character-class.regexp"
+            }
+          },
+          "patterns": [
+            {
+              "name": "constant.other.character-class.range.regexp",
+              "match": "(?:.|(\\\\(?:[0-7]{3}|x\\h\\h|u\\h\\h\\h\\h))|(\\\\c[A-Z])|(\\\\.))\\-(?:[^\\]\\\\]|(\\\\(?:[0-7]{3}|x\\h\\h|u\\h\\h\\h\\h))|(\\\\c[A-Z])|(\\\\.))",
+              "captures": {
+                "1": {
+                  "name": "constant.character.numeric.regexp"
+                },
+                "2": {
+                  "name": "constant.character.control.regexp"
+                },
+                "3": {
+                  "name": "constant.character.escape.backslash.regexp"
+                },
+                "4": {
+                  "name": "constant.character.numeric.regexp"
+                },
+                "5": {
+                  "name": "constant.character.control.regexp"
+                },
+                "6": {
+                  "name": "constant.character.escape.backslash.regexp"
+                }
+              }
+            },
+            {
+              "include": "#regex-character-class"
+            }
+          ]
+        },
+        {
+          "include": "#regex-character-class"
         }
       ]
     },
-    "this-literal": {
-      "match": "\\b(this)\\b",
-      "name": "constant.language.this.ts"
-    },
-    "type": {
-      "name": "meta.type.ts",
+    "regex-character-class": {
       "patterns": [
         {
-          "include": "#type-primitive"
-        },
-        {
-          "include": "#type-parameters"
-        },
-        {
-          "include": "#type-tuple"
-        },
-        {
-          "include": "#type-object"
+          "name": "constant.other.character-class.regexp",
+          "match": "\\\\[wWsSdDtrnvf]|\\."
         },
         {
-          "include": "#type-operator"
+          "name": "constant.character.numeric.regexp",
+          "match": "\\\\([0-7]{3}|x\\h\\h|u\\h\\h\\h\\h)"
         },
         {
-          "include": "#type-paren-or-function-type-parameters"
+          "name": "constant.character.control.regexp",
+          "match": "\\\\c[A-Z]"
         },
         {
-          "include": "#type-function-return-type"
-        },
-        {
-          "include": "#type-name"
+          "name": "constant.character.escape.backslash.regexp",
+          "match": "\\\\."
         }
       ]
     },
-    "type-annotation": {
-      "begin": ":",
-      "end": "(?=$|[,);\\}\\]]|//)|(?==[^>])|(?<=[\\}>\\]\\)]|[a-zA-Z_$])\\s*(?=\\{)",
-      "name": "meta.type.annotation.ts",
+    "string": {
+      "name": "string.ts",
       "patterns": [
         {
-          "include": "#expression-operator"
-        },
-        {
-          "include": "#type"
-        },
-        {
-          "include": "#string"
+          "include": "#qstring-single"
         },
         {
-          "include": "#comment"
+          "include": "#qstring-double"
         }
       ]
     },
-    "type-declaration": {
-      "begin": "\\b(type)\\b\\s+([a-zA-Z_$][\\w$]*)\\s*",
+    "template": {
+      "name": "string.template.ts",
+      "begin": "([_$[:alpha:]][_$[:alnum:]]*)?(`)",
       "beginCaptures": {
         "1": {
-          "name": "keyword.other.ts"
+          "name": "entity.name.function.tagged-template.ts"
         },
         "2": {
-          "name": "entity.name.class.ts"
+          "name": "punctuation.definition.string.template.begin.ts"
         }
       },
-      "end": "(?=$|[,);>]|var|type|function|class|interface)",
-      "name": "meta.type.declaration.ts",
-      "patterns": [
-        {
-          "include": "#type-parameters"
-        },
-        {
-          "include": "#type"
-        },
-        {
-          "match": "=\\s*",
-          "name": "keyword.operator.comparison.ts"
-        }
-      ]
-    },
-    "type-function-return-type": {
-      "begin": "=>",
-      "beginCaptures": {
+      "end": "`",
+      "endCaptures": {
         "0": {
-          "name": "keyword.operator.ts"
+          "name": "punctuation.definition.string.template.end.ts"
         }
       },
-      "end": "(?=\\s*[,\\)\\{=;>]|//|$)",
-      "name": "meta.type.function.return.ts",
       "patterns": [
         {
-          "include": "#type"
+          "include": "#template-substitution-element"
+        },
+        {
+          "include": "#string-character-escape"
         }
       ]
     },
-    "type-name": {
-      "captures": {
-        "1": {
-          "name": "entity.name.type.ts"
-        }
-      },
-      "match": "[a-zA-Z_$][.\\w$]*",
-      "name": "meta.type.name.ts"
+    "string-character-escape": {
+      "name": "constant.character.escape.ts",
+      "match": "\\\\(x\\h{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)"
     },
-    "type-object": {
-      "begin": "\\{",
+    "template-substitution-element": {
+      "name": "meta.template.expression.ts",
+      "begin": "\\$\\{",
       "beginCaptures": {
         "0": {
-          "name": "meta.brace.curly.ts"
+          "name": "punctuation.definition.template-expression.begin.ts"
         }
       },
       "end": "\\}",
       "endCaptures": {
         "0": {
-          "name": "meta.brace.curly.ts"
+          "name": "punctuation.definition.template-expression.end.ts"
         }
       },
-      "name": "meta.object.type.ts",
       "patterns": [
         {
-          "include": "#comment"
-        },
-        {
-          "include": "#field-declaration"
-        },
+          "include": "#expression"
+        }
+      ]
+    },
+    "literal": {
+      "name": "literal.ts",
+      "patterns": [
         {
-          "include": "#method-declaration"
+          "include": "#numeric-literal"
         },
         {
-          "include": "#indexer-declaration"
+          "include": "#boolean-literal"
         },
         {
-          "include": "#type-annotation"
-        }
-      ]
-    },
-    "type-operator": {
-      "match": "[.|]",
-      "name": "keyword.operator.type.ts"
-    },
-    "type-parameters": {
-      "begin": "([a-zA-Z_$][\\w$]*)?(<)",
-      "beginCaptures": {
-        "1": {
-          "name": "entity.name.type.ts"
+          "include": "#null-literal"
         },
-        "2": {
-          "name": "meta.brace.angle.ts"
-        }
-      },
-      "end": "(?=$)|(>)",
-      "endCaptures": {
-        "2": {
-          "name": "meta.brace.angle.ts"
-        }
-      },
-      "name": "meta.type.parameters.ts",
-      "patterns": [
         {
-          "match": "\\b(extends)\\b",
-          "name": "keyword.other.ts"
+          "include": "#undefined-literal"
         },
         {
-          "include": "#comment"
+          "include": "#numericConstant-literal"
         },
         {
-          "include": "#type"
-        }
-      ]
-    },
-    "type-paren-or-function-type-parameters": {
-      "begin": "(?:\\b(new)\\b)?\\s*\\(",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.control.ts"
-        }
-      },
-      "end": "\\)",
-      "name": "meta.type.paren.cover.ts",
-      "patterns": [
-        {
-          "include": "#comment"
+          "include": "#array-literal"
         },
         {
-          "include": "#type"
+          "include": "#this-literal"
         },
         {
-          "include": "#function-type-parameters"
+          "include": "#super-literal"
         }
       ]
     },
-    "type-primitive": {
-      "captures": {
-        "1": {
-          "name": "support.type.ts"
-        }
-      },
-      "match": "\\b(string|number|boolean|symbol|any|void)\\b",
-      "name": "meta.type.primitive.ts"
-    },
-    "type-tuple": {
+    "array-literal": {
+      "name": "meta.array.literal.ts",
       "begin": "\\[",
       "beginCaptures": {
         "0": {
@@ -1212,80 +2978,193 @@
           "name": "meta.brace.square.ts"
         }
       },
-      "name": "meta.type.tuple.ts",
       "patterns": [
         {
-          "include": "#type"
+          "include": "#expression"
         },
         {
-          "include": "#comment"
+          "include": "#punctuation-comma"
         }
       ]
     },
-    "undefined-literal": {
-      "match": "\\b(undefined)\\b",
-      "name": "constant.language.ts"
-    },
-    "var-expr": {
-      "begin": "(?<!\\()\\s*\\b(var|let|const(?!\\s+enum))\\b",
-      "beginCaptures": {
-        "1": {
-          "name": "storage.type.ts"
-        }
-      },
-      "end": "(?=$|;)",
-      "name": "meta.var.expr.ts",
+    "numeric-literal": {
       "patterns": [
         {
-          "include": "#var-single-variable"
-        },
-        {
-          "include": "#comment"
+          "name": "constant.numeric.hex.ts",
+          "match": "\\b(?<!\\$)0(x|X)[0-9a-fA-F]+\\b(?!\\$)"
+        },
+        {
+          "name": "constant.numeric.binary.ts",
+          "match": "\\b(?<!\\$)0(b|B)[01]+\\b(?!\\$)"
+        },
+        {
+          "name": "constant.numeric.octal.ts",
+          "match": "\\b(?<!\\$)0(o|O)?[0-7]+\\b(?!\\$)"
+        },
+        {
+          "match": "(?x)\n(?<!\\$)(?:\n  (?:\\b[0-9]+(\\.)[0-9]+[eE][+-]?[0-9]+\\b)| # 1.1E+3\n  (?:\\b[0-9]+(\\.)[eE][+-]?[0-9]+\\b)|       # 1.E+3\n  (?:\\B(\\.)[0-9]+[eE][+-]?[0-9]+\\b)|       # .1E+3\n  (?:\\b[0-9]+[eE][+-]?[0-9]+\\b)|            # 1E+3\n  (?:\\b[0-9]+(\\.)[0-9]+\\b)|                # 1.1\n  (?:\\b[0-9]+(\\.)\\B)|                      # 1.\n  (?:\\B(\\.)[0-9]+\\b)|                      # .1\n  (?:\\b[0-9]+\\b(?!\\.))                     # 1\n)(?!\\$)",
+          "captures": {
+            "0": {
+              "name": "constant.numeric.decimal.ts"
+            },
+            "1": {
+              "name": "meta.delimiter.decimal.period.ts"
+            },
+            "2": {
+              "name": "meta.delimiter.decimal.period.ts"
+            },
+            "3": {
+              "name": "meta.delimiter.decimal.period.ts"
+            },
+            "4": {
+              "name": "meta.delimiter.decimal.period.ts"
+            },
+            "5": {
+              "name": "meta.delimiter.decimal.period.ts"
+            },
+            "6": {
+              "name": "meta.delimiter.decimal.period.ts"
+            }
+          }
         }
       ]
     },
-    "var-single-variable": {
-      "begin": "\\b([a-zA-Z_$][\\w$]*)\\s*(=?)",
-      "beginCaptures": {
-        "1": {
-          "name": "variable.ts"
-        }
-      },
-      "end": "(?=$|[;,])",
-      "name": "meta.var-single-variable.expr.ts",
+    "boolean-literal": {
       "patterns": [
         {
-          "include": "#ternary-expression"
-        },
-        {
-          "include": "#type-annotation"
+          "name": "constant.language.boolean.true.ts",
+          "match": "(?<!\\.|\\$)\\btrue\\b(?!\\$)"
         },
         {
-          "include": "#string"
-        },
+          "name": "constant.language.boolean.false.ts",
+          "match": "(?<!\\.|\\$)\\bfalse\\b(?!\\$)"
+        }
+      ]
+    },
+    "null-literal": {
+      "name": "constant.language.null.ts",
+      "match": "(?<!\\.|\\$)\\bnull\\b(?!\\$)"
+    },
+    "this-literal": {
+      "name": "variable.language.this.ts",
+      "match": "(?<!\\.|\\$)\\bthis\\b(?!\\$)"
+    },
+    "super-literal": {
+      "name": "variable.language.super.ts",
+      "match": "(?<!\\.|\\$)\\bsuper\\b(?!\\$)"
+    },
+    "undefined-literal": {
+      "name": "constant.language.undefined.ts",
+      "match": "(?<!\\.|\\$)\\bundefined\\b(?!\\$)"
+    },
+    "numericConstant-literal": {
+      "patterns": [
         {
-          "include": "#comment"
+          "name": "constant.language.nan.ts",
+          "match": "(?<!\\.|\\$)\\bNaN\\b(?!\\$)"
         },
         {
-          "include": "#expression"
+          "name": "constant.language.infinity.ts",
+          "match": "(?<!\\.|\\$)\\bInfinity\\b(?!\\$)"
         }
       ]
     },
-    "variable-initializer": {
-      "begin": "(=)",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.operator.comparison.ts"
+    "access-modifier": {
+      "name": "storage.modifier.ts",
+      "match": "(?<!\\.|\\$)\\b(abstract|public|protected|private|readonly|static)\\b(?!\\$)"
+    },
+    "property-accessor": {
+      "name": "storage.type.property.ts",
+      "match": "(?<!\\.|\\$)\\b(get|set)\\b(?!\\$)"
+    },
+    "comment": {
+      "patterns": [
+        {
+          "name": "comment.block.documentation.ts",
+          "begin": "/\\*\\*(?!/)",
+          "end": "\\*/",
+          "captures": {
+            "0": {
+              "name": "punctuation.definition.comment.ts"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#docblock"
+            }
+          ]
+        },
+        {
+          "name": "comment.block.ts",
+          "begin": "/\\*",
+          "end": "\\*/",
+          "captures": {
+            "0": {
+              "name": "punctuation.definition.comment.ts"
+            }
+          }
+        },
+        {
+          "begin": "(^[ \\t]+)?(?=//)",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.whitespace.comment.leading.ts"
+            }
+          },
+          "end": "(?=$)",
+          "patterns": [
+            {
+              "name": "comment.line.double-slash.ts",
+              "begin": "//",
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.definition.comment.ts"
+                }
+              },
+              "end": "(?=$)"
+            }
+          ]
         }
-      },
-      "end": "(?=$|[,);=])",
+      ]
+    },
+    "docblock": {
       "patterns": [
         {
-          "include": "#expression"
+          "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)\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",
+          "captures": {
+            "0": {
+              "name": "other.meta.jsdoc"
+            },
+            "1": {
+              "name": "entity.name.type.instance.jsdoc"
+            },
+            "2": {
+              "name": "variable.other.jsdoc"
+            },
+            "3": {
+              "name": "other.description.jsdoc"
+            }
+          }
+        },
+        {
+          "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",
+          "captures": {
+            "0": {
+              "name": "other.meta.jsdoc"
+            },
+            "1": {
+              "name": "entity.name.type.instance.jsdoc"
+            },
+            "2": {
+              "name": "other.description.jsdoc"
+            }
+          }
         }
       ]
     }
-  },
-  "scopeName": "source.ts",
-  "uuid": "ef98eb90-bf9b-11e4-bb52-0800200c9a66"
+  }
 }