github-linguist 5.3.3 → 6.0.0

data/grammars/text.elixir.json

@@ -1,45 +1,40 @@
 {
-  "fileTypes": [
-    "eex"
-  ],
-  "keyEquivalent": "^~X",
   "name": "EEx",
+  "scopeName": "text.elixir",
   "patterns": [
     {
-      "begin": "<%+#",
+      "name": "comment.block.eex",
+      "begin": "\u003c%+#",
+      "end": "%\u003e",
       "captures": {
         "0": {
           "name": "punctuation.definition.comment.eex"
         }
-      },
-      "end": "%>",
-      "name": "comment.block.eex"
+      }
     },
     {
-      "begin": "<%+(?!>)[-=]*",
-      "captures": {
-        "0": {
-          "name": "punctuation.section.embedded.elixir"
-        }
-      },
-      "end": "-?%>",
       "name": "source.elixir.embedded",
+      "begin": "\u003c%+(?!\u003e)[-=]*",
+      "end": "-?%\u003e",
       "patterns": [
         {
+          "name": "comment.line.number-sign.elixir",
+          "match": "(#).*?(?=-?%\u003e)",
           "captures": {
             "1": {
               "name": "punctuation.definition.comment.elixir"
             }
-          },
-          "match": "(#).*?(?=-?%>)",
-          "name": "comment.line.number-sign.elixir"
+          }
         },
         {
           "include": "source.elixir"
         }
-      ]
+      ],
+      "captures": {
+        "0": {
+          "name": "punctuation.section.embedded.elixir"
+        }
+      }
     }
-  ],
-  "scopeName": "text.elixir",
-  "uuid": "B1393067-A26A-4BAD-9D0F-42DF21FEB1C2"
-}
+  ]
+}

data/grammars/text.error-list.json

@@ -1,7 +1,6 @@
 {
   "name": "Error List",
   "scopeName": "text.error-list",
-  "uuid": "52410ea6-4de5-4b0e-9be7-12842e39a3a6",
   "patterns": [
     {
       "include": "#error-count"
@@ -14,6 +13,14 @@
     }
   ],
   "repository": {
+    "error-count": {
+      "match": "(?\u003c=\\[)(\\d+\\s*errors)(?=\\])",
+      "captures": {
+        "1": {
+          "name": "keyword.other.error-list"
+        }
+      }
+    },
     "filename": {
       "match": "^([^ ].*:)$",
       "captures": {
@@ -22,11 +29,14 @@
         }
       }
     },
-    "error-count": {
-      "match": "(?<=\\[)(\\d+\\s*errors)(?=\\])",
+    "location": {
+      "match": "(?\u003c=\\()(\\d+),\\s*(\\d+)(?=\\))",
       "captures": {
         "1": {
-          "name": "keyword.other.error-list"
+          "name": "constant.numeric.location.error-list"
+        },
+        "2": {
+          "name": "constant.numeric.location.error-list"
         }
       }
     },
@@ -38,17 +48,6 @@
           "include": "#location"
         }
       ]
-    },
-    "location": {
-      "match": "(?<=\\()(\\d+),\\s*(\\d+)(?=\\))",
-      "captures": {
-        "1": {
-          "name": "constant.numeric.location.error-list"
-        },
-        "2": {
-          "name": "constant.numeric.location.error-list"
-        }
-      }
     }
   }
-}
+}

data/grammars/text.find-refs.json

