github-linguist 4.8.8 → 4.8.9

data/grammars/source.js.jsx.json

@@ -1,7 +1,7 @@
 {
   "name": "Babel ES6 JavaScript",
   "scopeName": "source.js.jsx",
-  "foldingStartMarker": "(/\\*|\\{|\\()",
+  "foldingStartMarker": "(/\\*|{|\\()",
   "foldingEndMarker": "(\\*/|\\}|\\))",
   "firstLineMatch": "^#!\\s*/.*\\b(node|js)$\\n?",
   "fileTypes": [
@@ -105,7 +105,8 @@
           "include": "#literal-language-variable"
         },
         {
-          "include": "#literal-object"
+          "include": "#literal-object",
+          "comment": "before literal-module as it traps default {"
         },
         {
           "include": "#literal-module"
@@ -146,7 +147,7 @@
       "comment": "so set at arbitary 1000 chars to avoid parsing minified files",
       "patterns": [
         {
-          "match": "^(?:).{1000,}"
+          "match": "^.{1000,}"
         }
       ]
     },
@@ -156,7 +157,7 @@
           "comment": "e.g. play: function(arg1, arg2) { }",
           "name": "meta.function.json.js",
           "begin": "(?<=^|{|,)\\s*+([_$a-zA-Z][$\\w]*)\\s*+(:)\\s*+(?:(async)\\s+)?\\s*+((?<!\\.)\\bfunction\\b)\\s*+(?:(\\*)\\s*)?\\s*(?=\\(|<)",
-          "end": "(?=\\{)",
+          "end": "(?={)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
             "1": {
@@ -184,8 +185,8 @@
         {
           "comment": "e.g. 'play': function(arg1, arg2) { }",
           "name": "meta.function.json.js",
-          "begin": "(?<=^|{|,)\\s*+(('|\\\")([^\"']*)(\\k<-3>))\\s*+(:)\\s*+(async)?\\s*+((?<!\\.)\\bfunction\\b)\\s*(\\*\\s*)?\\s*(?=\\(|<)",
-          "end": "(?=\\{)",
+          "begin": "(?<=^|{|,)\\s*+(('|\")([^\"']*)(\\k<-3>))\\s*+(:)\\s*+(async)?\\s*+((?<!\\.)\\bfunction\\b)\\s*(\\*\\s*)?\\s*(?=\\(|<)",
+          "end": "(?={)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
             "1": {
@@ -226,7 +227,7 @@
         {
           "comment": "e.g. play: async <T>(args) => { }",
           "name": "meta.function.json.arrow.js",
-          "begin": "(?<=^|{|,)\\s*+(\\b[_$a-zA-Z][$\\w]*)\\s*+(:)\\s*+(\\basync\\b)?\\s*+(?=(<(?:(?>[^<>]+)|\\g<-1>)*>)?\\s*+(\\((?:(?>[^()]+)|\\g<-1>)*\\))\\s*+(?:\\s*:(\\s*+(&|\\|)?(\\s*+[$_a-zA-Z0-9]+(<(?:(?>[^<>]+)|\\g<-1>)*>)?|\\s*+(\\{(?:(?>[^{}]+)|\\g<-1>)*\\})|\\s*+(\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])|\\s*+(\\s*([\"']).*?\\k<-1>(?<!\\\\.))|\\s*[x0-9A-Fa-f]+))*+)*\\s*=>)",
+          "begin": "(?<=^|{|,)\\s*+(\\b[_$a-zA-Z][$\\w]*)\\s*+(:)\\s*+(\\basync\\b)?\\s*+(?=(<(?:(?>[^<>]+)|\\g<-1>)*>)?\\s*+(\\((?:(?>[^()]+)|\\g<-1>)*\\))\\s*+(((?::(?:(\\s*+(&|\\|)?(\\s*+[$_a-zA-Z0-9]+(<(?:(?>[^<>]+)|\\g<-1>)*>)?|\\s*+({(?:(?>[^{}]+)|\\g<-1>)*\\})|\\s*+(\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])|\\s*+(\\s*([\"']).*?\\k<-1>(?<!\\\\.))|\\s*[x0-9A-Fa-f]+))|(?:\\s*+/\\*.*?\\*/))*+)*)|(?:/\\*.*?\\*/))(((?<=checks)|(\\s*\\bchecks))\\b\\s*(\\((?:(?>[^()]+)|\\g<-1>)*\\))?)?\\s*=>)",
           "end": "\\s*(=>)",
           "beginCaptures": {
             "1": {
@@ -253,7 +254,7 @@
         {
           "comment": "e.g. play: arg => { }",
           "name": "meta.function.json.arrow.js",
-          "begin": "(?<=^|{|,)\\s*+(\\b[_$a-zA-Z][$\\w]*)\\s*+(:)\\s*+(\\basync\\b)?\\s*+(?=(<(?:(?>[^<>]+)|\\g<-1>)*>)?\\s*+([_$a-zA-Z][$\\w]*)\\s*+(?:\\s*:(\\s*+(&|\\|)?(\\s*+[$_a-zA-Z0-9]+(<(?:(?>[^<>]+)|\\g<-1>)*>)?|\\s*+(\\{(?:(?>[^{}]+)|\\g<-1>)*\\})|\\s*+(\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])|\\s*+(\\s*([\"']).*?\\k<-1>(?<!\\\\.))|\\s*[x0-9A-Fa-f]+))*+)*\\s*=>)",
+          "begin": "(?<=^|{|,)\\s*+(\\b[_$a-zA-Z][$\\w]*)\\s*+(:)\\s*+(\\basync\\b)?\\s*+(?=(<(?:(?>[^<>]+)|\\g<-1>)*>)?\\s*+([_$a-zA-Z][$\\w]*)\\s*+(((?::(?:(\\s*+(&|\\|)?(\\s*+[$_a-zA-Z0-9]+(<(?:(?>[^<>]+)|\\g<-1>)*>)?|\\s*+({(?:(?>[^{}]+)|\\g<-1>)*\\})|\\s*+(\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])|\\s*+(\\s*([\"']).*?\\k<-1>(?<!\\\\.))|\\s*[x0-9A-Fa-f]+))|(?:\\s*+/\\*.*?\\*/))*+)*)|(?:/\\*.*?\\*/))\\s*=>)",
           "end": "\\s*(=>)",
           "beginCaptures": {
             "1": {
@@ -283,7 +284,7 @@
         {
           "comment": "e.g. 'play': (args) => { }",
           "name": "meta.function.json.arrow.js",
-          "begin": "(?<=^|{|,)\\s*+(('|\\\")([^\"']*)(\\k<-3>))\\s*(:)\\s*+(\\basync\\b)?\\s*+(?=(<(?:(?>[^<>]+)|\\g<-1>)*>)?\\s*+(\\((?:(?>[^()]+)|\\g<-1>)*\\))\\s*+(?:\\s*:(\\s*+(&|\\|)?(\\s*+[$_a-zA-Z0-9]+(<(?:(?>[^<>]+)|\\g<-1>)*>)?|\\s*+(\\{(?:(?>[^{}]+)|\\g<-1>)*\\})|\\s*+(\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])|\\s*+(\\s*([\"']).*?\\k<-1>(?<!\\\\.))|\\s*[x0-9A-Fa-f]+))*+)*\\s*=>)",
+          "begin": "(?<=^|{|,)\\s*+(('|\")([^\"']*)(\\k<-3>))\\s*(:)\\s*+(\\basync\\b)?\\s*+(?=(<(?:(?>[^<>]+)|\\g<-1>)*>)?\\s*+(\\((?:(?>[^()]+)|\\g<-1>)*\\))\\s*+(((?::(?:(\\s*+(&|\\|)?(\\s*+[$_a-zA-Z0-9]+(<(?:(?>[^<>]+)|\\g<-1>)*>)?|\\s*+({(?:(?>[^{}]+)|\\g<-1>)*\\})|\\s*+(\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])|\\s*+(\\s*([\"']).*?\\k<-1>(?<!\\\\.))|\\s*[x0-9A-Fa-f]+))|(?:\\s*+/\\*.*?\\*/))*+)*)|(?:/\\*.*?\\*/))(((?<=checks)|(\\s*\\bchecks))\\b\\s*(\\((?:(?>[^()]+)|\\g<-1>)*\\))?)?\\s*=>)",
           "end": "\\s*(=>)",
           "applyEndPatternLast": 1,
           "endCaptures": {
@@ -320,7 +321,7 @@
         {
           "comment": "e.g. 'play': arg => { }",
           "name": "meta.function.json.arrow.js",
-          "begin": "(?<=^|{|,)\\s*+(('|\\\")([^\"']*)(\\k<-3>))\\s*+(:)\\s*+(\\basync\\b)?\\s*+(?=(<(?:(?>[^<>]+)|\\g<-1>)*>)?\\s*+([_$a-zA-Z][$\\w]*)\\s*+(?:\\s*:(\\s*+(&|\\|)?(\\s*+[$_a-zA-Z0-9]+(<(?:(?>[^<>]+)|\\g<-1>)*>)?|\\s*+(\\{(?:(?>[^{}]+)|\\g<-1>)*\\})|\\s*+(\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])|\\s*+(\\s*([\"']).*?\\k<-1>(?<!\\\\.))|\\s*[x0-9A-Fa-f]+))*+)*\\s*=>)",
+          "begin": "(?<=^|{|,)\\s*+(('|\")([^\"']*)(\\k<-3>))\\s*+(:)\\s*+(\\basync\\b)?\\s*+(?=(<(?:(?>[^<>]+)|\\g<-1>)*>)?\\s*+([_$a-zA-Z][$\\w]*)\\s*+(((?::(?:(\\s*+(&|\\|)?(\\s*+[$_a-zA-Z0-9]+(<(?:(?>[^<>]+)|\\g<-1>)*>)?|\\s*+({(?:(?>[^{}]+)|\\g<-1>)*\\})|\\s*+(\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])|\\s*+(\\s*([\"']).*?\\k<-1>(?<!\\\\.))|\\s*[x0-9A-Fa-f]+))|(?:\\s*+/\\*.*?\\*/))*+)*)|(?:/\\*.*?\\*/))\\s*=>)",
           "end": "\\s*(=>)",
           "beginCaptures": {
             "1": {
@@ -362,7 +363,7 @@
       "patterns": [
         {
           "comment": "string as a property name",
-          "match": "\\s*+(?<!\\.|\\?|\\?\\s|\\?\\s\\s)(((\\\")(\\\\.|[^\\\\\"])*(\\\"))|((')(\\\\.|[^\\\\'])*(')))\\s*+(:)",
+          "match": "\\s*+(?<!\\.|\\?|\\?\\s|\\?\\s\\s)(((\")(\\\\.|[^\\\\\"])*(\"))|((')(\\\\.|[^\\\\'])*(')))\\s*+(:)",
           "captures": {
             "1": {
               "name": "constant.other.object.key.js"
@@ -433,7 +434,6 @@
           "include": "#literal-keyword-storage"
         },
         {
-          "name": "keyword.control.flow.js",
           "match": "\\s*+(?<!\\.)\\b(yield)\\b(?:\\s*+(\\*))?",
           "captures": {
             "1": {
@@ -445,20 +445,36 @@
           }
         },
         {
-          "name": "keyword.control.flow.js",
-          "match": "\\s*+(?<!\\.)\\b(await|return)\\b"
+          "match": "\\s*+(?<!\\.)\\b(await|return)\\b",
+          "captures": {
+            "1": {
+              "name": "keyword.control.flow.js"
+            }
+          }
         },
         {
-          "name": "keyword.control.conditional.js",
-          "match": "\\s*+(?<!\\.)\\b(if|else)\\b"
+          "match": "\\s*+(?<!\\.)\\b(if|else)\\b",
+          "captures": {
+            "1": {
+              "name": "keyword.control.conditional.js"
+            }
+          }
         },
         {
-          "name": "keyword.control.trycatch.js",
-          "match": "\\s*+(?<!\\.)\\b(catch|finally|throw|try)\\b"
+          "match": "\\s*+(?<!\\.)\\b(catch|finally|throw|try)\\b",
+          "captures": {
+            "1": {
+              "name": "keyword.control.trycatch.js"
+            }
+          }
         },
         {
-          "name": "keyword.control.loop.js",
-          "match": "\\s*+(?<!\\.)\\b(break|continue|do|goto|while)\\b"
+          "match": "\\s*+(?<!\\.)\\b(break|continue|do|goto|while)\\b",
+          "captures": {
+            "1": {
+              "name": "keyword.control.loop.js"
+            }
+          }
         }
       ]
     },
@@ -467,9 +483,9 @@
         {
           "name": "meta.for.js",
           "begin": "\\s*+(?<!\\.)\\b(for)\\b",
-          "end": "\\s*\\)",
+          "end": "\\s*(\\))",
           "endCaptures": {
-            "0": {
+            "1": {
               "name": "meta.brace.round.js"
             }
           },
@@ -480,10 +496,10 @@
           },
           "patterns": [
             {
-              "begin": "\\s*+\\(",
+              "begin": "\\s*+(\\()",
               "end": "\\s*(?=\\))",
               "beginCaptures": {
-                "0": {
+                "1": {
                   "name": "meta.brace.round.js"
                 }
               },
@@ -508,14 +524,14 @@
         {
           "name": "meta.switch.js",
           "begin": "\\s*+(?<!\\.)\\b(switch)\\b",
-          "end": "\\s*\\}",
+          "end": "\\s*(\\})",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.switch.js"
             }
           },
           "endCaptures": {
-            "0": {
+            "1": {
               "name": "meta.brace.curly.js"
             }
           },
@@ -524,10 +540,10 @@
               "include": "#round-brackets"
             },
             {
-              "begin": "\\s*+\\{",
+              "begin": "\\s*+({)",
               "end": "\\s*(?=})",
               "beginCaptures": {
-                "0": {
+                "1": {
                   "name": "meta.brace.curly.js"
                 }
               },
@@ -578,14 +594,14 @@
         {
           "comment": "try to avoid ternary operators which have a '? some chars :'",
           "begin": "(^|:|;|=|(?<=:|;|=))\\s*+(\\((?=((\"|').*?(?<=[^\\\\])\\k<-1>|[^?:])*(:|\\?\\s*+:)))",
-          "end": "\\s*\\)",
+          "end": "\\s*(\\))",
           "beginCaptures": {
             "2": {
               "name": "meta.brace.round.js"
             }
           },
           "endCaptures": {
-            "0": {
+            "1": {
               "name": "meta.brace.round.js"
             }
           },
@@ -599,15 +615,15 @@
           ]
         },
         {
-          "begin": "\\s*+\\(",
-          "end": "\\s*\\)",
+          "begin": "\\s*+(\\()",
+          "end": "\\s*(\\))",
           "endCaptures": {
-            "0": {
+            "1": {
               "name": "meta.brace.round.js"
             }
           },
           "beginCaptures": {
-            "0": {
+            "1": {
               "name": "meta.brace.round.js"
             }
           },
@@ -622,15 +638,15 @@
     "square-brackets": {
       "patterns": [
         {
-          "begin": "\\s*+\\[",
-          "end": "\\s*\\]",
+          "begin": "\\s*+(\\[)",
+          "end": "\\s*(\\])",
           "endCaptures": {
-            "0": {
+            "1": {
               "name": "meta.brace.square.js"
             }
           },
           "beginCaptures": {
-            "0": {
+            "1": {
               "name": "meta.brace.square.js"
             }
           },
@@ -645,15 +661,15 @@
     "curly-brackets": {
       "patterns": [
         {
-          "begin": "\\s*+\\{",
-          "end": "\\s*\\}",
+          "begin": "\\s*+({)",
+          "end": "\\s*(\\})",
           "endCaptures": {
-            "0": {
+            "1": {
               "name": "meta.brace.curly.js"
             }
           },
           "beginCaptures": {
-            "0": {
+            "1": {
               "name": "meta.brace.curly.js"
             }
           },
@@ -686,15 +702,21 @@
     },
     "comments": {
       "patterns": [
+        {
+          "include": "#flowtype-comments"
+        },
         {
           "include": "#special-comments-conditional-compilation"
         },
         {
-          "name": "comment.block.documentation.js",
-          "begin": "\\s*+/\\*\\*(?!/)",
-          "end": "\\s*\\*/",
+          "contentName": "comment.block.documentation.js",
+          "begin": "\\s*+((/\\*\\*))(?!/)",
+          "end": "(\\s*(\\*/))",
           "captures": {
-            "0": {
+            "1": {
+              "name": "comment.block.documentation.js"
+            },
+            "2": {
               "name": "punctuation.definition.comment.js"
             }
           },
@@ -705,32 +727,45 @@
           ]
         },
         {
-          "name": "comment.block.js",
-          "begin": "\\s*+/\\*",
-          "end": "\\s*\\*/",
+          "contentName": "comment.block.js",
+          "begin": "\\s*+((/\\*))",
+          "end": "(\\s*(\\*/))",
           "captures": {
-            "0": {
+            "1": {
+              "name": "comment.block.js"
+            },
+            "2": {
               "name": "punctuation.definition.comment.js"
             }
           }
         },
         {
-          "name": "comment.block.html.js",
-          "match": "\\s*+(<!--|-->)",
+          "match": "\\s*+((<!--|-->))",
           "captures": {
-            "0": {
+            "1": {
+              "name": "comment.block.html.js"
+            },
+            "2": {
               "name": "punctuation.definition.comment.js"
             }
           }
         },
         {
-          "name": "comment.line.double-slash.js",
-          "begin": "\\s*+(//)",
+          "contentName": "comment.line.double-slash.js",
+          "begin": "\\s*+((//))",
           "end": "\\s*$",
           "beginCaptures": {
             "1": {
+              "name": "comment.line.double-slash.js"
+            },
+            "2": {
               "name": "punctuation.definition.comment.js"
             }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "comment.line.double-slash.js"
+            }
           }
         },
         {
@@ -747,11 +782,14 @@
     "special-comments-conditional-compilation": {
       "patterns": [
         {
-          "name": "comment.block.conditional.js",
-          "begin": "\\s*+/\\*(?=@)",
+          "contentName": "comment.block.conditional.js",
+          "begin": "\\s*+((/\\*))(?=@)",
           "end": "\\s*\\*/",
           "captures": {
-            "0": {
+            "1": {
+              "name": "comment.block.conditional.js"
+            },
+            "2": {
               "name": "punctuation.definition.comment.js"
             }
           },
@@ -806,16 +844,24 @@
     "literal-semi-colon": {
       "patterns": [
         {
-          "name": "punctuation.terminator.statement.js",
-          "match": "\\s*+\\;"
+          "match": "\\s*+(;)",
+          "captures": {
+            "1": {
+              "name": "punctuation.terminator.statement.js"
+            }
+          }
         }
       ]
     },
     "literal-comma": {
       "patterns": [
         {
-          "name": "meta.delimiter.comma.js",
-          "match": "\\s*+,"
+          "match": "\\s*+(,)",
+          "captures": {
+            "1": {
+              "name": "meta.delimiter.comma.js"
+            }
+          }
         }
       ]
     },
@@ -823,7 +869,7 @@
       "patterns": [
         {
           "begin": "\\s*+(?<!\\.)\\b(const|let|var)\\b",
-          "end": "\\s*(?=\\;|\\b(if|switch|try|var|let|const|static|function|return|class|do|for|while|debugger|export|import|yield|type|declare|interface)\\b|\\)|})",
+          "end": "\\s*(?=;|\\b(if|switch|try|var|let|const|static|function|return|class|do|for|while|debugger|export|import|yield|type|declare|interface)\\b|\\)|})",
           "beginCaptures": {
             "1": {
               "name": "storage.type.js"
@@ -833,7 +879,7 @@
             {
               "comment": "other variables",
               "begin": "\\s*",
-              "end": "\\s*((,)|(?=(\\;)|\\b(if|switch|try|var|let|const|static|function|return|class|do|for|while|debugger|export|import|yield|type|declare|interface)\\b|\\)|}))",
+              "end": "\\s*((,)|(?=(;)|\\b(if|switch|try|var|let|const|static|function|return|class|do|for|while|debugger|export|import|yield|type|declare|interface)\\b|\\)|}))",
               "endCaptures": {
                 "2": {
                   "name": "punctuation.terminator.statement.js"
@@ -855,7 +901,7 @@
           "comment": "e.g. function play<T>(arg1, arg2) { }",
           "name": "meta.function.js",
           "begin": "\\s*+(?:\\b(async)\\b\\s+)?\\s*+(?:(?<=\\.\\.\\.)|(?<!\\.))(\\bfunction\\b)\\s*+(\\*?)\\s*+([_$a-zA-Z][$\\w]*)?\\s*+(?=\\(|<)",
-          "end": "\\s*(?=\\;|{|\\b(if|switch|try|var|let|const|static|function|return|class|do|for|while|debugger|export|import|yield|type|declare|interface)\\b|\\)|})",
+          "end": "\\s*(?=;|{|\\b(if|switch|try|var|let|const|static|function|return|class|do|for|while|debugger|export|import|yield|type|declare|interface)\\b|\\)|})",
           "applyEndPatternLast": 1,
           "beginCaptures": {
             "1": {
@@ -881,7 +927,7 @@
           "comment": "e.g. play = function(arg1, arg2) { }",
           "name": "meta.function.js",
           "begin": "\\s*+(\\b[_$a-zA-Z][$\\w]*)\\s*+(=)\\s*+(?:(async)\\s+)?\\s*+((?<!\\.)\\bfunction\\b)\\s*+(\\*?)\\s*+([_$a-zA-Z][$\\w]*)?\\s*+(?=\\(|<)",
-          "end": "\\s*(?=\\;|{|\\b(if|switch|try|var|let|const|static|function|return|class|do|for|while|debugger|export|import|yield|type|declare|interface)\\b|\\)|})",
+          "end": "\\s*(?=;|{|\\b(if|switch|try|var|let|const|static|function|return|class|do|for|while|debugger|export|import|yield|type|declare|interface)\\b|\\)|})",
           "applyEndPatternLast": 1,
           "beginCaptures": {
             "1": {
@@ -913,7 +959,7 @@
           "comment": "e.g. Sound.prototype.play = function(arg1, arg2) { }",
           "name": "meta.prototype.function.js",
           "begin": "\\s*+(\\b_?[A-Z][$\\w]*)?(\\.)(prototype)(\\.)([_$a-zA-Z][$\\w]*)\\s*+(=)\\s*+(?:(async)\\s+)?\\s*+((?<!\\.)\\bfunction\\b)\\s*+(\\*?)\\s*+([_$a-zA-Z][$\\w]*)?\\s*+(?=\\(|<)",
-          "end": "\\s*(?=\\;|{|\\b(if|switch|try|var|let|const|static|function|return|class|do|for|while|debugger|export|import|yield|type|declare|interface)\\b|\\)|})",
+          "end": "\\s*(?=;|{|\\b(if|switch|try|var|let|const|static|function|return|class|do|for|while|debugger|export|import|yield|type|declare|interface)\\b|\\)|})",
           "applyEndPatternLast": 1,
           "beginCaptures": {
             "1": {
@@ -957,7 +1003,7 @@
           "comment": "e.g. Sound.play = function(arg1, arg2) { }",
           "name": "meta.function.static.js",
           "begin": "\\s*+(\\b_?[A-Z][$\\w]*)?(\\.)([_$a-zA-Z][$\\w]*)\\s*+(=)\\s*+(?:(async)\\s+)?\\s*+((?<!\\.)\\bfunction\\b)\\s*+(\\*?)\\s*+([_$a-zA-Z][$\\w]*)?\\s*+(?=\\(|<)",
-          "end": "\\s*(?=\\;|{|\\b(if|switch|try|var|let|const|static|function|return|class|do|for|while|debugger|export|import|yield|type|declare|interface)\\b|\\)|})",
+          "end": "\\s*(?=;|{|\\b(if|switch|try|var|let|const|static|function|return|class|do|for|while|debugger|export|import|yield|type|declare|interface)\\b|\\)|})",
           "applyEndPatternLast": 1,
           "beginCaptures": {
             "1": {
@@ -1077,6 +1123,9 @@
             }
           },
           "patterns": [
+            {
+              "include": "#html-template"
+            },
             {
               "include": "#literal-function-labels"
             },
@@ -1105,36 +1154,71 @@
     "literal-operators": {
       "patterns": [
         {
-          "name": "keyword.operator.js",
-          "match": "\\s*+(?<!\\.)\\b(delete|in|instanceof|new|of|typeof|void|with)\\b"
+          "include": "#es7-function-bind"
+        },
+        {
+          "match": "\\s*+(?<!\\.)\\b(delete|in|instanceof|new|of|typeof|void|with)\\b",
+          "captures": {
+            "1": {
+              "name": "keyword.operator.js"
+            }
+          }
         },
         {
-          "name": "keyword.operator.logical.js",
-          "match": "\\s*+(!(?!=)|&&|\\|\\|)"
+          "match": "\\s*+(!(?!=)|&&|\\|\\|)",
+          "captures": {
+            "1": {
+              "name": "keyword.operator.logical.js"
+            }
+          }
         },
         {
-          "name": "keyword.operator.assignment.js",
-          "match": "\\s*+(=(?!(=|>)))"
+          "match": "\\s*+(=(?!(=|>)))",
+          "captures": {
+            "1": {
+              "name": "keyword.operator.assignment.js"
+            }
+          }
         },
         {
-          "name": "keyword.operator.assignment.augmented.js",
-          "match": "\\s*+(%=|&=|\\*=|\\+=|-=|/=|\\^=|\\|=|<<=|>>=|>>>=)"
+          "match": "\\s*+(%=|&=|\\*=|\\+=|-=|/=|\\^=|\\|=|<<=|>>=|>>>=)",
+          "captures": {
+            "1": {
+              "name": "keyword.operator.assignment.augmented.js"
+            }
+          }
         },
         {
-          "name": "keyword.operator.bitwise.js",
-          "match": "\\s*+(~|<<|>>>|>>|&|\\^|\\|)"
+          "match": "\\s*+(~|<<|>>>|>>|&|\\^|\\|)",
+          "captures": {
+            "1": {
+              "name": "keyword.operator.bitwise.js"
+            }
+          }
         },
         {
-          "name": "keyword.operator.relational.js",
-          "match": "\\s*+(<=|>=|<|>)"
+          "match": "\\s*+(<=|>=|<|>)",
+          "captures": {
+            "1": {
+              "name": "keyword.operator.relational.js"
+            }
+          }
         },
         {
-          "name": "keyword.operator.comparison.js",
-          "match": "\\s*+(===|!==|==|!=)"
+          "match": "\\s*+(===|!==|==|!=)",
+          "captures": {
+            "1": {
+              "name": "keyword.operator.comparison.js"
+            }
+          }
         },
         {
-          "name": "keyword.operator.arithmetic.js",
-          "match": "\\s*+(--|\\+\\+|/(?!/|\\*)|%|\\*(?<!/\\*)|\\+|-)"
+          "match": "\\s*+(--|\\+\\+|/(?!/|\\*)|%|\\*(?<!/\\*)|\\+|-)",
+          "captures": {
+            "1": {
+              "name": "keyword.operator.arithmetic.js"
+            }
+          }
         },
         {
           "comment": "ternary operator - make sure end : is consumed to avoid mistake as flow type",
@@ -1157,8 +1241,12 @@
           ]
         },
         {
-          "name": "keyword.operator.spread.js",
-          "match": "\\s*+(?<!\\.)\\.\\.\\."
+          "match": "\\s*+(?<!\\.)(\\.\\.\\.)",
+          "captures": {
+            "1": {
+              "name": "keyword.operator.spread.js"
+            }
+          }
         },
         {
           "name": "keyword.operator.accessor.js",
@@ -1252,56 +1340,84 @@
     "literal-language-constant": {
       "patterns": [
         {
-          "name": "constant.language.boolean.true.js",
-          "match": "\\s*+(?<!\\.)\\btrue\\b"
-        },
-        {
-          "name": "constant.language.boolean.false.js",
-          "match": "\\s*+(?<!\\.)\\bfalse\\b"
-        },
-        {
-          "name": "constant.language.null.js",
-          "match": "\\s*+(?<!\\.)\\bnull\\b"
-        },
-        {
-          "name": "constant.language.undefined.js",
-          "match": "\\s*+(?<!\\.)\\bundefined\\b"
-        },
-        {
-          "name": "constant.language.nan.js",
-          "match": "\\s*+(?<!\\.)\\bNaN\\b"
+          "match": "\\s*+(?<!\\.)\\b((true)|(false)|(null)|(undefined)|(NaN))\\b",
+          "captures": {
+            "2": {
+              "name": "constant.language.boolean.true.js"
+            },
+            "3": {
+              "name": "constant.language.boolean.false.js"
+            },
+            "4": {
+              "name": "constant.language.null.js"
+            },
+            "5": {
+              "name": "constant.language.undefined.js"
+            },
+            "6": {
+              "name": "constant.language.nan.js"
+            }
+          }
         }
       ]
     },
     "support": {
       "patterns": [
         {
-          "name": "support.class.builtin.js",
-          "match": "\\s*+\\b(Array|ArrayBuffer|Boolean|DataView|Date|Float(32|64)Array|Int(8|16|32)Array|Function|GeneratorFunction|Map|Math|Number|Object|Promise|Proxy|RegExp|Set|String|Uint(8|16|32)Array|Uint8ClampedArray|WeakMap|WeakSet)\\b"
+          "match": "\\s*+\\b(Array|ArrayBuffer|Boolean|DataView|Date|Float(32|64)Array|Int(8|16|32)Array|Function|GeneratorFunction|Map|Math|Number|Object|Promise|Proxy|RegExp|Set|String|Uint(8|16|32)Array|Uint8ClampedArray|WeakMap|WeakSet)\\b",
+          "captures": {
+            "1": {
+              "name": "support.class.builtin.js"
+            }
+          }
         },
         {
-          "name": "support.function.js",
-          "match": "\\s*+(?<!\\.)\\b(decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|escape|eval|isFinite|isNaN|parseFloat|parseInt|unescape)\\b"
+          "match": "\\s*+(?<!\\.)\\b(decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|escape|eval|isFinite|isNaN|parseFloat|parseInt|unescape)\\b",
+          "captures": {
+            "1": {
+              "name": "support.function.js"
+            }
+          }
         },
         {
-          "name": "support.function.mutator.js",
-          "match": "(?<=\\.)(shift|sort|splice|unshift|pop|push|reverse)\\b"
+          "match": "(?<=\\.)(shift|sort|splice|unshift|pop|push|reverse)\\b",
+          "captures": {
+            "1": {
+              "name": "support.function.mutator.js"
+            }
+          }
         },
         {
-          "name": "support.class.error.js",
-          "match": "\\s*+(?<!\\.)\\b((Eval|Range|Reference|Syntax|Type|URI)?Error)\\b"
+          "match": "\\s*+(?<!\\.)\\b((Eval|Range|Reference|Syntax|Type|URI)?Error)\\b",
+          "captures": {
+            "1": {
+              "name": "support.class.error.js"
+            }
+          }
         },
         {
-          "name": "keyword.other.js",
-          "match": "\\s*+(?<!\\.)\\b(debugger)\\b"
+          "match": "\\s*+(?<!\\.)\\b(debugger)\\b",
+          "captures": {
+            "1": {
+              "name": "keyword.other.js"
+            }
+          }
         },
         {
-          "name": "support.type.object.dom.js",
-          "match": "\\s*+(?<!\\.)\\b(document|window)\\b"
+          "match": "\\s*+(?<!\\.)\\b(document|window)\\b",
+          "captures": {
+            "1": {
+              "name": "support.type.object.dom.js"
+            }
+          }
         },
         {
-          "name": "support.constant.dom.js",
-          "match": "\\s*+\\b(ELEMENT_NODE|ATTRIBUTE_NODE|TEXT_NODE|CDATA_SECTION_NODE|ENTITY_REFERENCE_NODE|ENTITY_NODE|PROCESSING_INSTRUCTION_NODE|COMMENT_NODE|DOCUMENT_NODE|DOCUMENT_TYPE_NODE|DOCUMENT_FRAGMENT_NODE|NOTATION_NODE|INDEX_SIZE_ERR|DOMSTRING_SIZE_ERR|HIERARCHY_REQUEST_ERR|WRONG_DOCUMENT_ERR|INVALID_CHARACTER_ERR|NO_DATA_ALLOWED_ERR|NO_MODIFICATION_ALLOWED_ERR|NOT_FOUND_ERR|NOT_SUPPORTED_ERR|INUSE_ATTRIBUTE_ERR)\\b"
+          "match": "\\s*+\\b(ELEMENT_NODE|ATTRIBUTE_NODE|TEXT_NODE|CDATA_SECTION_NODE|ENTITY_REFERENCE_NODE|ENTITY_NODE|PROCESSING_INSTRUCTION_NODE|COMMENT_NODE|DOCUMENT_NODE|DOCUMENT_TYPE_NODE|DOCUMENT_FRAGMENT_NODE|NOTATION_NODE|INDEX_SIZE_ERR|DOMSTRING_SIZE_ERR|HIERARCHY_REQUEST_ERR|WRONG_DOCUMENT_ERR|INVALID_CHARACTER_ERR|NO_DATA_ALLOWED_ERR|NO_MODIFICATION_ALLOWED_ERR|NOT_FOUND_ERR|NOT_SUPPORTED_ERR|INUSE_ATTRIBUTE_ERR)\\b",
+          "captures": {
+            "1": {
+              "name": "support.constant.dom.js"
+            }
+          }
         },
         {
           "match": "\\s*+(?<!\\.)\\b(console)(?:(\\.)(warn|info|log|error|time|timeEnd|assert))?\\b",
@@ -1360,17 +1476,30 @@
           }
         },
         {
-          "name": "support.type.object.node.js",
-          "match": "\\s*+(?<!\\.)\\b(global|GLOBAL|root|__dirname|__filename)\\b"
+          "match": "\\s*+(?<!\\.)\\b(global|GLOBAL|root|__dirname|__filename)\\b",
+          "captures": {
+            "1": {
+              "name": "support.type.object.node.js"
+            }
+          }
         },
         {
-          "name": "support.class.node.js",
-          "match": "\\s*+\\b(Buffer|EventEmitter|Server|Pipe|Socket|REPLServer|ReadStream|WriteStream|Stream|Inflate|Deflate|InflateRaw|DeflateRaw|GZip|GUnzip|Unzip|Zip)\\b"
+          "match": "\\s*+\\b(Buffer|EventEmitter|Server|Pipe|Socket|REPLServer|ReadStream|WriteStream|Stream|Inflate|Deflate|InflateRaw|DeflateRaw|GZip|GUnzip|Unzip|Zip)\\b",
+          "captures": {
+            "1": {
+              "name": "support.class.node.js"
+            }
+          }
         },
         {
-          "name": "meta.tag.mustache.js",
-          "begin": "\\s*+{{",
-          "end": "\\s*}}"
+          "contentName": "meta.tag.mustache.js",
+          "begin": "\\s*+({{)",
+          "end": "(\\s*}})",
+          "captures": {
+            "1": {
+              "name": "meta.tag.mustache.js"
+            }
+          }
         }
       ]
     },
@@ -1378,24 +1507,24 @@
       "patterns": [
         {
           "comment": "Classes",
-          "begin": "\\s*+(?<!\\.)\\b(class)\\s+",
+          "begin": "\\s*+(?<!\\.)\\b((class))\\s+",
           "end": "\\s*(?<=})",
           "beginCaptures": {
-            "0": {
+            "1": {
               "name": "meta.class.js"
             },
-            "1": {
+            "2": {
               "name": "storage.type.class.js"
             }
           },
           "patterns": [
             {
-              "match": "\\s*+\\b(extends)\\b\\s*+",
+              "match": "\\s*+\\b((extends))\\b\\s*+",
               "captures": {
-                "0": {
+                "1": {
                   "name": "meta.class.extends.js"
                 },
-                "1": {
+                "2": {
                   "name": "storage.type.extends.js"
                 }
               }
@@ -1403,17 +1532,21 @@
             {
               "comment": "look for classes names but dont assume uppercase start char",
               "match": "(?<!\\.)\\s*+([$_\\p{L}](?:[$\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}])*+)",
-              "name": "entity.name.class.js"
+              "captures": {
+                "1": {
+                  "name": "entity.name.class.js"
+                }
+              }
             },
             {
               "include": "#flowtype-polymorphs"
             },
             {
-              "begin": "\\s*+{",
+              "begin": "\\s*+({)",
               "end": "\\s*(})",
               "contentName": "meta.class.body.js",
               "beginCaptures": {
-                "0": {
+                "1": {
                   "name": "punctuation.section.class.begin.js"
                 }
               },
@@ -1468,8 +1601,12 @@
           ]
         },
         {
-          "match": "\\s*+\\b(?<!\\.)static\\b(?!\\.)",
-          "name": "storage.modifier.js"
+          "match": "\\s*+(?<!\\.)\\b(static)\\b(?!\\.)",
+          "captures": {
+            "1": {
+              "name": "storage.modifier.js"
+            }
+          }
         },
         {
           "include": "#flowtype-variable"
@@ -1555,32 +1692,60 @@
     "literal-language-variable": {
       "patterns": [
         {
-          "name": "variable.language.arguments.js",
-          "match": "\\s*+(?<!(?<!\\.\\.)\\.)\\b(arguments)\\b"
+          "match": "\\s*+(?<!(?<!\\.\\.)\\.)\\b(arguments)\\b",
+          "captures": {
+            "1": {
+              "name": "variable.language.arguments.js"
+            }
+          }
         },
         {
-          "name": "variable.language.super.js",
-          "match": "\\s*+(?<!(?<!\\.\\.)\\.)\\b(super)\\b\\s*+(?!\\()"
+          "match": "\\s*+(?<!(?<!\\.\\.)\\.)\\b(super)\\b\\s*+(?!\\()",
+          "captures": {
+            "1": {
+              "name": "variable.language.super.js"
+            }
+          }
         },
         {
-          "name": "variable.language.this.js",
-          "match": "\\s*+(?<!(?<!\\.\\.)\\.)\\b(this)\\b"
+          "match": "\\s*+(?<!(?<!\\.\\.)\\.)\\b(this)\\b",
+          "captures": {
+            "1": {
+              "name": "variable.language.this.js"
+            }
+          }
         },
         {
-          "name": "variable.language.self.js",
-          "match": "\\s*+(?<!(?<!\\.\\.)\\.)\\b(self)\\b\\s*+(?!\\()"
+          "match": "\\s*+(?<!(?<!\\.\\.)\\.)\\b(self)\\b\\s*+(?!\\()",
+          "captures": {
+            "1": {
+              "name": "variable.language.self.js"
+            }
+          }
         },
         {
-          "name": "variable.language.proto.js",
-          "match": "\\s*+(?<=\\.)\\b(__proto__)\\b"
+          "match": "\\s*+(?<=\\.)\\b(__proto__)\\b",
+          "captures": {
+            "1": {
+              "name": "variable.language.proto.js"
+            }
+          }
         },
         {
-          "name": "variable.language.constructor.js",
-          "match": "\\s*+(?<=\\.)\\b(constructor)\\b\\s*+(?!\\()"
+          "match": "\\s*+(?<=\\.)\\b(constructor)\\b\\s*+(?!\\()",
+          "captures": {
+            "1": {
+              "name": "variable.language.constructor.js"
+            }
+          }
         },
         {
-          "name": "variable.language.prototype.js",
-          "match": "\\s*+(?<=\\.)\\b(prototype)\\b"
+          "match": "\\s*+(?<=\\.)\\b(prototype)\\b",
+          "captures": {
+            "1": {
+              "name": "variable.language.prototype.js"
+            }
+          }
         }
       ]
     },
@@ -1596,7 +1761,7 @@
         },
         {
           "name": "constant.character.escape",
-          "match": "\\\\u((\\{[0-9a-fA-F]+\\})|[0-9a-fA-F]{4})"
+          "match": "\\\\u(({[0-9a-fA-F]+\\})|[0-9a-fA-F]{4})"
         },
         {
           "name": "constant.character.escape",
@@ -1657,7 +1822,7 @@
         {
           "comment": "e.g. (args) => { }",
           "name": "meta.function.arrow.js",
-          "begin": "\\s*+(\\basync\\b)?\\s*+(?=(<(?:(?>[^<>]+)|\\g<-1>)*>)?\\s*+(\\((?:(?>[^()]+)|\\g<-1>)*\\))\\s*+(?:\\s*:(\\s*+(&|\\|)?(\\s*+[$_a-zA-Z0-9]+(<(?:(?>[^<>]+)|\\g<-1>)*>)?|\\s*+(\\{(?:(?>[^{}]+)|\\g<-1>)*\\})|\\s*+(\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])|\\s*+(\\s*([\"']).*?\\k<-1>(?<!\\\\.))|\\s*[x0-9A-Fa-f]+))*+)*\\s*=>)",
+          "begin": "\\s*+(\\basync\\b)?\\s*+(?=(<(?:(?>[^<>]+)|\\g<-1>)*>)?\\s*+(\\((?:(?>[^()]+)|\\g<-1>)*\\))\\s*+(((?::(?:(\\s*+(&|\\|)?(\\s*+[$_a-zA-Z0-9]+(<(?:(?>[^<>]+)|\\g<-1>)*>)?|\\s*+({(?:(?>[^{}]+)|\\g<-1>)*\\})|\\s*+(\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])|\\s*+(\\s*([\"']).*?\\k<-1>(?<!\\\\.))|\\s*[x0-9A-Fa-f]+))|(?:\\s*+/\\*.*?\\*/))*+)*)|(?:/\\*.*?\\*/))(((?<=checks)|(\\s*\\bchecks))\\b\\s*(\\((?:(?>[^()]+)|\\g<-1>)*\\))?)?\\s*=>)",
           "end": "\\s*(=>)",
           "applyEndPatternLast": 1,
           "endCaptures": {
@@ -1695,7 +1860,7 @@
         {
           "comment": "e.g. play = (args) => { }",
           "name": "meta.function.arrow.js",
-          "begin": "\\s*+(\\b[_$a-zA-Z][$\\w]*)\\s*+(=)\\s*+(\\basync\\b)?\\s*+(?=(<(?:(?>[^<>]+)|\\g<-1>)*>)?\\s*+(\\((?:(?>[^()]+)|\\g<-1>)*\\))\\s*+(?:\\s*:(\\s*+(&|\\|)?(\\s*+[$_a-zA-Z0-9]+(<(?:(?>[^<>]+)|\\g<-1>)*>)?|\\s*+(\\{(?:(?>[^{}]+)|\\g<-1>)*\\})|\\s*+(\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])|\\s*+(\\s*([\"']).*?\\k<-1>(?<!\\\\.))|\\s*[x0-9A-Fa-f]+))*+)*\\s*=>)",
+          "begin": "\\s*+(\\b[_$a-zA-Z][$\\w]*)\\s*+(=)\\s*+(\\basync\\b)?\\s*+(?=(<(?:(?>[^<>]+)|\\g<-1>)*>)?\\s*+(\\((?:(?>[^()]+)|\\g<-1>)*\\))\\s*+(((?::(?:(\\s*+(&|\\|)?(\\s*+[$_a-zA-Z0-9]+(<(?:(?>[^<>]+)|\\g<-1>)*>)?|\\s*+({(?:(?>[^{}]+)|\\g<-1>)*\\})|\\s*+(\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])|\\s*+(\\s*([\"']).*?\\k<-1>(?<!\\\\.))|\\s*[x0-9A-Fa-f]+))|(?:\\s*+/\\*.*?\\*/))*+)*)|(?:/\\*.*?\\*/))(((?<=checks)|(\\s*\\bchecks))\\b\\s*(\\((?:(?>[^()]+)|\\g<-1>)*\\))?)?\\s*=>)",
           "end": "\\s*(=>)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -1745,7 +1910,7 @@
         {
           "comment": "Sound.prototype.play = (args) => { }",
           "name": "meta.prototype.function.arrow.js",
-          "begin": "\\s*+(\\b[A-Z][$\\w]*)?(\\.)(prototype)(\\.)([_$a-zA-Z][$\\w]*)\\s*+(=)\\s*+(\\basync\\b)?\\s*+(?=(<(?:(?>[^<>]+)|\\g<-1>)*>)?\\s*+(\\((?:(?>[^()]+)|\\g<-1>)*\\))\\s*+(?:\\s*:(\\s*+(&|\\|)?(\\s*+[$_a-zA-Z0-9]+(<(?:(?>[^<>]+)|\\g<-1>)*>)?|\\s*+(\\{(?:(?>[^{}]+)|\\g<-1>)*\\})|\\s*+(\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])|\\s*+(\\s*([\"']).*?\\k<-1>(?<!\\\\.))|\\s*[x0-9A-Fa-f]+))*+)*\\s*=>)",
+          "begin": "\\s*+(\\b[A-Z][$\\w]*)?(\\.)(prototype)(\\.)([_$a-zA-Z][$\\w]*)\\s*+(=)\\s*+(\\basync\\b)?\\s*+(?=(<(?:(?>[^<>]+)|\\g<-1>)*>)?\\s*+(\\((?:(?>[^()]+)|\\g<-1>)*\\))\\s*+(((?::(?:(\\s*+(&|\\|)?(\\s*+[$_a-zA-Z0-9]+(<(?:(?>[^<>]+)|\\g<-1>)*>)?|\\s*+({(?:(?>[^{}]+)|\\g<-1>)*\\})|\\s*+(\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])|\\s*+(\\s*([\"']).*?\\k<-1>(?<!\\\\.))|\\s*[x0-9A-Fa-f]+))|(?:\\s*+/\\*.*?\\*/))*+)*)|(?:/\\*.*?\\*/))(((?<=checks)|(\\s*\\bchecks))\\b\\s*(\\((?:(?>[^()]+)|\\g<-1>)*\\))?)?\\s*=>)",
           "end": "\\s*(=>)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -1819,7 +1984,7 @@
         {
           "comment": "e.g. Sound.play = (args) => { }",
           "name": "meta.function.static.arrow.js",
-          "begin": "\\s*+(\\b_?[A-Z][$\\w]*)?(\\.)([_$a-zA-Z][$\\w]*)\\s*+(=)\\s*+(\\basync\\b)?\\s*+(?=(<(?:(?>[^<>]+)|\\g<-1>)*>)?\\s*+(\\((?:(?>[^()]+)|\\g<-1>)*\\))\\s*+(?:\\s*:(\\s*+(&|\\|)?(\\s*+[$_a-zA-Z0-9]+(<(?:(?>[^<>]+)|\\g<-1>)*>)?|\\s*+(\\{(?:(?>[^{}]+)|\\g<-1>)*\\})|\\s*+(\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])|\\s*+(\\s*([\"']).*?\\k<-1>(?<!\\\\.))|\\s*[x0-9A-Fa-f]+))*+)*\\s*=>)",
+          "begin": "\\s*+(\\b_?[A-Z][$\\w]*)?(\\.)([_$a-zA-Z][$\\w]*)\\s*+(=)\\s*+(\\basync\\b)?\\s*+(?=(<(?:(?>[^<>]+)|\\g<-1>)*>)?\\s*+(\\((?:(?>[^()]+)|\\g<-1>)*\\))\\s*+(((?::(?:(\\s*+(&|\\|)?(\\s*+[$_a-zA-Z0-9]+(<(?:(?>[^<>]+)|\\g<-1>)*>)?|\\s*+({(?:(?>[^{}]+)|\\g<-1>)*\\})|\\s*+(\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])|\\s*+(\\s*([\"']).*?\\k<-1>(?<!\\\\.))|\\s*[x0-9A-Fa-f]+))|(?:\\s*+/\\*.*?\\*/))*+)*)|(?:/\\*.*?\\*/))(((?<=checks)|(\\s*\\bchecks))\\b\\s*(\\((?:(?>[^()]+)|\\g<-1>)*\\))?)?\\s*=>)",
           "end": "\\s*(=>)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -1886,7 +2051,7 @@
         {
           "comment": "e.g. play<T,T>(arg1, arg2): Type<T> { }",
           "name": "meta.function.method.js",
-          "begin": "(?:^|;)\\s*+(\\bstatic\\b)?\\s*+(\\basync\\b)?\\s*+(\\*?)\\s*+(?<!\\.)(?!\\b(break|case|catch|continue|do|else|finally|for|function|if|export|import|package|return|switch|throw|try|while|with)\\b)([_$a-zA-Z][$\\w]*)\\s*+(?=(<(?:(?>[^<>]+)|\\g<-1>)*>)?(\\((?:(?>[^()]+)|\\g<-1>)*\\))\\s*+(?:\\s*:(\\s*+(&|\\|)?(\\s*+[$_a-zA-Z0-9]+(<(?:(?>[^<>]+)|\\g<-1>)*>)?|\\s*+(\\{(?:(?>[^{}]+)|\\g<-1>)*\\})|\\s*+(\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])|\\s*+(\\s*([\"']).*?\\k<-1>(?<!\\\\.))|\\s*[x0-9A-Fa-f]+))*+)*\\s*\\{)",
+          "begin": "(?:^|;)\\s*+(\\bstatic\\b)?\\s*+(\\basync\\b)?\\s*+(\\*?)\\s*+(?<!\\.)(?!\\b(break|case|catch|continue|do|else|finally|for|function|if|export|import|package|return|switch|throw|try|while|with)\\b)([_$a-zA-Z][$\\w]*)\\s*+(?=(<(?:(?>[^<>]+)|\\g<-1>)*>)?(\\((?:(?>[^()]+)|\\g<-1>)*\\))\\s*+(?:\\s*:(\\s*+(&|\\|)?(\\s*+[$_a-zA-Z0-9]+(<(?:(?>[^<>]+)|\\g<-1>)*>)?|\\s*+({(?:(?>[^{}]+)|\\g<-1>)*\\})|\\s*+(\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])|\\s*+(\\s*([\"']).*?\\k<-1>(?<!\\\\.))|\\s*[x0-9A-Fa-f]+))*+)*\\s*{)",
           "end": "\\s*(?=.)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -1942,7 +2107,7 @@
         {
           "comment": "e.g. 'play'<T,T>(arg1, arg2): Type<T> { }",
           "name": "meta.function.method.js",
-          "begin": "(?<!:)\\s*+(\\bstatic\\b)?\\s*+(\\basync\\b)?\\s*+(\\*?)\\s*+(?<!\\.)(('|\\\")([^\"']*)(\\k<-3>))\\s*+(?=(<(?:(?>[^<>]+)|\\g<-1>)*>)?(\\())",
+          "begin": "(?<!:)\\s*+(\\bstatic\\b)?\\s*+(\\basync\\b)?\\s*+(\\*?)\\s*+(?<!\\.)(('|\")([^\"']*)(\\k<-3>))\\s*+(?=(<(?:(?>[^<>]+)|\\g<-1>)*>)?(\\())",
           "end": "\\s*(?=.)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -2140,26 +2305,219 @@
     "literal-module": {
       "patterns": [
         {
-          "name": "keyword.control.module.js",
-          "match": "\\s*+(?<!\\.)\\b(import|export|default)\\b"
+          "include": "#literal-module-import"
         },
         {
-          "name": "keyword.control.module.reference.js",
-          "match": "\\s*+(?<!\\.)\\b(from|as)\\b"
+          "include": "#literal-module-export"
         }
       ]
     },
-    "literal-variable": {
-      "patterns": [
-        {
-          "comment": "e.g. CONSTANT",
-          "name": "variable.other.constant.js",
-          "match": "\\s*+[A-Z][_$\\dA-Z]*\\b"
+    "literal-module-import": {
+      "begin": "\\s*+(?<!\\.)\\b(import)(?!\\s*:)\\b",
+      "end": "\\s*(?:(?:(\\bfrom\\b)?+\\s++(('|\")([^\"']*)(\\k<-3>)))|(?=;|^\\s*\\b(if|switch|try|var|let|const|static|function|return|class|do|for|while|debugger|export|import|yield|type|declare|interface)\\b|\\)|}))",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.module.js"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "keyword.control.module.js"
         },
-        {
-          "comment": "e.g. dollar vars",
-          "name": "variable.other.dollar.js",
-          "match": "\\s*+\\$[$\\w]*"
+        "3": {
+          "name": "punctuation.definition.string.begin.js"
+        },
+        "4": {
+          "name": "string.quoted.module.js"
+        },
+        "5": {
+          "name": "punctuation.definition.string.begin.js"
+        }
+      },
+      "patterns": [
+        {
+          "match": "\\s*\\b(default)\\b",
+          "captures": {
+            "1": {
+              "name": "keyword.control.module.js"
+            }
+          }
+        },
+        {
+          "match": "\\s*\\b(typeof|type)\\b\\s++(?={|[$_a-zA-Z])(?!\\b(instanceof|in|as)\\b|,)",
+          "captures": {
+            "1": {
+              "name": "keyword.other.typedef.flowtype"
+            }
+          }
+        },
+        {
+          "name": "keyword.operator.module.all.js",
+          "match": "\\*"
+        },
+        {
+          "include": "#literal-module-as"
+        },
+        {
+          "include": "#literal-module-brackets"
+        },
+        {
+          "include": "#literal-variable"
+        },
+        {
+          "include": "#comments"
+        },
+        {
+          "include": "#literal-comma"
+        }
+      ]
+    },
+    "literal-module-export": {
+      "patterns": [
+        {
+          "comment": "e.g. export let variable =, export type a=",
+          "match": "\\s*+(?<!\\.)\\b(export)(?!\\s*:)\\b(?=\\s++(let|type|typeof)\\s++[$_a-zA-Z])",
+          "captures": {
+            "1": {
+              "name": "keyword.control.module.js"
+            }
+          }
+        },
+        {
+          "comment": "export {  or  export * or export var from module",
+          "begin": "\\s*+(?<!\\.)\\b(export)\\b(?=\\s++({|\\*|[$_a-zA-Z][$_\\w]*(\\s++from\\b|\\s*,)))",
+          "end": "\\s*(?:(?:(\\bfrom\\b)?+\\s++(('|\")([^\"']*)(\\k<-3>)))|(?=;|^\\s*\\b(if|switch|try|var|let|const|static|function|return|class|do|for|while|debugger|export|import|yield|type|declare|interface)\\b|\\)|}))",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.module.js"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "keyword.control.module.js"
+            },
+            "3": {
+              "name": "punctuation.definition.string.begin.js"
+            },
+            "4": {
+              "name": "string.quoted.module.js"
+            },
+            "5": {
+              "name": "punctuation.definition.string.begin.js"
+            }
+          },
+          "patterns": [
+            {
+              "name": "keyword.operator.module.all.js",
+              "match": "\\*"
+            },
+            {
+              "include": "#literal-module-as"
+            },
+            {
+              "include": "#literal-module-brackets"
+            },
+            {
+              "include": "#literal-variable"
+            },
+            {
+              "include": "#comments"
+            },
+            {
+              "include": "#literal-comma"
+            }
+          ]
+        },
+        {
+          "comment": "trap expressions among - export function* () {}",
+          "match": "\\s*+(?<!\\.)\\b(export|default)(?!\\s*:)\\b",
+          "captures": {
+            "1": {
+              "name": "keyword.control.module.js"
+            }
+          }
+        }
+      ]
+    },
+    "literal-module-as": {
+      "match": "\\s*+(?:(\\*)|([$_a-zA-Z][$_\\w]*))\\s++(\\bas\\b)\\s++(?:(\\bdefault\\b)|([$_a-zA-Z][$_\\w]*))",
+      "captures": {
+        "1": {
+          "name": "keyword.operator.module.all.js"
+        },
+        "2": {
+          "name": "variable.other.readwrite.js"
+        },
+        "3": {
+          "name": "keyword.control.module.reference.js"
+        },
+        "4": {
+          "name": "keyword.control.module.js"
+        },
+        "5": {
+          "name": "variable.other.readwrite.js"
+        }
+      }
+    },
+    "literal-module-brackets": {
+      "patterns": [
+        {
+          "begin": "\\s*+(?:({)|(\\[))",
+          "end": "\\s*(?:(\\})|(\\]))",
+          "beginCaptures": {
+            "1": {
+              "name": "meta.brace.curly.js"
+            },
+            "2": {
+              "name": "meta.brace.square.js"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "meta.brace.curly.js"
+            },
+            "2": {
+              "name": "meta.brace.square.js"
+            }
+          },
+          "patterns": [
+            {
+              "name": "keyword.operator.module.all.js",
+              "match": "\\*"
+            },
+            {
+              "include": "#literal-module-as"
+            },
+            {
+              "include": "#literal-module-brackets"
+            },
+            {
+              "include": "#literal-variable"
+            },
+            {
+              "include": "#literal-string"
+            },
+            {
+              "include": "#comments"
+            },
+            {
+              "include": "#literal-comma"
+            }
+          ]
+        }
+      ]
+    },
+    "literal-variable": {
+      "patterns": [
+        {
+          "comment": "e.g. CONSTANT",
+          "name": "variable.other.constant.js",
+          "match": "\\s*+[A-Z][_$\\dA-Z]*\\b"
+        },
+        {
+          "comment": "e.g. dollar vars",
+          "name": "variable.other.dollar.js",
+          "match": "\\s*+\\$[$\\w]*"
         },
         {
           "comment": "e.g. Class.property",
@@ -2256,11 +2614,24 @@
         }
       ]
     },
+    "es7-function-bind": {
+      "patterns": [
+        {
+          "comment": "https://github.com/zenparsing/es-function-bind#examples",
+          "match": "\\s*(::)",
+          "captures": {
+            "1": {
+              "name": "keyword.operator.accessor.js"
+            }
+          }
+        }
+      ]
+    },
     "jsx": {
       "comment": "Avoid < operator expressions as best we can using Zertosh's regex",
       "patterns": [
         {
-          "begin": "(?<=\\(|\\{|\\[|,|&&|\\|\\||\\?|:|=|=>|\\Wreturn|^return|\\Wdefault|^)\\s*+(?=<[$_\\p{L}])",
+          "begin": "(?<=\\(|{|\\[|,|&&|\\|\\||\\?|:|=|=>|\\Wreturn|^return|\\Wdefault|^)\\s*+(?=<[$_\\p{L}])",
           "end": "(?=.)",
           "applyEndPatternLast": 1,
           "patterns": [
@@ -2276,6 +2647,7 @@
         {
           "comment": "Tags that end > are trapped in #jsx-tag-termination",
           "name": "meta.tag.jsx",
+          "contentName": "JSXAttrs",
           "begin": "\\s*+(<)((\\p{Ll}[\\p{Ll}0-9]*)|((?:[$_\\p{L}\\p{Nl}][$_\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}-]*?:)?+(?:[$_\\p{L}\\p{Nl}](?:[$_\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}\\.-](?<!\\.\\.))*+)+))(?=[ />\\s])(?![:])(?<!\\.|:)",
           "end": "\\s*(?<=</)((\\4)|\\2)(>)|(/>)|((?<=</)[\\S ]*?)>",
           "beginCaptures": {
@@ -2321,6 +2693,7 @@
       "patterns": [
         {
           "comment": "uses non consuming search for </ in </tag>",
+          "contentName": "JSXNested",
           "begin": "(>)",
           "end": "(</)",
           "beginCaptures": {
@@ -2450,32 +2823,52 @@
       ]
     },
     "jsx-evaluated-code": {
-      "name": "meta.embedded.expression.js",
-      "begin": "{",
-      "end": "}",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.section.embedded.begin.jsx"
-        }
-      },
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.section.embedded.end.jsx"
-        }
-      },
-      "contentName": "source.js.jsx",
       "patterns": [
         {
-          "include": "#jsx-string-double-quoted"
-        },
-        {
-          "include": "#jsx-string-single-quoted"
-        },
-        {
-          "include": "#jsx-spread-attribute"
+          "name": "meta.embedded.expression.commented-out.jsx",
+          "contentName": "comment.embedded.jsx",
+          "begin": "^\\s*({/\\*)",
+          "end": "\\s*(\\*/})",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.section.embedded.begin.jsx"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.section.embedded.end.jsx"
+            }
+          }
         },
         {
-          "include": "#expression"
+          "name": "meta.embedded.expression.js",
+          "contentName": "source.js.jsx",
+          "begin": "{",
+          "end": "}",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.begin.jsx"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.end.jsx"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#jsx-string-double-quoted"
+            },
+            {
+              "include": "#jsx-string-single-quoted"
+            },
+            {
+              "include": "#jsx-spread-attribute"
+            },
+            {
+              "include": "#expression"
+            }
+          ]
         }
       ]
     },
@@ -2535,10 +2928,32 @@
             }
           },
           "patterns": [
+            {
+              "include": "#flowtype-predicate"
+            },
             {
               "include": "#flowtype-parse-types"
             }
           ]
+        },
+        {
+          "include": "#flowtype-predicate"
+        }
+      ]
+    },
+    "flowtype-predicate": {
+      "comment": "flow predicate checks",
+      "begin": "\\s*\\b(checks)\\b(?=(\\s*(\\((?:(?>[^()]+)|\\g<-1>)*\\))?)?\\s*(=>|{|;|$))",
+      "end": "(?=.)",
+      "applyEndPatternLast": 1,
+      "beginCaptures": {
+        "1": {
+          "name": "entity.name.function.predicate.flowtype"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#round-brackets"
         }
       ]
     },
@@ -2546,7 +2961,7 @@
       "patterns": [
         {
           "comment": "e.g. let a: ()=>null  =  function() {return null}",
-          "match": "(?<!\\.)\\s*+([$_\\p{L}](?:[$.\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}])*+)\\s*+(\\??)\\s*+(?=:\\s*(\\bFunction\\b|(\\((?:(?>[^()]+)|\\g<-1>)*\\))\\s*=>|\\(\\s*$))",
+          "match": "(?<!\\.)\\s*+([$_\\p{L}](?:[$.\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}])*+)\\s*+(\\??)\\s*+(?=:\\s*([$_\\p{L}](?:[$.\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}])*+)?\\s*(<(?:(?>[^<>]+)|\\g<-1>)*>)?\\s*(\\bFunction\\b|(\\((?:(?>[^()]+)|\\g<-1>)*\\))\\s*=>|\\(\\s*$))",
           "captures": {
             "1": {
               "name": "storage.type.function.js"
@@ -2580,18 +2995,30 @@
       "patterns": [
         {
           "comment": "flowtype optional arg/parameter e.g. protocol? : string",
-          "name": "punctuation.type.flowtype",
-          "match": "\\s*+\\?"
+          "match": "\\s*+(\\?)",
+          "captures": {
+            "1": {
+              "name": "punctuation.type.flowtype"
+            }
+          }
         },
         {
           "comment": "Type Unions |",
-          "name": "kewyword.operator.union.flowtype",
-          "match": "\\s*+\\|"
+          "match": "\\s*+(\\|)",
+          "captures": {
+            "1": {
+              "name": "kewyword.operator.union.flowtype"
+            }
+          }
         },
         {
           "comment": "intersection of types &",
-          "name": "kewyword.operator.intersection.flowtype",
-          "match": "\\s*+\\&"
+          "match": "\\s*+(\\&)",
+          "captures": {
+            "1": {
+              "name": "kewyword.operator.intersection.flowtype"
+            }
+          }
         },
         {
           "comment": "typed entity :",
@@ -2614,7 +3041,7 @@
         },
         {
           "comment": "An Iterator prefix?",
-          "match": "\\s*+@@"
+          "match": "\\s*+(@@)"
         },
         {
           "begin": "\\s*+(=>)",
@@ -2656,12 +3083,20 @@
       "patterns": [
         {
           "comment": "Maybe types",
-          "name": "keyword.operator.maybe.flowtype",
-          "match": "\\s*+\\?"
+          "match": "\\s*+(\\?)",
+          "captures": {
+            "1": {
+              "name": "keyword.operator.maybe.flowtype"
+            }
+          }
         },
         {
-          "name": "keyword.operator.flowtype",
-          "match": "\\s*+\\btypeof\\b\\s*+"
+          "match": "\\s*+\\b(typeof)\\b\\s*+",
+          "captures": {
+            "1": {
+              "name": "keyword.operator.flowtype"
+            }
+          }
         },
         {
           "comment": "primitive flowtypes",
@@ -2704,23 +3139,40 @@
         },
         {
           "comment": "Type Unions |",
-          "name": "kewyword.operator.union.flowtype",
-          "match": "\\s*+\\|"
+          "match": "\\s*+(\\|)",
+          "captures": {
+            "1": {
+              "name": "kewyword.operator.union.flowtype"
+            }
+          }
         },
         {
           "comment": "intersection of types &",
-          "name": "kewyword.operator.intersection.flowtype",
-          "match": "\\s*+\\&"
+          "match": "\\s*+(\\&)",
+          "captures": {
+            "1": {
+              "name": "kewyword.operator.intersection.flowtype"
+            }
+          }
         },
         {
           "comment": "as per React declares in flowtype github",
-          "name": "kewyword.operator.existential.flowtype",
-          "match": "\\s*+\\*"
+          "match": "\\s*+(\\*)",
+          "captures": {
+            "1": {
+              "name": "kewyword.operator.existential.flowtype"
+            }
+          }
         },
         {
           "comment": "types of type marker e.g. <T: number | string>",
           "name": "punctuation.type.flowtype",
-          "match": "\\s*+(:)"
+          "match": "\\s*+(:)",
+          "captures": {
+            "1": {
+              "name": "support.type.builtin.primitive.flowtype"
+            }
+          }
         },
         {
           "comment": "call back with a form  ) => type",
@@ -2768,6 +3220,9 @@
             }
           },
           "patterns": [
+            {
+              "include": "#flowtype-polymorphs"
+            },
             {
               "include": "#flowtype-variable"
             }
@@ -2847,7 +3302,7 @@
     },
     "flowtype-parse-objects": {
       "comment": "object literal flowtype  preceded by either => : | & ? symbols",
-      "begin": "(?<=:|\\||&|\\?|=>|<)\\s*+(\\{)",
+      "begin": "(?<=:|\\||&|\\?|=>|<)\\s*+({)",
       "end": "\\s*(\\})",
       "applyEndPatternLast": 1,
       "beginCaptures": {
@@ -2869,19 +3324,13 @@
     "flowtype-object-property": {
       "patterns": [
         {
-          "comment": "name of property which can be a string",
-          "match": "\\s*+(((\"|').*?(?<=[^\\\\])\\k<-1>)|([$_\\p{L}](?:[$.\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}])*+))\\s*+(\\??)\\s*+(?=:)",
-          "captures": {
-            "1": {
-              "name": "variable.other.property.flowtype"
-            },
-            "5": {
-              "name": "keyword.operator.optional.parameter.flowtype"
-            }
-          }
+          "include": "#literal-method"
         },
         {
-          "include": "#flowtype-vars-and-props"
+          "include": "#comments"
+        },
+        {
+          "include": "#flowtype-variable"
         }
       ]
     },
@@ -2909,13 +3358,10 @@
       "patterns": [
         {
           "comment": "type aliases for export but avoid type instaceof or type in operators",
-          "begin": "\\s*+(?:\\b(import|export))?\\b\\s*(type)\\b\\s*(?!(instanceof|in)\\b)(?=[$_A-Za-z{\\[])",
-          "end": "\\s*(\\;)|\\b(?=if|switch|try|var|let|const|static|function|return|class|do|for|while|debugger|export|import|yield|type|declare|interface)\\b",
+          "begin": "(?:^|\\s)\\s*+(type)\\b\\s+(?!(instanceof|in)\\b)(?=[$_A-Za-z{\\[])",
+          "end": "\\s*(;)|\\b(?=if|switch|try|var|let|const|static|function|return|class|do|for|while|debugger|export|import|yield|type|declare|interface)\\b",
           "beginCaptures": {
             "1": {
-              "name": "keyword.control.module.js"
-            },
-            "2": {
               "name": "keyword.other.typedef.flowtype"
             }
           },
@@ -2929,31 +3375,17 @@
               "match": "\\s*+="
             },
             {
-              "begin": "\\s*+{",
-              "end": "\\s*}",
+              "begin": "\\s*+({)",
+              "end": "\\s*(})",
               "applyEndPatternLast": 1,
-              "beginCaptures": {
-                "0": {
-                  "name": "meta.brace.curly.js"
-                }
-              },
-              "endCaptures": {
-                "0": {
+              "captures": {
+                "1": {
                   "name": "meta.brace.curly.js"
                 }
               },
               "patterns": [
                 {
-                  "include": "#flowtype"
-                },
-                {
-                  "include": "#flowtype-variable"
-                },
-                {
-                  "include": "#comments"
-                },
-                {
-                  "include": "#flowtype-function-name"
+                  "include": "#flowtype-object-property"
                 }
               ]
             },
@@ -2991,11 +3423,11 @@
           "include": "#flowtype-polymorphs"
         },
         {
-          "begin": "\\s*+{",
+          "begin": "\\s*+({)",
           "end": "\\s*(})",
           "contentName": "meta.class.body.js",
           "beginCaptures": {
-            "0": {
+            "1": {
               "name": "punctuation.section.class.begin.js"
             }
           },
@@ -3018,7 +3450,7 @@
     "flowtype-declare": {
       "patterns": [
         {
-          "match": "\\s*+(?<!\\.)\\b(declare)\\b\\s++(?=\\b(function|var|type|interface)\\s++)",
+          "match": "\\s*+(?<!\\.)\\b(declare)(?=\\s+(function|var|type|interface)\\b)",
           "captures": {
             "1": {
               "name": "keyword.other.declare.flowtype"
@@ -3048,6 +3480,9 @@
             }
           },
           "patterns": [
+            {
+              "include": "#flowtype-parse-objects"
+            },
             {
               "include": "#flowtype-parse-types"
             }
@@ -3072,7 +3507,11 @@
             {
               "comment": "look for module names but dont assume uppercase start char",
               "match": "(?<!\\.)\\s*+([$_\\p{L}](?:[$\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}])*+)",
-              "name": "entity.name.class.js"
+              "captures": {
+                "1": {
+                  "name": "entity.name.class.js"
+                }
+              }
             },
             {
               "comment": "look for module names in quoted string forms",
@@ -3150,14 +3589,18 @@
                   "name": "entity.name.class.js"
                 },
                 {
-                  "include": "#literal-coma"
+                  "include": "#literal-comma"
                 }
               ]
             },
             {
               "comment": "look for class names but dont assume uppercase start char",
               "match": "(?<!\\.)\\s*+([$_\\p{L}](?:[$\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}])*+)",
-              "name": "entity.name.class.js"
+              "captures": {
+                "1": {
+                  "name": "entity.name.class.js"
+                }
+              }
             },
             {
               "begin": "\\s*+({)",
@@ -3224,7 +3667,7 @@
     "flowtype-typecast": {
       "patterns": [
         {
-          "begin": "\\s*+:",
+          "begin": "\\s*+(:)",
           "end": "(?=\\s*+\\))",
           "patterns": [
             {
@@ -3234,6 +3677,106 @@
         }
       ]
     },
+    "flowtype-comments": {
+      "patterns": [
+        {
+          "begin": "\\s*+(/\\*)\\s*(::)",
+          "end": "\\s*(\\*/)",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.comment.js"
+            },
+            "2": {
+              "name": "punctuation.type.flowtype"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.comment.js"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#flowtype-comments-optional-parameter"
+            },
+            {
+              "include": "#literal-module"
+            },
+            {
+              "include": "#flowtype-keywords"
+            },
+            {
+              "include": "#flowtype-parse-types"
+            }
+          ]
+        },
+        {
+          "begin": "\\s*+(/\\*)\\s*(flow-include)\\b",
+          "end": "\\s*(\\*/)",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.comment.js"
+            },
+            "2": {
+              "name": "punctuation.definition.variable.flowtype"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.comment.js"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#flowtype-comments-optional-parameter"
+            },
+            {
+              "include": "#literal-module"
+            },
+            {
+              "include": "#flowtype-keywords"
+            },
+            {
+              "include": "#flowtype-parse-types"
+            }
+          ]
+        },
+        {
+          "begin": "\\s*+(/\\*)\\s*(:)",
+          "end": "\\s*(\\*/)",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.comment.js"
+            },
+            "2": {
+              "name": "punctuation.type.flowtype"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.comment.js"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#flowtype-parse-types"
+            }
+          ]
+        }
+      ]
+    },
+    "flowtype-comments-optional-parameter": {
+      "patterns": [
+        {
+          "match": "(?<=::|flow-include)\\s*(\\?)",
+          "captures": {
+            "1": {
+              "name": "keyword.operator.optional.parameter.flowtype"
+            }
+          }
+        }
+      ]
+    },
     "miscellaneous": {
       "comment": "trap miscellaneous stuff",
       "patterns": [
@@ -3247,6 +3790,55 @@
           }
         }
       ]
+    },
+    "html-template": {
+      "comment": "Assume object properties of template: `some html` contain html",
+      "begin": "(?:(?:^|(?<=,|{))\\s*\\b((template))\\b\\s*(:)\\s*(`))",
+      "end": "\\s*(`)",
+      "beginCaptures": {
+        "1": {
+          "name": "constant.other.object.key.js"
+        },
+        "2": {
+          "name": "string.unquoted.js"
+        },
+        "3": {
+          "name": "punctuation.separator.key-value.js"
+        },
+        "4": {
+          "name": "punctuation.definition.quasi.begin.js"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.quasi.end.js"
+        }
+      },
+      "patterns": [
+        {
+          "name": "entity.quasi.element.js",
+          "begin": "(?<!\\\\)\\${",
+          "end": "\\s*}",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.quasi.element.begin.js"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.quasi.element.end.js"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#expression"
+            }
+          ]
+        },
+        {
+          "include": "text.html.mustache"
+        }
+      ]
     }
   }
 }