github-linguist 4.8.9 → 4.8.10

data/grammars/source.graphql.json

@@ -11,6 +11,18 @@
     {
       "include": "#comment"
     },
+    {
+      "include": "#typeDef"
+    },
+    {
+      "include": "#typeDefImplements"
+    },
+    {
+      "include": "#unionOptions"
+    },
+    {
+      "include": "#directive"
+    },
     {
       "name": "meta.fragment",
       "comment": "a fragment definintion",
@@ -26,7 +38,7 @@
           "name": "keyword.operator"
         },
         "4": {
-          "name": "support.constant"
+          "name": "support.class"
         }
       }
     },
@@ -71,9 +83,20 @@
         }
       ]
     },
-    "variable": {
-      "name": "constant.other.symbol",
-      "match": "\\$[_A-Za-z][_0-9A-Za-z]*"
+    "variableDefinition": {
+      "match": "(\\$[_A-Za-z][_0-9A-Za-z]*)\\:\\s*([_A-Za-z][_0-9A-Za-z]*)",
+      "captures": {
+        "1": {
+          "name": "constant.other.symbol"
+        },
+        "2": {
+          "name": "support.class"
+        }
+      }
+    },
+    "variableUsage": {
+      "match": "\\$[_A-Za-z][_0-9A-Za-z]*",
+      "name": "constant.other.symbol"
     },
     "boolean": {
       "name": "constant.language.boolean",
@@ -85,15 +108,15 @@
     },
     "directive": {
       "name": "storage.modifier",
-      "match": "@[a-z]+"
+      "match": "@[_A-Za-z][_0-9A-Za-z]+"
     },
     "argument": {
       "name": "variable.parameter",
       "match": "[_A-Za-z][_0-9A-Za-z]*:"
     },
     "enum": {
-      "name": "support.constant.enum",
-      "match": "[_A-Za-z][_0-9A-Za-z]*"
+      "match": "([A-Z][A-Z_]+)",
+      "name": "support.constant.enum"
     },
     "fragmentSpread": {
       "match": "(\\.\\.\\.)\\s*([_A-Za-z][_0-9A-Za-z]*)\\s*(on\\s*)?([_A-Za-z][_0-9A-Za-z]*)?",
@@ -108,7 +131,7 @@
           "name": "keyword.operator"
         },
         "4": {
-          "name": "support.constant"
+          "name": "support.class"
         }
       }
     },
@@ -122,7 +145,7 @@
           "name": "keyword.operator"
         },
         "3": {
-          "name": "support.constant"
+          "name": "support.class"
         }
       }
     },
@@ -151,7 +174,10 @@
           "include": "#boolean"
         },
         {
-          "include": "#variable"
+          "include": "#variableDefinition"
+        },
+        {
+          "include": "#variableUsage"
         },
         {
           "include": "#number"
@@ -159,6 +185,9 @@
         {
           "include": "#enum"
         },
+        {
+          "include": "#directive"
+        },
         {
           "include": "#comment"
         }
@@ -202,6 +231,9 @@
         },
         {
           "include": "#builtInField"
+        },
+        {
+          "include": "#enum"
         }
       ]
     },
@@ -220,6 +252,39 @@
     "fieldAlias": {
       "match": "[_A-Za-z][_0-9A-Za-z]*:",
       "name": "variable.other.alias.graphql"
+    },
+    "typeDef": {
+      "match": "(type|interface|union|scalar|enum|input|directive|extend|schema)\\s+([_A-Za-z][_0-9A-Za-z]*)?",
+      "captures": {
+        "1": {
+          "name": "keyword.operator"
+        },
+        "2": {
+          "name": "support.class"
+        }
+      }
+    },
+    "typeDefImplements": {
+      "match": "(implements)\\s+([_A-Za-z][_0-9A-Za-z,\\s]*)",
+      "captures": {
+        "1": {
+          "name": "keyword.operator"
+        },
+        "2": {
+          "name": "support.class"
+        }
+      }
+    },
+    "unionOptions": {
+      "match": "(=|\\||on)\\s+([_A-Za-z][_0-9A-Za-z]*)",
+      "captures": {
+        "1": {
+          "name": "keyword.operator"
+        },
+        "2": {
+          "name": "support.class"
+        }
+      }
     }
   }
 }

data/grammars/source.js.json