@@ -1,7 +1,6 @@
 {
   "name": "Find Refs",
   "scopeName": "text.find-refs",
-  "uuid": "de594c8b-2688-48c1-bc73-b5c935e408b8",
   "patterns": [
     {
       "include": "#filename"
@@ -20,75 +19,103 @@
     }
   ],
   "repository": {
-    "filename": {
-      "match": "^([^ ].*:)$",
-      "captures": {
-        "1": {
-          "name": "entity.name.filename.find-refs"
-        }
-      }
-    },
-    "footer": {
-      "name": "text.find-refs",
-      "match": "^[0-9]+ matches in [0-9+] files\\s*$"
+    "access-modifier": {
+      "name": "storage.modifier.ts",
+      "match": "\\b(public|protected|private)\\b"
     },
-    "header": {
-      "name": "text.find-refs",
-      "match": "^References to .*$"
+    "arithmetic-operator": {
+      "name": "keyword.operator.ts",
+      "match": "\\*|/|\\-\\-|\\-|\\+\\+|\\+|%"
     },
-    "line-with-match": {
-      "begin": "^ +([0-9]+):",
-      "end": "$",
+    "array-literal": {
+      "name": "meta.array.literal.ts",
+      "begin": "\\[",
+      "end": "$|\\]",
+      "patterns": [
+        {
+          "include": "#expression"
+        }
+      ],
       "beginCaptures": {
-        "1": {
-          "name": "constant.numeric.line-number.match.find-refs"
+        "0": {
+          "name": "brace.square.ts"
         }
       },
-      "patterns": [
-        {
-          "include": "#single-line-ts"
+      "endCaptures": {
+        "0": {
+          "name": "brace.square.ts"
         }
-      ]
+      }
     },
-    "single-line-ts": {
-      "name": "meta.ts.find-refs",
+    "assignment-operator": {
+      "name": "keyword.operator.ts",
+      "match": "\u003c\u003c=|\u003e\u003e\u003e=|\u003e\u003e=|\\*=|(?\u003c!\\()/=|%=|\\+=|\\-=|\u0026=|\\^="
+    },
+    "block": {
+      "name": "meta.block.ts",
+      "begin": "\\{",
+      "end": "$|\\}",
       "patterns": [
         {
           "include": "#expression"
+        },
+        {
+          "include": "#object-member"
         }
       ]
     },
-    "var-expr": {
-      "name": "meta.var.expr.ts",
-      "begin": "(?<!\\()\\s*\\b(var|let|const(?!\\s+enum))\\s+([a-zA-Z_$][\\w$]*)",
-      "beginCaptures": {
+    "boolean-literal": {
+      "name": "constant.language.boolean.ts",
+      "match": "\\b(false|true)\\b"
+    },
+    "cast": {
+      "name": "cast.expr.ts",
+      "match": "\u003c\\s*([a-zA-Z_$][.\\w$]*)\\s*(?:\u003c([a-zA-Z_$][.\\w$]*)\u003e)?\\s*(\\[\\])*\\s*\u003e",
+      "captures": {
         "1": {
           "name": "storage.type.ts"
         },
         "2": {
-          "name": "variable.ts"
+          "name": "storage.type.ts"
         }
-      },
-      "end": "$|(?=[;=\\}\\{])|(?<=\\})",
+      }
+    },
+    "comment": {
+      "name": "comment.ts",
       "patterns": [
         {
-          "include": "#type-annotation"
+          "include": "#comment-block-doc"
+        },
+        {
+          "include": "#comment-block"
+        },
+        {
+          "include": "#comment-line"
         }
       ]
     },
+    "comment-block": {
+      "name": "comment.block.ts",
+      "begin": "/\\*",
+      "end": "$|\\*/"
+    },
+    "comment-block-doc": {
+      "name": "comment.block.documentation.ts",
+      "begin": "/\\*\\*(?!/)",
+      "end": "$|\\*/"
+    },
+    "comment-line": {
+      "name": "comment.line.ts",
+      "match": "(//).*$\\n?"
+    },
     "control-statement": {
       "name": "keyword.control.ts",
       "match": "\\b(break|catch|continue|declare|do|else|finally|for|if|return|switch|throw|try|while)\\b"
     },
-    "switch-case": {
-      "name": "case.expr.ts",
-      "begin": "\\b(case|default)\\b",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.control.ts"
-        }
-      },
-      "end": ":",
+    "decl-block": {
+      "name": "meta.decl.block.ts",
+      "begin": "\\{",
+      "end": "$|(?=\\})",
       "patterns": [
         {
           "include": "#expression"
@@ -112,24 +139,6 @@
         }
       ]
     },
-    "type-declaration": {
-      "name": "meta.type.declaration.ts",
-      "begin": "\\b(type)\\b\\s+([a-zA-Z_$][\\w$]*)\\s*=\\s*",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.ts"
-        },
-        "2": {
-          "name": "storage.type.ts"
-        }
-      },
-      "end": "$|(?=[,);>]|var|type|function|class|interface)",
-      "patterns": [
-        {
-          "include": "#type"
-        }
-      ]
-    },
     "enum-declaration": {
       "name": "meta.enum.declaration.ts",
       "match": "(?:\\b(const)\\s+)?\\b(enum)\\s+([a-zA-Z_$][\\w$]*)",
@@ -145,109 +154,75 @@
         }
       }
     },
-    "object-declaration": {
-      "name": "meta.declaration.object.ts",
-      "begin": "\\b(?:(export)\\s+)?\\b(class|interface)\\b(?:\\s+([a-zA-Z_$][\\w$]*))",
-      "beginCaptures": {
-        "1": {
-          "name": "storage.modifier.ts"
-        },
-        "2": {
-          "name": "storage.type.ts"
-        },
-        "3": {
-          "name": "entity.name.class.ts"
-        }
-      },
-      "end": "$|(?=\\})",
-      "endCaptures": {
-        "1": {
-          "name": "brace.curly.ts"
-        }
-      },
+    "expression": {
+      "name": "meta.expression.ts",
       "patterns": [
         {
-          "include": "#type-parameters"
+          "include": "#string"
         },
         {
-          "include": "#object-heritage"
+          "include": "#regex"
         },
         {
-          "include": "#object-body"
+          "include": "#template"
         },
         {
           "include": "#comment"
-        }
-      ]
-    },
-    "object-heritage": {
-      "name": "meta.object.heritage.ts",
-      "match": "(?:\\b(extends|implements)\\b|,)(?:\\s+([a-zA-Z_$][.\\w$]*))",
-      "captures": {
-        "1": {
-          "name": "storage.modifier.ts"
         },
-        "2": {
-          "name": "storage.type.ts"
-        }
-      }
-    },
-    "object-body": {
-      "name": "meta.object.body.ts",
-      "begin": "\\{",
-      "end": "$|(?=\\})",
-      "patterns": [
         {
-          "include": "#comment"
+          "include": "#literal"
         },
         {
-          "include": "#field-declaration"
+          "include": "#paren-expression"
         },
         {
-          "include": "#method-declaration"
+          "include": "#var-expr"
         },
         {
-          "include": "#indexer-declaration"
+          "include": "#declaration"
         },
         {
-          "include": "#type-annotation"
+          "include": "#cast"
         },
         {
-          "include": "#variable-initializer"
+          "include": "#new-expr"
         },
         {
-          "include": "#access-modifier"
+          "include": "#block"
         },
         {
-          "include": "#static-modifier"
+          "include": "#expression-operator"
         },
         {
-          "include": "#property-accessor"
-        }
-      ]
-    },
-    "object-type": {
-      "name": "meta.object.type.ts",
-      "begin": "\\{",
-      "end": "$|\\}",
-      "patterns": [
+          "include": "#relational-operator"
+        },
         {
-          "include": "#comment"
+          "include": "#arithmetic-operator"
         },
         {
-          "include": "#field-declaration"
+          "include": "#logic-operator"
         },
         {
-          "include": "#method-declaration-no-body"
+          "include": "#assignment-operator"
         },
         {
-          "include": "#indexer-declaration"
+          "include": "#storage-keyword"
         },
         {
-          "include": "#type-annotation"
+          "include": "#control-statement"
+        },
+        {
+          "include": "#switch-case"
+        },
+        {
+          "include": "#for-in-simple"
         }
       ]
     },
+    "expression-operator": {
+      "name": "keyword.operator.ts",
+      "match": "=\u003e|\\b(delete|export|import|in|instanceof|module|new|typeof|void)\\b"
+    },
     "field-declaration": {
       "name": "meta.field.declaration.ts",
       "match": "\\b([a-zA-Z_$][\\w$]*)\\s*(\\?\\s*)?(?=(=|:))",
@@ -260,75 +235,116 @@
         }
       }
     },
-    "method-declaration": {
-      "name": "meta.method.declaration.ts",
-      "begin": "\\b(?:(get|set)\\s+)?\\[?([a-zA-Z_$][\\.\\w$]*)\\s*\\]?\\s*(\\??)\\s*(?=\\()",
-      "beginCaptures": {
+    "filename": {
+      "match": "^([^ ].*:)$",
+      "captures": {
         "1": {
-          "name": "storage.type.property.ts"
-        },
-        "2": {
-          "name": "entity.name.function.ts"
+          "name": "entity.name.filename.find-refs"
+        }
+      }
+    },
+    "footer": {
+      "name": "text.find-refs",
+      "match": "^[0-9]+ matches in [0-9+] files\\s*$"
+    },
+    "for-in-simple": {
+      "name": "forin.expr.ts",
+      "match": "(?\u003c=\\()\\s*\\b(var|let)\\s+([a-zA-Z_$][\\w$]*)\\s+(in)\\b",
+      "captures": {
+        "1": {
+          "name": "storage.type.ts"
         },
         "3": {
           "name": "keyword.operator.ts"
         }
-      },
-      "end": "$|\\}|[;,]",
+      }
+    },
+    "function-declaration": {
+      "name": "meta.function.ts",
+      "begin": "\\b(function)\\b(?:\\s+([a-zA-Z_$][\\w$]*))?\\s*",
+      "end": "$|(?=\\}|;)",
       "patterns": [
         {
           "include": "#comment"
         },
+        {
+          "include": "#type-parameters"
+        },
         {
           "include": "#function-parameters"
         },
         {
-          "include": "#type-annotation"
+          "include": "#return-type"
         },
         {
           "include": "#decl-block"
         }
-      ]
-    },
-    "method-declaration-no-body": {
-      "name": "meta.method.declaration.ts",
-      "begin": "\\b(?:(get|set)\\s+)?\\[?([a-zA-Z_$][\\.\\w$]*)\\s*\\]?\\s*(\\??)\\s*(?=\\()",
+      ],
       "beginCaptures": {
         "1": {
-          "name": "storage.type.property.ts"
+          "name": "storage.type.function.ts"
         },
         "2": {
           "name": "entity.name.function.ts"
+        }
+      }
+    },
+    "function-parameters": {
+      "name": "meta.function-parameters.ts",
+      "begin": "\\(",
+      "end": "$|\\)",
+      "patterns": [
+        {
+          "include": "#comment"
         },
-        "3": {
-          "name": "keyword.operator.ts"
+        {
+          "include": "#parameter-name"
+        },
+        {
+          "include": "#type-annotation"
+        },
+        {
+          "include": "#variable-initializer"
         }
-      },
-      "end": "$|(?=\\})|[;,]",
+      ]
+    },
+    "function-type-parameters": {
+      "name": "meta.function.type.ts",
+      "begin": "\\(",
+      "end": "$|\\)",
       "patterns": [
         {
           "include": "#comment"
         },
         {
-          "include": "#function-parameters"
+          "include": "#parameter-name"
         },
         {
           "include": "#type-annotation"
         },
         {
-          "include": "#decl-block"
+          "include": "#variable-initializer"
+        }
+      ]
+    },
+    "function-type-return-type": {
+      "name": "meta.function.type.return.ts",
+      "begin": "=\u003e",
+      "end": "$|(?=[,\\){]|//)",
+      "patterns": [
+        {
+          "include": "#type"
         }
       ]
     },
+    "header": {
+      "name": "text.find-refs",
+      "match": "^References to .*$"
+    },
     "indexer-declaration": {
       "name": "meta.indexer.declaration.ts",
       "begin": "\\[",
       "end": "\\]\\s*(\\?\\s*)?|$",
-      "endCaptures": {
-        "1": {
-          "name": "keyword.operator.ts"
-        }
-      },
       "patterns": [
         {
           "include": "#type-annotation"
@@ -339,7 +355,12 @@
         {
           "include": "#expression"
         }
-      ]
+      ],
+      "endCaptures": {
+        "1": {
+          "name": "keyword.operator.ts"
+        }
+      }
     },
     "indexer-parameter": {
       "name": "meta.indexer.parameter.ts",
@@ -350,321 +371,199 @@
         }
       }
     },
-    "function-declaration": {
-      "name": "meta.function.ts",
-      "begin": "\\b(function)\\b(?:\\s+([a-zA-Z_$][\\w$]*))?\\s*",
-      "beginCaptures": {
-        "1": {
-          "name": "storage.type.function.ts"
-        },
-        "2": {
-          "name": "entity.name.function.ts"
-        }
-      },
-      "end": "$|(?=\\}|;)",
+    "line-with-match": {
+      "begin": "^ +([0-9]+):",
+      "end": "$",
       "patterns": [
         {
-          "include": "#comment"
-        },
-        {
-          "include": "#type-parameters"
-        },
-        {
-          "include": "#function-parameters"
-        },
-        {
-          "include": "#return-type"
-        },
-        {
-          "include": "#decl-block"
+          "include": "#single-line-ts"
         }
-      ]
-    },
-    "block": {
-      "name": "meta.block.ts",
-      "begin": "\\{",
-      "end": "$|\\}",
-      "patterns": [
-        {
-          "include": "#expression"
-        },
-        {
-          "include": "#object-member"
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "constant.numeric.line-number.match.find-refs"
         }
-      ]
+      }
     },
-    "decl-block": {
-      "name": "meta.decl.block.ts",
-      "begin": "\\{",
-      "end": "$|(?=\\})",
+    "literal": {
+      "name": "literal.ts",
       "patterns": [
         {
-          "include": "#expression"
-        }
-      ]
-    },
-    "function-parameters": {
-      "name": "meta.function-parameters.ts",
-      "begin": "\\(",
-      "end": "$|\\)",
-      "patterns": [
+          "include": "#numeric-literal"
+        },
         {
-          "include": "#comment"
+          "include": "#boolean-literal"
         },
         {
-          "include": "#parameter-name"
+          "include": "#null-literal"
         },
         {
-          "include": "#type-annotation"
+          "include": "#undefined-literal"
         },
         {
-          "include": "#variable-initializer"
+          "include": "#array-literal"
         }
       ]
     },