@@ -1671,7 +1671,7 @@
           "name": "storage.type.class.jsdoc"
         },
         {
-          "match": "(?x)\n({(?:\\*|(?:\\?|\\!|\\.{3})?(?:\\([a-zA-Z_$][\\w$]*(?:[\\.|][a-zA-Z_$][\\w$]*)*\\)|[a-zA-Z_$][\\w$]*(?:[\\.|][a-zA-Z_$][\\w$]*)*)(?:\\[\\])?=?)})\n\\s+\n(\\[(?:[a-zA-Z_$]+(?:=[\\w][\\s\\w$]*)?)\\]|(?:[a-zA-Z_$][\\w$]*(?:[\\.|][a-zA-Z_$][\\w$]*)*))\n\\s+\n((?:(?!\\*\\/).)*)",
+          "match": "(?x)\n(?:(?<=@param)|(?<=@type))\n\\s+\n({(?:\n  \\* |                                        # {*} any type\n  \\? |                                        # {?} unknown type\n\n  (?:                                          # Check for a prefix\n    \\? |                                      # {?string} nullable type\n    !   |                                      # {!string} non-nullable type\n    \\.{3}                                     # {...string} variable number of parameters\n  )?\n\n  (?:\n    \\(                                        # Opening bracket of multiple types with parenthesis {(string|number)}\n      [a-zA-Z_$]+\n      (?:\n        (?:\n          [\\w$]*\n          (?:\\[\\])?                          # {(string[]|number)} type application, an array of strings or a number\n        ) |\n        <[\\w$]+(?:,\\s+[\\w$]+)*>             # {Array<string>} or {Object<string, number>} type application\n      )\n      (?:\n        [\\.|~]                                # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback\n        [a-zA-Z_$]+\n        (?:\n          (?:\n            [\\w$]*\n            (?:\\[\\])?                        # {(string|number[])} type application, a string or an array of numbers\n          ) |\n          <[\\w$]+(?:,\\s+[\\w$]+)*>           # {Array<string>} or {Object<string, number>} type application\n        )\n      )*\n    \\) |\n    [a-zA-Z_$]+\n    (?:\n      (?:\n        [\\w$]*\n        (?:\\[\\])?                            # {string[]|number} type application, an array of strings or a number\n      ) |\n      <[\\w$]+(?:,\\s+[\\w$]+)*>               # {Array<string>} or {Object<string, number>} type application\n    )\n    (?:\n      [\\.|~]                                  # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback\n      [a-zA-Z_$]+\n      (?:\n        [\\w$]* |\n        <[\\w$]+(?:,\\s+[\\w$]+)*>             # {Array<string>} or {Object<string, number>} type application\n      )\n    )*\n  )\n                                               # Check for suffix\n  (?:\\[\\])?                                  # {string[]} type application, an array of strings\n  =?                                           # {string=} optional parameter\n)})\n\\s+\n(\n  \\[                                          # [foo] optional parameter\n    \\s*\n    (?:\n      [a-zA-Z_$][\\w$]*\n      (?:\n        (?:\\[\\])?                            # Foo[].bar properties within an array\n        \\.                                    # Foo.Bar namespaced parameter\n        [a-zA-Z_$][\\w$]*\n      )*\n      (?:\n        \\s*\n        =                                      # [foo=bar] Default parameter value\n        \\s*\n        [\\w$\\s]*\n      )?\n    )\n    \\s*\n  \\] |\n  (?:\n    [a-zA-Z_$][\\w$]*\n    (?:\n      (?:\\[\\])?                              # Foo[].bar properties within an array\n      \\.                                      # Foo.Bar namespaced parameter\n      [a-zA-Z_$][\\w$]*\n    )*\n  )?\n)\n\\s+\n((?:(?!\\*\\/).)*)                             # The type description",
           "captures": {
             "0": {
               "name": "other.meta.jsdoc"
@@ -1688,7 +1688,7 @@
           }
         },
         {
-          "match": "(?x)\n(?:(?<=@returns)|(?<=@return))\n\\s+\n({(?:\\*|(?:\\?|\\!|\\.{3})?(?:\\([a-zA-Z_$][\\w$]*(?:[\\.|][a-zA-Z_$][\\w$]*)*\\)|[a-zA-Z_$][\\w$]*(?:[\\.|][a-zA-Z_$][\\w$]*)*)(?:\\[\\])?=?)})\n\\s+\n((?:(?!\\*\\/).)*)",
+          "match": "(?x)\n({(?:\n  \\* |                                        # {*} any type\n  \\? |                                        # {?} unknown type\n\n  (?:                                          # Check for a prefix\n    \\? |                                      # {?string} nullable type\n    !   |                                      # {!string} non-nullable type\n    \\.{3}                                     # {...string} variable number of parameters\n  )?\n\n  (?:\n    \\(                                        # Opening bracket of multiple types with parenthesis {(string|number)}\n      [a-zA-Z_$]+\n      (?:\n        [\\w$]* |\n        <[\\w$]+(?:,\\s+[\\w$]+)*>             # {Array<string>} or {Object<string, number>} type application\n      )\n      (?:\n        [\\.|~]                                # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback\n        [a-zA-Z_$]+\n        (?:\n          [\\w$]* |\n          <[\\w$]+(?:,\\s+[\\w$]+)*>           # {Array<string>} or {Object<string, number>} type application\n        )\n      )*\n    \\) |\n    [a-zA-Z_$]+\n    (?:\n      [\\w$]* |\n      <[\\w$]+(?:,\\s+[\\w$]+)*>               # {Array<string>} or {Object<string, number>} type application\n    )\n    (?:\n      [\\.|~]                                  # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback\n      [a-zA-Z_$]+\n      (?:\n        [\\w$]* |\n        <[\\w$]+(?:,\\s+[\\w$]+)*>             # {Array<string>} or {Object<string, number>} type application\n      )\n    )*\n  )\n                                               # Check for suffix\n  (?:\\[\\])?                                  # {string[]} type application, an array of strings\n  =?                                           # {string=} optional parameter\n)})\n\\s+\n((?:(?!\\*\\/).)*)                             # The type description",
           "captures": {
             "0": {
               "name": "other.meta.jsdoc"

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,8 +105,7 @@
           "include": "#literal-language-variable"
         },
         {
-          "include": "#literal-object",
-          "comment": "before literal-module as it traps default {"
+          "include": "#literal-object"
         },
         {
           "include": "#literal-module"
@@ -147,7 +146,7 @@
       "comment": "so set at arbitary 1000 chars to avoid parsing minified files",
       "patterns": [
         {
-          "match": "^.{1000,}"
+          "match": "^(?:).{1000,}"
         }
       ]
     },
@@ -157,7 +156,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": {
@@ -185,8 +184,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": {
@@ -227,7 +226,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*+[$_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*=>)",
+          "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*=>)",
           "end": "\\s*(=>)",
           "beginCaptures": {
             "1": {
@@ -254,7 +253,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*+[$_a-zA-Z0-9]+(<(?:(?>[^<>]+)|\\g<-1>)*>)?|\\s*+({(?:(?>[^{}]+)|\\g<-1>)*\\})|\\s*+(\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])|\\s*+(\\s*([\"']).*?\\k<-1>(?<!\\\\.))|\\s*[x0-9A-Fa-f]+))|(?:\\s*+/\\*.*?\\*/))*+)*)|(?:/\\*.*?\\*/))\\s*=>)",
+          "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*=>)",
           "end": "\\s*(=>)",
           "beginCaptures": {
             "1": {
@@ -284,7 +283,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*+[$_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*=>)",
+          "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*=>)",
           "end": "\\s*(=>)",
           "applyEndPatternLast": 1,
           "endCaptures": {
@@ -321,7 +320,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*+[$_a-zA-Z0-9]+(<(?:(?>[^<>]+)|\\g<-1>)*>)?|\\s*+({(?:(?>[^{}]+)|\\g<-1>)*\\})|\\s*+(\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])|\\s*+(\\s*([\"']).*?\\k<-1>(?<!\\\\.))|\\s*[x0-9A-Fa-f]+))|(?:\\s*+/\\*.*?\\*/))*+)*)|(?:/\\*.*?\\*/))\\s*=>)",
+          "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*=>)",
           "end": "\\s*(=>)",
           "beginCaptures": {
             "1": {
@@ -363,7 +362,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"
@@ -434,6 +433,7 @@
           "include": "#literal-keyword-storage"
         },
         {
+          "name": "keyword.control.flow.js",
           "match": "\\s*+(?<!\\.)\\b(yield)\\b(?:\\s*+(\\*))?",
           "captures": {
             "1": {
@@ -445,36 +445,20 @@
           }
         },
         {
-          "match": "\\s*+(?<!\\.)\\b(await|return)\\b",
-          "captures": {
-            "1": {
-              "name": "keyword.control.flow.js"
-            }
-          }
+          "name": "keyword.control.flow.js",
+          "match": "\\s*+(?<!\\.)\\b(await|return)\\b"
         },
         {
-          "match": "\\s*+(?<!\\.)\\b(if|else)\\b",
-          "captures": {
-            "1": {
-              "name": "keyword.control.conditional.js"
-            }
-          }
+          "name": "keyword.control.conditional.js",
+          "match": "\\s*+(?<!\\.)\\b(if|else)\\b"
         },
         {
-          "match": "\\s*+(?<!\\.)\\b(catch|finally|throw|try)\\b",
-          "captures": {
-            "1": {
-              "name": "keyword.control.trycatch.js"
-            }
-          }
+          "name": "keyword.control.trycatch.js",
+          "match": "\\s*+(?<!\\.)\\b(catch|finally|throw|try)\\b"
         },
         {
-          "match": "\\s*+(?<!\\.)\\b(break|continue|do|goto|while)\\b",
-          "captures": {
-            "1": {
-              "name": "keyword.control.loop.js"
-            }
-          }
+          "name": "keyword.control.loop.js",
+          "match": "\\s*+(?<!\\.)\\b(break|continue|do|goto|while)\\b"
         }
       ]
     },
@@ -483,9 +467,9 @@
         {
           "name": "meta.for.js",
           "begin": "\\s*+(?<!\\.)\\b(for)\\b",
-          "end": "\\s*(\\))",
+          "end": "\\s*\\)",
           "endCaptures": {
-            "1": {
+            "0": {
               "name": "meta.brace.round.js"
             }
           },
@@ -496,10 +480,10 @@
           },
           "patterns": [
             {
-              "begin": "\\s*+(\\()",
+              "begin": "\\s*+\\(",
               "end": "\\s*(?=\\))",
               "beginCaptures": {
-                "1": {
+                "0": {
                   "name": "meta.brace.round.js"
                 }
               },
@@ -524,14 +508,14 @@
         {
           "name": "meta.switch.js",
           "begin": "\\s*+(?<!\\.)\\b(switch)\\b",
-          "end": "\\s*(\\})",
+          "end": "\\s*\\}",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.switch.js"
             }
           },
           "endCaptures": {
-            "1": {
+            "0": {
               "name": "meta.brace.curly.js"
             }
           },
@@ -540,10 +524,10 @@
               "include": "#round-brackets"
             },
             {
-              "begin": "\\s*+({)",
+              "begin": "\\s*+\\{",
               "end": "\\s*(?=})",
               "beginCaptures": {
-                "1": {
+                "0": {
                   "name": "meta.brace.curly.js"
                 }
               },
@@ -594,14 +578,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": {
-            "1": {
+            "0": {
               "name": "meta.brace.round.js"
             }
           },
@@ -615,15 +599,15 @@
           ]
         },
         {
-          "begin": "\\s*+(\\()",
-          "end": "\\s*(\\))",
+          "begin": "\\s*+\\(",
+          "end": "\\s*\\)",
           "endCaptures": {
-            "1": {
+            "0": {
               "name": "meta.brace.round.js"
             }
           },
           "beginCaptures": {
-            "1": {
+            "0": {
               "name": "meta.brace.round.js"
             }
           },
@@ -638,15 +622,15 @@
     "square-brackets": {
       "patterns": [
         {
-          "begin": "\\s*+(\\[)",
-          "end": "\\s*(\\])",
+          "begin": "\\s*+\\[",
+          "end": "\\s*\\]",
           "endCaptures": {
-            "1": {
+            "0": {
               "name": "meta.brace.square.js"
             }
           },
           "beginCaptures": {
-            "1": {
+            "0": {
               "name": "meta.brace.square.js"
             }
           },
@@ -661,15 +645,15 @@
     "curly-brackets": {
       "patterns": [
         {
-          "begin": "\\s*+({)",
-          "end": "\\s*(\\})",
+          "begin": "\\s*+\\{",
+          "end": "\\s*\\}",
           "endCaptures": {
-            "1": {
+            "0": {
               "name": "meta.brace.curly.js"
             }
           },
           "beginCaptures": {
-            "1": {
+            "0": {
               "name": "meta.brace.curly.js"
             }
           },
@@ -702,21 +686,15 @@
     },
     "comments": {
       "patterns": [
-        {
-          "include": "#flowtype-comments"
-        },
         {
           "include": "#special-comments-conditional-compilation"
         },
         {
-          "contentName": "comment.block.documentation.js",
-          "begin": "\\s*+((/\\*\\*))(?!/)",
-          "end": "(\\s*(\\*/))",
+          "name": "comment.block.documentation.js",
+          "begin": "\\s*+/\\*\\*(?!/)",
+          "end": "\\s*\\*/",
           "captures": {
-            "1": {
-              "name": "comment.block.documentation.js"
-            },
-            "2": {
+            "0": {
               "name": "punctuation.definition.comment.js"
             }
           },
@@ -727,45 +705,32 @@
           ]
         },
         {
-          "contentName": "comment.block.js",
-          "begin": "\\s*+((/\\*))",
-          "end": "(\\s*(\\*/))",
+          "name": "comment.block.js",
+          "begin": "\\s*+/\\*",
+          "end": "\\s*\\*/",
           "captures": {
-            "1": {
-              "name": "comment.block.js"
-            },
-            "2": {
+            "0": {
               "name": "punctuation.definition.comment.js"
             }
           }
         },
         {
-          "match": "\\s*+((<!--|-->))",
+          "name": "comment.block.html.js",
+          "match": "\\s*+(<!--|-->)",
           "captures": {
-            "1": {
-              "name": "comment.block.html.js"
-            },
-            "2": {
+            "0": {
               "name": "punctuation.definition.comment.js"
             }
           }
         },
         {
-          "contentName": "comment.line.double-slash.js",
-          "begin": "\\s*+((//))",
+          "name": "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"
-            }
           }
         },
         {
@@ -782,14 +747,11 @@
     "special-comments-conditional-compilation": {
       "patterns": [
         {
-          "contentName": "comment.block.conditional.js",
-          "begin": "\\s*+((/\\*))(?=@)",
+          "name": "comment.block.conditional.js",
+          "begin": "\\s*+/\\*(?=@)",
           "end": "\\s*\\*/",
           "captures": {
-            "1": {
-              "name": "comment.block.conditional.js"
-            },
-            "2": {
+            "0": {
               "name": "punctuation.definition.comment.js"
             }
           },
@@ -844,24 +806,16 @@
     "literal-semi-colon": {
       "patterns": [
         {
-          "match": "\\s*+(;)",
-          "captures": {
-            "1": {
-              "name": "punctuation.terminator.statement.js"
-            }
-          }
+          "name": "punctuation.terminator.statement.js",
+          "match": "\\s*+\\;"
         }
       ]
     },
     "literal-comma": {
       "patterns": [
         {
-          "match": "\\s*+(,)",
-          "captures": {
-            "1": {
-              "name": "meta.delimiter.comma.js"
-            }
-          }
+          "name": "meta.delimiter.comma.js",
+          "match": "\\s*+,"
         }
       ]
     },
@@ -869,7 +823,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"
@@ -879,7 +833,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"
@@ -901,7 +855,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": {
@@ -927,7 +881,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": {
@@ -959,7 +913,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": {
@@ -1003,7 +957,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": {
@@ -1123,9 +1077,6 @@
             }
           },
           "patterns": [
-            {
-              "include": "#html-template"
-            },
             {
               "include": "#literal-function-labels"
             },
@@ -1154,71 +1105,36 @@
     "literal-operators": {
       "patterns": [
         {
-          "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.js",
+          "match": "\\s*+(?<!\\.)\\b(delete|in|instanceof|new|of|typeof|void|with)\\b"
         },
         {
-          "match": "\\s*+(!(?!=)|&&|\\|\\|)",
-          "captures": {
-            "1": {
-              "name": "keyword.operator.logical.js"
-            }
-          }
+          "name": "keyword.operator.logical.js",
+          "match": "\\s*+(!(?!=)|&&|\\|\\|)"
         },
         {
-          "match": "\\s*+(=(?!(=|>)))",
-          "captures": {
-            "1": {
-              "name": "keyword.operator.assignment.js"
-            }
-          }
+          "name": "keyword.operator.assignment.js",
+          "match": "\\s*+(=(?!(=|>)))"
         },
         {
-          "match": "\\s*+(%=|&=|\\*=|\\+=|-=|/=|\\^=|\\|=|<<=|>>=|>>>=)",
-          "captures": {
-            "1": {
-              "name": "keyword.operator.assignment.augmented.js"
-            }
-          }
+          "name": "keyword.operator.assignment.augmented.js",
+          "match": "\\s*+(%=|&=|\\*=|\\+=|-=|/=|\\^=|\\|=|<<=|>>=|>>>=)"
         },
         {
-          "match": "\\s*+(~|<<|>>>|>>|&|\\^|\\|)",
-          "captures": {
-            "1": {
-              "name": "keyword.operator.bitwise.js"
-            }
-          }
+          "name": "keyword.operator.bitwise.js",
+          "match": "\\s*+(~|<<|>>>|>>|&|\\^|\\|)"
         },
         {
-          "match": "\\s*+(<=|>=|<|>)",
-          "captures": {
-            "1": {
-              "name": "keyword.operator.relational.js"
-            }
-          }
+          "name": "keyword.operator.relational.js",
+          "match": "\\s*+(<=|>=|<|>)"
         },
         {
-          "match": "\\s*+(===|!==|==|!=)",
-          "captures": {
-            "1": {
-              "name": "keyword.operator.comparison.js"
-            }
-          }
+          "name": "keyword.operator.comparison.js",
+          "match": "\\s*+(===|!==|==|!=)"
         },
         {
-          "match": "\\s*+(--|\\+\\+|/(?!/|\\*)|%|\\*(?<!/\\*)|\\+|-)",
-          "captures": {
-            "1": {
-              "name": "keyword.operator.arithmetic.js"
-            }
-          }
+          "name": "keyword.operator.arithmetic.js",
+          "match": "\\s*+(--|\\+\\+|/(?!/|\\*)|%|\\*(?<!/\\*)|\\+|-)"
         },
         {
           "comment": "ternary operator - make sure end : is consumed to avoid mistake as flow type",
@@ -1241,12 +1157,8 @@
           ]
         },
         {
-          "match": "\\s*+(?<!\\.)(\\.\\.\\.)",
-          "captures": {
-            "1": {
-              "name": "keyword.operator.spread.js"
-            }
-          }
+          "name": "keyword.operator.spread.js",
+          "match": "\\s*+(?<!\\.)\\.\\.\\."
         },
         {
           "name": "keyword.operator.accessor.js",
@@ -1340,84 +1252,56 @@
     "literal-language-constant": {
       "patterns": [
         {
-          "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"
-            }
-          }
+          "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"
         }
       ]
     },
     "support": {
       "patterns": [
         {
-          "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.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(decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|escape|eval|isFinite|isNaN|parseFloat|parseInt|unescape)\\b",
-          "captures": {
-            "1": {
-              "name": "support.function.js"
-            }
-          }
+          "name": "support.function.js",
+          "match": "\\s*+(?<!\\.)\\b(decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|escape|eval|isFinite|isNaN|parseFloat|parseInt|unescape)\\b"
         },
         {
-          "match": "(?<=\\.)(shift|sort|splice|unshift|pop|push|reverse)\\b",
-          "captures": {
-            "1": {
-              "name": "support.function.mutator.js"
-            }
-          }
+          "name": "support.function.mutator.js",
+          "match": "(?<=\\.)(shift|sort|splice|unshift|pop|push|reverse)\\b"
         },
         {
-          "match": "\\s*+(?<!\\.)\\b((Eval|Range|Reference|Syntax|Type|URI)?Error)\\b",
-          "captures": {
-            "1": {
-              "name": "support.class.error.js"
-            }
-          }
+          "name": "support.class.error.js",
+          "match": "\\s*+(?<!\\.)\\b((Eval|Range|Reference|Syntax|Type|URI)?Error)\\b"
         },
         {
-          "match": "\\s*+(?<!\\.)\\b(debugger)\\b",
-          "captures": {
-            "1": {
-              "name": "keyword.other.js"
-            }
-          }
+          "name": "keyword.other.js",
+          "match": "\\s*+(?<!\\.)\\b(debugger)\\b"
         },
         {
-          "match": "\\s*+(?<!\\.)\\b(document|window)\\b",
-          "captures": {
-            "1": {
-              "name": "support.type.object.dom.js"
-            }
-          }
+          "name": "support.type.object.dom.js",
+          "match": "\\s*+(?<!\\.)\\b(document|window)\\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"
-            }
-          }
+          "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(console)(?:(\\.)(warn|info|log|error|time|timeEnd|assert))?\\b",
@@ -1476,30 +1360,17 @@
           }
         },
         {
-          "match": "\\s*+(?<!\\.)\\b(global|GLOBAL|root|__dirname|__filename)\\b",
-          "captures": {
-            "1": {
-              "name": "support.type.object.node.js"
-            }
-          }
+          "name": "support.type.object.node.js",
+          "match": "\\s*+(?<!\\.)\\b(global|GLOBAL|root|__dirname|__filename)\\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": "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"
         },
         {
-          "contentName": "meta.tag.mustache.js",
-          "begin": "\\s*+({{)",
-          "end": "(\\s*}})",
-          "captures": {
-            "1": {
-              "name": "meta.tag.mustache.js"
-            }
-          }
+          "name": "meta.tag.mustache.js",
+          "begin": "\\s*+{{",
+          "end": "\\s*}}"
         }
       ]
     },
@@ -1507,24 +1378,24 @@
       "patterns": [
         {
           "comment": "Classes",
-          "begin": "\\s*+(?<!\\.)\\b((class))\\s+",
+          "begin": "\\s*+(?<!\\.)\\b(class)\\s+",
           "end": "\\s*(?<=})",
           "beginCaptures": {
-            "1": {
+            "0": {
               "name": "meta.class.js"
             },
-            "2": {
+            "1": {
               "name": "storage.type.class.js"
             }
           },
           "patterns": [
             {
-              "match": "\\s*+\\b((extends))\\b\\s*+",
+              "match": "\\s*+\\b(extends)\\b\\s*+",
               "captures": {
-                "1": {
+                "0": {
                   "name": "meta.class.extends.js"
                 },
-                "2": {
+                "1": {
                   "name": "storage.type.extends.js"
                 }
               }
@@ -1532,21 +1403,17 @@
             {
               "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}])*+)",
-              "captures": {
-                "1": {
-                  "name": "entity.name.class.js"
-                }
-              }
+              "name": "entity.name.class.js"
             },
             {
               "include": "#flowtype-polymorphs"
             },
             {
-              "begin": "\\s*+({)",
+              "begin": "\\s*+{",
               "end": "\\s*(})",
               "contentName": "meta.class.body.js",
               "beginCaptures": {
-                "1": {
+                "0": {
                   "name": "punctuation.section.class.begin.js"
                 }
               },
@@ -1601,12 +1468,8 @@
           ]
         },
         {
-          "match": "\\s*+(?<!\\.)\\b(static)\\b(?!\\.)",
-          "captures": {
-            "1": {
-              "name": "storage.modifier.js"
-            }
-          }
+          "match": "\\s*+\\b(?<!\\.)static\\b(?!\\.)",
+          "name": "storage.modifier.js"
         },
         {
           "include": "#flowtype-variable"
@@ -1692,60 +1555,32 @@
     "literal-language-variable": {
       "patterns": [
         {
-          "match": "\\s*+(?<!(?<!\\.\\.)\\.)\\b(arguments)\\b",
-          "captures": {
-            "1": {
-              "name": "variable.language.arguments.js"
-            }
-          }
+          "name": "variable.language.arguments.js",
+          "match": "\\s*+(?<!(?<!\\.\\.)\\.)\\b(arguments)\\b"
         },
         {
-          "match": "\\s*+(?<!(?<!\\.\\.)\\.)\\b(super)\\b\\s*+(?!\\()",
-          "captures": {
-            "1": {
-              "name": "variable.language.super.js"
-            }
-          }
+          "name": "variable.language.super.js",
+          "match": "\\s*+(?<!(?<!\\.\\.)\\.)\\b(super)\\b\\s*+(?!\\()"
         },
         {
-          "match": "\\s*+(?<!(?<!\\.\\.)\\.)\\b(this)\\b",
-          "captures": {
-            "1": {
-              "name": "variable.language.this.js"
-            }
-          }
+          "name": "variable.language.this.js",
+          "match": "\\s*+(?<!(?<!\\.\\.)\\.)\\b(this)\\b"
         },
         {
-          "match": "\\s*+(?<!(?<!\\.\\.)\\.)\\b(self)\\b\\s*+(?!\\()",
-          "captures": {
-            "1": {
-              "name": "variable.language.self.js"
-            }
-          }
+          "name": "variable.language.self.js",
+          "match": "\\s*+(?<!(?<!\\.\\.)\\.)\\b(self)\\b\\s*+(?!\\()"
         },
         {
-          "match": "\\s*+(?<=\\.)\\b(__proto__)\\b",
-          "captures": {
-            "1": {
-              "name": "variable.language.proto.js"
-            }
-          }
+          "name": "variable.language.proto.js",
+          "match": "\\s*+(?<=\\.)\\b(__proto__)\\b"
         },
         {
-          "match": "\\s*+(?<=\\.)\\b(constructor)\\b\\s*+(?!\\()",
-          "captures": {
-            "1": {
-              "name": "variable.language.constructor.js"
-            }
-          }
+          "name": "variable.language.constructor.js",
+          "match": "\\s*+(?<=\\.)\\b(constructor)\\b\\s*+(?!\\()"
         },
         {
-          "match": "\\s*+(?<=\\.)\\b(prototype)\\b",
-          "captures": {
-            "1": {
-              "name": "variable.language.prototype.js"
-            }
-          }
+          "name": "variable.language.prototype.js",
+          "match": "\\s*+(?<=\\.)\\b(prototype)\\b"
         }
       ]
     },
@@ -1761,7 +1596,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",
@@ -1822,7 +1657,7 @@
         {
           "comment": "e.g. (args) => { }",
           "name": "meta.function.arrow.js",
-          "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*=>)",
+          "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*=>)",
           "end": "\\s*(=>)",
           "applyEndPatternLast": 1,
           "endCaptures": {
@@ -1860,7 +1695,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*+[$_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*=>)",
+          "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*=>)",
           "end": "\\s*(=>)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -1910,7 +1745,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*+[$_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*=>)",
+          "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*=>)",
           "end": "\\s*(=>)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -1984,7 +1819,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*+[$_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*=>)",
+          "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*=>)",
           "end": "\\s*(=>)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -2051,7 +1886,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": {
@@ -2107,7 +1942,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": {
@@ -2305,209 +2140,16 @@
     "literal-module": {
       "patterns": [
         {
-          "include": "#literal-module-import"
+          "name": "keyword.control.module.js",
+          "match": "\\s*+(?<!\\.)\\b(import|export|default)\\b"
         },
         {
-          "include": "#literal-module-export"
+          "name": "keyword.control.module.reference.js",
+          "match": "\\s*+(?<!\\.)\\b(from|as)\\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"
-        },
-        "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": {
+    "literal-variable": {
       "patterns": [
         {
           "comment": "e.g. CONSTANT",
@@ -2614,24 +2256,11 @@
         }
       ]
     },
-    "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": [
@@ -2647,7 +2276,6 @@
         {
           "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": {
@@ -2693,7 +2321,6 @@
       "patterns": [
         {
           "comment": "uses non consuming search for </ in </tag>",
-          "contentName": "JSXNested",
           "begin": "(>)",
           "end": "(</)",
           "beginCaptures": {
@@ -2823,52 +2450,32 @@
       ]
     },
     "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": [
         {
-          "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": "#jsx-string-double-quoted"
         },
         {
-          "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"
-            }
-          ]
+          "include": "#jsx-string-single-quoted"
+        },
+        {
+          "include": "#jsx-spread-attribute"
+        },
+        {
+          "include": "#expression"
         }
       ]
     },
@@ -2928,32 +2535,10 @@
             }
           },
           "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"
         }
       ]
     },
@@ -2961,7 +2546,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*([$_\\p{L}](?:[$.\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}])*+)?\\s*(<(?:(?>[^<>]+)|\\g<-1>)*>)?\\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*(\\bFunction\\b|(\\((?:(?>[^()]+)|\\g<-1>)*\\))\\s*=>|\\(\\s*$))",
           "captures": {
             "1": {
               "name": "storage.type.function.js"
@@ -2995,30 +2580,18 @@
       "patterns": [
         {
           "comment": "flowtype optional arg/parameter e.g. protocol? : string",
-          "match": "\\s*+(\\?)",
-          "captures": {
-            "1": {
-              "name": "punctuation.type.flowtype"
-            }
-          }
+          "name": "punctuation.type.flowtype",
+          "match": "\\s*+\\?"
         },
         {
           "comment": "Type Unions |",
-          "match": "\\s*+(\\|)",
-          "captures": {
-            "1": {
-              "name": "kewyword.operator.union.flowtype"
-            }
-          }
+          "name": "kewyword.operator.union.flowtype",
+          "match": "\\s*+\\|"
         },
         {
           "comment": "intersection of types &",
-          "match": "\\s*+(\\&)",
-          "captures": {
-            "1": {
-              "name": "kewyword.operator.intersection.flowtype"
-            }
-          }
+          "name": "kewyword.operator.intersection.flowtype",
+          "match": "\\s*+\\&"
         },
         {
           "comment": "typed entity :",
@@ -3041,7 +2614,7 @@
         },
         {
           "comment": "An Iterator prefix?",
-          "match": "\\s*+(@@)"
+          "match": "\\s*+@@"
         },
         {
           "begin": "\\s*+(=>)",
@@ -3083,20 +2656,12 @@
       "patterns": [
         {
           "comment": "Maybe types",
-          "match": "\\s*+(\\?)",
-          "captures": {
-            "1": {
-              "name": "keyword.operator.maybe.flowtype"
-            }
-          }
+          "name": "keyword.operator.maybe.flowtype",
+          "match": "\\s*+\\?"
         },
         {
-          "match": "\\s*+\\b(typeof)\\b\\s*+",
-          "captures": {
-            "1": {
-              "name": "keyword.operator.flowtype"
-            }
-          }
+          "name": "keyword.operator.flowtype",
+          "match": "\\s*+\\btypeof\\b\\s*+"
         },
         {
           "comment": "primitive flowtypes",
@@ -3139,40 +2704,23 @@
         },
         {
           "comment": "Type Unions |",
-          "match": "\\s*+(\\|)",
-          "captures": {
-            "1": {
-              "name": "kewyword.operator.union.flowtype"
-            }
-          }
+          "name": "kewyword.operator.union.flowtype",
+          "match": "\\s*+\\|"
         },
         {
           "comment": "intersection of types &",
-          "match": "\\s*+(\\&)",
-          "captures": {
-            "1": {
-              "name": "kewyword.operator.intersection.flowtype"
-            }
-          }
+          "name": "kewyword.operator.intersection.flowtype",
+          "match": "\\s*+\\&"
         },
         {
           "comment": "as per React declares in flowtype github",
-          "match": "\\s*+(\\*)",
-          "captures": {
-            "1": {
-              "name": "kewyword.operator.existential.flowtype"
-            }
-          }
+          "name": "kewyword.operator.existential.flowtype",
+          "match": "\\s*+\\*"
         },
         {
           "comment": "types of type marker e.g. <T: number | string>",
           "name": "punctuation.type.flowtype",
-          "match": "\\s*+(:)",
-          "captures": {
-            "1": {
-              "name": "support.type.builtin.primitive.flowtype"
-            }
-          }
+          "match": "\\s*+(:)"
         },
         {
           "comment": "call back with a form  ) => type",
@@ -3220,9 +2768,6 @@
             }
           },
           "patterns": [
-            {
-              "include": "#flowtype-polymorphs"
-            },
             {
               "include": "#flowtype-variable"
             }
@@ -3302,7 +2847,7 @@
     },
     "flowtype-parse-objects": {
       "comment": "object literal flowtype  preceded by either => : | & ? symbols",
-      "begin": "(?<=:|\\||&|\\?|=>|<)\\s*+({)",
+      "begin": "(?<=:|\\||&|\\?|=>|<)\\s*+(\\{)",
       "end": "\\s*(\\})",
       "applyEndPatternLast": 1,
       "beginCaptures": {
@@ -3324,13 +2869,19 @@
     "flowtype-object-property": {
       "patterns": [
         {
-          "include": "#literal-method"
-        },
-        {
-          "include": "#comments"
+          "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": "#flowtype-variable"
+          "include": "#flowtype-vars-and-props"
         }
       ]
     },
@@ -3358,10 +2909,13 @@
       "patterns": [
         {
           "comment": "type aliases for export but avoid type instaceof or type in operators",
-          "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",
+          "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",
           "beginCaptures": {
             "1": {
+              "name": "keyword.control.module.js"
+            },
+            "2": {
               "name": "keyword.other.typedef.flowtype"
             }
           },
@@ -3375,17 +2929,31 @@
               "match": "\\s*+="
             },
             {
-              "begin": "\\s*+({)",
-              "end": "\\s*(})",
+              "begin": "\\s*+{",
+              "end": "\\s*}",
               "applyEndPatternLast": 1,
-              "captures": {
-                "1": {
+              "beginCaptures": {
+                "0": {
+                  "name": "meta.brace.curly.js"
+                }
+              },
+              "endCaptures": {
+                "0": {
                   "name": "meta.brace.curly.js"
                 }
               },
               "patterns": [
                 {
-                  "include": "#flowtype-object-property"
+                  "include": "#flowtype"
+                },
+                {
+                  "include": "#flowtype-variable"
+                },
+                {
+                  "include": "#comments"
+                },
+                {
+                  "include": "#flowtype-function-name"
                 }
               ]
             },
@@ -3423,11 +2991,11 @@
           "include": "#flowtype-polymorphs"
         },
         {
-          "begin": "\\s*+({)",
+          "begin": "\\s*+{",
           "end": "\\s*(})",
           "contentName": "meta.class.body.js",
           "beginCaptures": {
-            "1": {
+            "0": {
               "name": "punctuation.section.class.begin.js"
             }
           },
@@ -3450,7 +3018,7 @@
     "flowtype-declare": {
       "patterns": [
         {
-          "match": "\\s*+(?<!\\.)\\b(declare)(?=\\s+(function|var|type|interface)\\b)",
+          "match": "\\s*+(?<!\\.)\\b(declare)\\b\\s++(?=\\b(function|var|type|interface)\\s++)",
           "captures": {
             "1": {
               "name": "keyword.other.declare.flowtype"
@@ -3480,9 +3048,6 @@
             }
           },
           "patterns": [
-            {
-              "include": "#flowtype-parse-objects"
-            },
             {
               "include": "#flowtype-parse-types"
             }
@@ -3507,11 +3072,7 @@
             {
               "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}])*+)",
-              "captures": {
-                "1": {
-                  "name": "entity.name.class.js"
-                }
-              }
+              "name": "entity.name.class.js"
             },
             {
               "comment": "look for module names in quoted string forms",
@@ -3589,18 +3150,14 @@
                   "name": "entity.name.class.js"
                 },
                 {
-                  "include": "#literal-comma"
+                  "include": "#literal-coma"
                 }
               ]
             },
             {
               "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}])*+)",
-              "captures": {
-                "1": {
-                  "name": "entity.name.class.js"
-                }
-              }
+              "name": "entity.name.class.js"
             },
             {
               "begin": "\\s*+({)",
@@ -3667,7 +3224,7 @@
     "flowtype-typecast": {
       "patterns": [
         {
-          "begin": "\\s*+(:)",
+          "begin": "\\s*+:",
           "end": "(?=\\s*+\\))",
           "patterns": [
             {
@@ -3677,106 +3234,6 @@
         }
       ]
     },
-    "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": [
@@ -3790,55 +3247,6 @@
           }
         }
       ]
-    },
-    "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"
-        }
-      ]
     }
   }
 }