-    "function-type-parameters": {
-      "name": "meta.function.type.ts",
-      "begin": "\\(",
-      "end": "$|\\)",
+    "logic-operator": {
+      "name": "keyword.operator.ts",
+      "match": "\\!|\u0026\u0026|\u0026|~|\\|\\||\\|"
+    },
+    "method-declaration": {
+      "name": "meta.method.declaration.ts",
+      "begin": "\\b(?:(get|set)\\s+)?\\[?([a-zA-Z_$][\\.\\w$]*)\\s*\\]?\\s*(\\??)\\s*(?=\\()",
+      "end": "$|\\}|[;,]",
       "patterns": [
         {
           "include": "#comment"
         },
         {
-          "include": "#parameter-name"
+          "include": "#function-parameters"
         },
         {
           "include": "#type-annotation"
         },
         {
-          "include": "#variable-initializer"
+          "include": "#decl-block"
         }
-      ]
-    },
-    "parameter-name": {
-      "name": "parameter.name.ts",
-      "match": "(?:\\s*\\b(public|private)\\b\\s+)?(\\.\\.\\.)?\\s*([a-zA-Z_$][\\w$]*)\\s*(\\??)",
-      "captures": {
+      ],
+      "beginCaptures": {
         "1": {
-          "name": "storage.modifier.ts"
+          "name": "storage.type.property.ts"
         },
         "2": {
-          "name": "keyword.operator.ts"
+          "name": "entity.name.function.ts"
         },
         "3": {
-          "name": "variable.parameter.ts"
-        },
-        "4": {
           "name": "keyword.operator.ts"
         }
       }
     },
-    "return-type": {
-      "name": "meta.return.type.ts",
-      "begin": "(?<=\\)):",
-      "end": "$|(?=\\{|;|//)",
-      "patterns": [
-        {
-          "include": "#type"
-        }
-      ]
-    },
-    "type-annotation": {
-      "name": "meta.type.annotation.ts",
-      "begin": ":",
-      "end": "(?=[,);}\\[\\]])|(?==[^>])|(?<=[a-z]|>)\\s*(?=\\{|$|//)",
+    "method-declaration-no-body": {
+      "name": "meta.method.declaration.ts",
+      "begin": "\\b(?:(get|set)\\s+)?\\[?([a-zA-Z_$][\\.\\w$]*)\\s*\\]?\\s*(\\??)\\s*(?=\\()",
+      "end": "$|(?=\\})|[;,]",
       "patterns": [
-        {
-          "include": "#type"
-        },
         {
           "include": "#comment"
-        }
-      ]
-    },
-    "type": {
-      "name": "meta.type.ts",
-      "patterns": [
-        {
-          "include": "#type-name"
         },
         {
-          "include": "#type-parameters"
-        },
-        {
-          "include": "#type-union"
-        },
-        {
-          "include": "#object-type"
+          "include": "#function-parameters"
         },
         {
-          "include": "#function-type-parameters"
+          "include": "#type-annotation"
         },
         {
-          "include": "#function-type-return-type"
-        }
-      ]
-    },
-    "function-type-return-type": {
-      "name": "meta.function.type.return.ts",
-      "begin": "=>",
-      "end": "$|(?=[,\\){]|//)",
-      "patterns": [
-        {
-          "include": "#type"
+          "include": "#decl-block"
         }
-      ]
-    },
-    "type-union": {
-      "name": "meta.type.union.ts",
-      "begin": "(\\|)",
+      ],
       "beginCaptures": {
         "1": {
-          "name": "keyword.operator.ts"
-        }
-      },
-      "end": "$|([a-zA-Z_$][.\\w$]*)",
-      "endCaptures": {
-        "1": {
-          "name": "storage.type.ts"
-        }
-      },
-      "patterns": [
-        {
-          "include": "#comment"
-        }
-      ]
-    },
-    "type-name": {
-      "name": "storage.type.ts",
-      "match": "[a-zA-Z_$][.\\w$]*"
-    },
-    "type-parameters": {
-      "name": "meta.type.parameters.ts",
-      "begin": "<",
-      "end": "$|(?=var|type|function|class|interface)|>",
-      "patterns": [
-        {
-          "name": "keyword.other.ts",
-          "match": "\\b(extends)\\b"
+          "name": "storage.type.property.ts"
         },
-        {
-          "include": "#comment"
+        "2": {
+          "name": "entity.name.function.ts"
         },
-        {
-          "include": "#type"
+        "3": {
+          "name": "keyword.operator.ts"
         }
-      ]
+      }
     },
-    "variable-initializer": {
-      "begin": "(=)",
-      "beginCaptures": {
+    "new-expr": {
+      "name": "new.expr.ts",
+      "match": "\\b(new)\\b\\s*([a-zA-Z_$][.\\w$]*)",
+      "captures": {
         "1": {
           "name": "keyword.operator.ts"
+        },
+        "2": {
+          "name": "storage.type.ts"
         }
-      },
-      "end": "$|(?=[,);=])",
-      "patterns": [
-        {
-          "include": "#expression"
-        }
-      ]
+      }
     },
-    "expression": {
-      "name": "meta.expression.ts",
+    "null-literal": {
+      "name": "constant.language.null.ts",
+      "match": "\\b(null)\\b"
+    },
+    "numeric-literal": {
+      "name": "constant.numeric.ts",
+      "match": "\\b((0(x|X)[0-9a-fA-F]+)|([0-9]+(\\.[0-9]+)?))\\b"
+    },
+    "object-body": {
+      "name": "meta.object.body.ts",
+      "begin": "\\{",
+      "end": "$|(?=\\})",
       "patterns": [
-        {
-          "include": "#string"
-        },
-        {
-          "include": "#regex"
-        },
-        {
-          "include": "#template"
-        },
         {
           "include": "#comment"
         },
         {
-          "include": "#literal"
-        },
-        {
-          "include": "#paren-expression"
-        },
-        {
-          "include": "#var-expr"
-        },
-        {
-          "include": "#declaration"
-        },
-        {
-          "include": "#cast"
+          "include": "#field-declaration"
         },
         {
-          "include": "#new-expr"
+          "include": "#method-declaration"
         },
         {
-          "include": "#block"
+          "include": "#indexer-declaration"
         },
         {
-          "include": "#expression-operator"
+          "include": "#type-annotation"
         },
         {
-          "include": "#relational-operator"
+          "include": "#variable-initializer"
         },
         {
-          "include": "#arithmetic-operator"
+          "include": "#access-modifier"
         },
         {
-          "include": "#logic-operator"
+          "include": "#static-modifier"
         },
         {
-          "include": "#assignment-operator"
-        },
+          "include": "#property-accessor"
+        }
+      ]
+    },
+    "object-declaration": {
+      "name": "meta.declaration.object.ts",
+      "begin": "\\b(?:(export)\\s+)?\\b(class|interface)\\b(?:\\s+([a-zA-Z_$][\\w$]*))",
+      "end": "$|(?=\\})",
+      "patterns": [
         {
-          "include": "#storage-keyword"
+          "include": "#type-parameters"
         },
         {
-          "include": "#control-statement"
+          "include": "#object-heritage"
         },
         {
-          "include": "#switch-case"
+          "include": "#object-body"
         },
         {
-          "include": "#for-in-simple"
+          "include": "#comment"
         }
-      ]
-    },
-    "for-in-simple": {
-      "name": "forin.expr.ts",
-      "match": "(?<=\\()\\s*\\b(var|let)\\s+([a-zA-Z_$][\\w$]*)\\s+(in)\\b",
-      "captures": {
+      ],
+      "beginCaptures": {
         "1": {
+          "name": "storage.modifier.ts"
+        },
+        "2": {
           "name": "storage.type.ts"
         },
         "3": {
-          "name": "keyword.operator.ts"
+          "name": "entity.name.class.ts"
         }
-      }
-    },
-    "cast": {
-      "name": "cast.expr.ts",
-      "match": "<\\s*([a-zA-Z_$][.\\w$]*)\\s*(?:<([a-zA-Z_$][.\\w$]*)>)?\\s*(\\[\\])*\\s*>",
-      "captures": {
+      },
+      "endCaptures": {
         "1": {
-          "name": "storage.type.ts"
-        },
-        "2": {
-          "name": "storage.type.ts"
+          "name": "brace.curly.ts"
         }
       }
     },
-    "new-expr": {
-      "name": "new.expr.ts",
-      "match": "\\b(new)\\b\\s*([a-zA-Z_$][.\\w$]*)",
+    "object-heritage": {
+      "name": "meta.object.heritage.ts",
+      "match": "(?:\\b(extends|implements)\\b|,)(?:\\s+([a-zA-Z_$][.\\w$]*))",
       "captures": {
         "1": {
-          "name": "keyword.operator.ts"
+          "name": "storage.modifier.ts"
         },
         "2": {
           "name": "storage.type.ts"
@@ -681,48 +580,68 @@
         }
       ]
     },
-    "expression-operator": {
-      "name": "keyword.operator.ts",
-      "match": "=>|\\b(delete|export|import|in|instanceof|module|new|typeof|void)\\b"
-    },
-    "arithmetic-operator": {
-      "name": "keyword.operator.ts",
-      "match": "\\*|/|\\-\\-|\\-|\\+\\+|\\+|%"
-    },
-    "relational-operator": {
-      "name": "keyword.operator.ts",
-      "match": "===|!==|==|!=|<=|>=|<>|=|<|>"
-    },
-    "assignment-operator": {
-      "name": "keyword.operator.ts",
-      "match": "<<=|>>>=|>>=|\\*=|(?<!\\()/=|%=|\\+=|\\-=|&=|\\^="
-    },
-    "logic-operator": {
-      "name": "keyword.operator.ts",
-      "match": "\\!|&&|&|~|\\|\\||\\|"
+    "object-type": {
+      "name": "meta.object.type.ts",
+      "begin": "\\{",
+      "end": "$|\\}",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#field-declaration"
+        },
+        {
+          "include": "#method-declaration-no-body"
+        },
+        {
+          "include": "#indexer-declaration"
+        },
+        {
+          "include": "#type-annotation"
+        }
+      ]
     },
-    "storage-keyword": {
-      "name": "storage.type.ts",
-      "match": "\\b(number|boolean|string)\\b"
+    "parameter-name": {
+      "name": "parameter.name.ts",
+      "match": "(?:\\s*\\b(public|private)\\b\\s+)?(\\.\\.\\.)?\\s*([a-zA-Z_$][\\w$]*)\\s*(\\??)",
+      "captures": {
+        "1": {
+          "name": "storage.modifier.ts"
+        },
+        "2": {
+          "name": "keyword.operator.ts"
+        },
+        "3": {
+          "name": "variable.parameter.ts"
+        },
+        "4": {
+          "name": "keyword.operator.ts"
+        }
+      }
     },
     "paren-expression": {
       "begin": "\\(",
+      "end": "$|\\)",
+      "patterns": [
+        {
+          "include": "#expression"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "brace.paren.ts"
         }
       },
-      "end": "$|\\)",
       "endCaptures": {
         "0": {
           "name": "brace.paren.ts"
         }
-      },
-      "patterns": [
-        {
-          "include": "#expression"
-        }
-      ]
+      }
+    },
+    "property-accessor": {
+      "name": "storage.type.property.ts",
+      "match": "\\b(get|set)\\b"
     },
     "qstring-double": {
       "name": "string.double.ts",
@@ -746,7 +665,7 @@
     },
     "regex": {
       "name": "string.regex.ts",
-      "begin": "(?<=[=(:,\\[]|^|return|&&|\\|\\||!)\\s*(/)(?![/*+{}?])",
+      "begin": "(?\u003c=[=(:,\\[]|^|return|\u0026\u0026|\\|\\||!)\\s*(/)(?![/*+{}?])",
       "end": "$|(/)[igm]*",
       "patterns": [
         {
@@ -759,6 +678,36 @@
         }
       ]
     },
+    "relational-operator": {
+      "name": "keyword.operator.ts",
+      "match": "===|!==|==|!=|\u003c=|\u003e=|\u003c\u003e|=|\u003c|\u003e"
+    },
+    "return-type": {
+      "name": "meta.return.type.ts",
+      "begin": "(?\u003c=\\)):",
+      "end": "$|(?=\\{|;|//)",
+      "patterns": [
+        {
+          "include": "#type"
+        }
+      ]
+    },
+    "single-line-ts": {
+      "name": "meta.ts.find-refs",
+      "patterns": [
+        {
+          "include": "#expression"
+        }
+      ]
+    },
+    "static-modifier": {
+      "name": "keyword.other.ts",
+      "match": "\\b(static)\\b"
+    },
+    "storage-keyword": {
+      "name": "storage.type.ts",
+      "match": "\\b(number|boolean|string)\\b"
+    },
     "string": {
       "name": "string.ts",
       "patterns": [
@@ -770,28 +719,47 @@
         }
       ]
     },
+    "string-character-escape": {
+      "name": "constant.character.escape",
+      "match": "\\\\(x[[:xdigit:]]{2}|[0-2][0-7]{,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)"
+    },
+    "switch-case": {
+      "name": "case.expr.ts",
+      "begin": "\\b(case|default)\\b",
+      "end": ":",
+      "patterns": [
+        {
+          "include": "#expression"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.ts"
+        }
+      }
+    },
     "template": {
       "name": "meta.template.ts",
       "begin": "`",
+      "end": "$|`",
+      "patterns": [
+        {
+          "include": "#template-substitution-element"
+        },
+        {
+          "include": "#template-string-contents"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "string.template.ts"
         }
       },
-      "end": "$|`",
       "endCaptures": {
         "0": {
           "name": "string.template.ts"
         }
-      },
-      "patterns": [
-        {
-          "include": "#template-substitution-element"
-        },
-        {
-          "include": "#template-string-contents"
-        }
-      ]
+      }
     },
     "template-string-contents": {
       "name": "string.template.ts",
@@ -803,125 +771,156 @@
         }
       ]
     },
-    "string-character-escape": {
-      "name": "constant.character.escape",
-      "match": "\\\\(x\\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)"
-    },
     "template-substitution-element": {
       "name": "template.element.ts",
       "begin": "\\$\\{",
+      "end": "$|\\}",
+      "patterns": [
+        {
+          "include": "#expression"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "keyword.operator.ts"
         }
       },
-      "end": "$|\\}",
       "endCaptures": {
         "0": {
           "name": "keyword.operator.ts"
         }
-      },
-      "patterns": [
-        {
-          "include": "#expression"
-        }
-      ]
+      }
     },
-    "comment": {
-      "name": "comment.ts",
+    "type": {
+      "name": "meta.type.ts",
       "patterns": [
         {
-          "include": "#comment-block-doc"
+          "include": "#type-name"
         },
         {
-          "include": "#comment-block"
+          "include": "#type-parameters"
         },
         {
-          "include": "#comment-line"
+          "include": "#type-union"
+        },
+        {
+          "include": "#object-type"
+        },
+        {
+          "include": "#function-type-parameters"
+        },
+        {
+          "include": "#function-type-return-type"
         }
       ]
     },
-    "comment-block-doc": {
-      "name": "comment.block.documentation.ts",
-      "begin": "/\\*\\*(?!/)",
-      "end": "$|\\*/"
-    },
-    "comment-block": {
-      "name": "comment.block.ts",
-      "begin": "/\\*",
-      "end": "$|\\*/"
-    },
-    "comment-line": {
-      "name": "comment.line.ts",
-      "match": "(//).*$\\n?"
-    },
-    "literal": {
-      "name": "literal.ts",
+    "type-annotation": {
+      "name": "meta.type.annotation.ts",
+      "begin": ":",
+      "end": "(?=[,);}\\[\\]])|(?==[^\u003e])|(?\u003c=[a-z]|\u003e)\\s*(?=\\{|$|//)",
       "patterns": [
         {
-          "include": "#numeric-literal"
+          "include": "#type"
         },
         {
-          "include": "#boolean-literal"
+          "include": "#comment"
+        }
+      ]
+    },
+    "type-declaration": {
+      "name": "meta.type.declaration.ts",
+      "begin": "\\b(type)\\b\\s+([a-zA-Z_$][\\w$]*)\\s*=\\s*",
+      "end": "$|(?=[,);\u003e]|var|type|function|class|interface)",
+      "patterns": [
+        {
+          "include": "#type"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.other.ts"
         },
+        "2": {
+          "name": "storage.type.ts"
+        }
+      }
+    },
+    "type-name": {
+      "name": "storage.type.ts",
+      "match": "[a-zA-Z_$][.\\w$]*"
+    },
+    "type-parameters": {
+      "name": "meta.type.parameters.ts",
+      "begin": "\u003c",
+      "end": "$|(?=var|type|function|class|interface)|\u003e",
+      "patterns": [
         {
-          "include": "#null-literal"
+          "name": "keyword.other.ts",
+          "match": "\\b(extends)\\b"
         },
         {
-          "include": "#undefined-literal"
+          "include": "#comment"
         },
         {
-          "include": "#array-literal"
+          "include": "#type"
         }
       ]
     },
-    "array-literal": {
-      "name": "meta.array.literal.ts",
-      "begin": "\\[",
+    "type-union": {
+      "name": "meta.type.union.ts",
+      "begin": "(\\|)",
+      "end": "$|([a-zA-Z_$][.\\w$]*)",
+      "patterns": [
+        {
+          "include": "#comment"
+        }
+      ],
       "beginCaptures": {
-        "0": {
-          "name": "brace.square.ts"
+        "1": {
+          "name": "keyword.operator.ts"
         }
       },
-      "end": "$|\\]",
       "endCaptures": {
-        "0": {
-          "name": "brace.square.ts"
-        }
-      },
-      "patterns": [
-        {
-          "include": "#expression"
+        "1": {
+          "name": "storage.type.ts"
         }
-      ]
-    },
-    "numeric-literal": {
-      "name": "constant.numeric.ts",
-      "match": "\\b((0(x|X)[0-9a-fA-F]+)|([0-9]+(\\.[0-9]+)?))\\b"
-    },
-    "boolean-literal": {
-      "name": "constant.language.boolean.ts",
-      "match": "\\b(false|true)\\b"
-    },
-    "null-literal": {
-      "name": "constant.language.null.ts",
-      "match": "\\b(null)\\b"
+      }
     },
     "undefined-literal": {
       "name": "constant.language.ts",
       "match": "\\b(undefined)\\b"
     },
-    "access-modifier": {
-      "name": "storage.modifier.ts",
-      "match": "\\b(public|protected|private)\\b"
-    },
-    "static-modifier": {
-      "name": "keyword.other.ts",
-      "match": "\\b(static)\\b"
+    "var-expr": {
+      "name": "meta.var.expr.ts",
+      "begin": "(?\u003c!\\()\\s*\\b(var|let|const(?!\\s+enum))\\s+([a-zA-Z_$][\\w$]*)",
+      "end": "$|(?=[;=\\}\\{])|(?\u003c=\\})",
+      "patterns": [
+        {
+          "include": "#type-annotation"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "storage.type.ts"
+        },
+        "2": {
+          "name": "variable.ts"
+        }
+      }
     },
-    "property-accessor": {
-      "name": "storage.type.property.ts",
-      "match": "\\b(get|set)\\b"
+    "variable-initializer": {
+      "begin": "(=)",
+      "end": "$|(?=[,);=])",
+      "patterns": [
+        {
+          "include": "#expression"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.operator.ts"
+        }
+      }
     }
   }
-}
+}