github-linguist 4.8.2 → 4.8.3

data/grammars/source.js.json

@@ -8,8 +8,10 @@
     "gs",
     "htc",
     "jscad",
+    "jslib",
     "jsm",
     "json5",
+    "jspre",
     "pac",
     "pjs",
     "xsjs",
@@ -714,6 +716,46 @@
         }
       ]
     },
+    {
+      "begin": "\\bMath\\b",
+      "beginCaptures": {
+        "0": {
+          "name": "support.class.js"
+        }
+      },
+      "end": "(?!\\G)",
+      "patterns": [
+        {
+          "begin": "\\s*(\\.)\\s*(abs|acos|acosh|asin|asinh|atan|atan2|atanh|cbrt|ceil|clz32|cos|cosh|exp|expm1|floor|fround|hypot|imul|log|log10|log1p|log2|max|min|pow|random|round|sign|sin|sinh|sqrt|tan|tanh|trunc)\\s*(?=\\()",
+          "beginCaptures": {
+            "1": {
+              "name": "meta.delimiter.method.period.js"
+            },
+            "2": {
+              "name": "support.function.math.js"
+            }
+          },
+          "end": "(?<=\\))",
+          "name": "meta.method-call.js",
+          "patterns": [
+            {
+              "include": "#arguments"
+            }
+          ]
+        },
+        {
+          "match": "\\s*(\\.)\\s*(E|LN10|LN2|LOG10E|LOG2E|PI|SQRT1_2|SQRT2)\\b",
+          "captures": {
+            "1": {
+              "name": "meta.delimiter.property.period.js"
+            },
+            "2": {
+              "name": "support.constant.property.math.js"
+            }
+          }
+        }
+      ]
+    },
     {
       "include": "#strings"
     },
@@ -891,7 +933,7 @@
       "name": "support.class.js"
     },
     {
-      "match": "(\\.)(systemLanguage|scripts|scrollbars|screenX|screenY|screenTop|screenLeft|style|styleSheets|status|statusText|statusbar|siblingBelow|siblingAbove|source|suffixes|security|securityPolicy|selection|self|history|host|hostname|hash|hasFocus|XMLDocument|XSLDocument|next|namespaces|namespaceURI|nameProp|MIN_VALUE|MAX_VALUE|characterSet|constructor|controllers|cookieEnabled|colorDepth|components|complete|current|cpuClass|clip|clipBoardData|clientInformation|closed|classes|callee|caller|crypto|toolbar|top|textTransform|textIndent|textDecoration|textAlign|tags|SQRT1_2|SQRT2|innerHeight|innerWidth|input|ids|ignoreCase|zIndex|oscpu|onreadystatechange|onLine|outerHeight|outerWidth|opsProfile|opener|offscreenBuffering|NEGATIVE_INFINITY|display|dialogHeight|dialogTop|dialogWidth|dialogLeft|dialogArguments|directories|description|defaultStatus|defaultChecked|defaultCharset|defaultView|userProfile|userLanguage|userAgent|uniqueID|undefined|updateInterval|_content|pixelDepth|port|personalbar|pkcs11|plugins|platform|pathname|paddingRight|paddingBottom|paddingTop|paddingLeft|parent|parentWindow|parentLayer|pageX|pageXOffset|pageY|pageYOffset|protocol|prototype|product|productSub|prompter|previous|prefix|encoding|enabledPlugin|external|expando|embeds|visiblity|vendor|vendorSub|vLinkcolor|URLUnencoded|PI|POSITIVE_INFINITY|filename|fontSize|fontFamily|fontWeight|formName|frames|frameElement|fgColor|E|whiteSpace|listStyleType|lineHeight|linkColor|location|locationbar|localName|lowsrc|length|left|leftContext|lastModified|lastMatch|lastIndex|lastParen|layers|layerX|language|appMinorVersion|appName|appCodeName|appCore|appVersion|availHeight|availTop|availWidth|availLeft|all|arity|arguments|aLinkcolor|above|right|rightContext|responseXML|responeText|readyState|global|x|y|z|mimeTypes|multiline|menubar|marginRight|marginBottom|marginTop|marginLeft|LN10|LN2|LOG10E|LOG2E|bottom|border(Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth)|bufferDepth|below|backgroundColor|backgroundImage)\\b",
+      "match": "(\\.)(systemLanguage|scripts|scrollbars|screenX|screenY|screenTop|screenLeft|style|styleSheets|status|statusText|statusbar|siblingBelow|siblingAbove|source|suffixes|security|securityPolicy|selection|self|history|host|hostname|hash|hasFocus|XMLDocument|XSLDocument|next|namespaces|namespaceURI|nameProp|MIN_VALUE|MAX_VALUE|characterSet|constructor|controllers|cookieEnabled|colorDepth|components|complete|current|cpuClass|clip|clipBoardData|clientInformation|closed|classes|callee|caller|crypto|toolbar|top|textTransform|textIndent|textDecoration|textAlign|tags|innerHeight|innerWidth|input|ids|ignoreCase|zIndex|oscpu|onreadystatechange|onLine|outerHeight|outerWidth|opsProfile|opener|offscreenBuffering|NEGATIVE_INFINITY|display|dialogHeight|dialogTop|dialogWidth|dialogLeft|dialogArguments|directories|description|defaultStatus|defaultChecked|defaultCharset|defaultView|userProfile|userLanguage|userAgent|uniqueID|undefined|updateInterval|_content|pixelDepth|port|personalbar|pkcs11|plugins|platform|pathname|paddingRight|paddingBottom|paddingTop|paddingLeft|parent|parentWindow|parentLayer|pageX|pageXOffset|pageY|pageYOffset|protocol|prototype|product|productSub|prompter|previous|prefix|encoding|enabledPlugin|external|expando|embeds|visiblity|vendor|vendorSub|vLinkcolor|URLUnencoded|POSITIVE_INFINITY|filename|fontSize|fontFamily|fontWeight|formName|frames|frameElement|fgColor|whiteSpace|listStyleType|lineHeight|linkColor|location|locationbar|localName|lowsrc|length|left|leftContext|lastModified|lastMatch|lastIndex|lastParen|layers|layerX|language|appMinorVersion|appName|appCodeName|appCore|appVersion|availHeight|availTop|availWidth|availLeft|all|arity|arguments|aLinkcolor|above|right|rightContext|responseXML|responeText|readyState|global|x|y|z|mimeTypes|multiline|menubar|marginRight|marginBottom|marginTop|marginLeft|bottom|border(Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth)|bufferDepth|below|backgroundColor|backgroundImage)\\b",
       "captures": {
         "1": {
           "name": "meta.delimiter.property.period.js"
@@ -1431,7 +1473,7 @@
                   "name": "support.function.event-handler.js"
                 },
                 {
-                  "match": "(?x)\n\\b(shift|showModelessDialog|showModalDialog|showHelp|scroll|scrollX|scrollByPages|\nscrollByLines|scrollY|scrollTo|stop|strike|sin|sizeToContent|sidebar|signText|sort|\nsup|sub|substr|substring|splice|split|send|set(Milliseconds|Seconds|Minutes|Hours|\nMonth|Year|FullYear|Date|UTC(Milliseconds|Seconds|Minutes|Hours|Month|FullYear|Date)|\nTime|Hotkeys|Cursor|ZOptions|Active|Resizable|RequestHeader)|search|sqrt|slice|\nsavePreferences|small|home|handleEvent|navigate|char|charCodeAt|charAt|cos|concat|\ncontextual|confirm|compile|ceil|clear|captureEvents|call|createStyleSheet|createPopup|\ncreateEventObject|to(GMTString|UTCString|String|Source|UpperCase|LowerCase|LocaleString)|\ntest|tan|taint|taintEnabled|indexOf|italics|disableExternalCapture|dump|detachEvent|unshift|\nuntaint|unwatch|updateCommands|join|javaEnabled|pop|pow|push|plugins.refresh|paddings|parse|\nprint|prompt|preference|enableExternalCapture|elementFromPoint|exp|exec|execScript|\nexecCommand|valueOf|UTC|queryCommandState|queryCommandIndeterm|queryCommandEnabled|\nqueryCommandValue|find|file|fileModifiedDate|fileSize|fileCreatedDate|fileUpdatedDate|\nfixed|fontsize|fontcolor|forward|floor|fromCharCode|watch|link|load|log|lastIndexOf|\nasin|anchor|acos|attachEvent|atob|atan|atan2|apply|alert|abs|abort|round|routeEvents|\nresize|resizeBy|resizeTo|recalc|returnValue|replace|reverse|reload|releaseCapture|\nreleaseEvents|random|go|get(Milliseconds|Seconds|Minutes|Hours|Month|Day|Year|FullYear|\nTime|Date|TimezoneOffset|UTC(Milliseconds|Seconds|Minutes|Hours|Day|Month|FullYear|Date)|\nAttention|Selection|ResponseHeader|AllResponseHeaders)|min|moveBy|moveBelow|moveTo|\nmoveToAbsolute|moveAbove|mergeAttributes|match|margins|max|btoa|big|bold|borderWidths|blink|back)\\b",
+                  "match": "(?x)\n\\b(shift|showModelessDialog|showModalDialog|showHelp|scroll|scrollX|scrollByPages|\nscrollByLines|scrollY|scrollTo|stop|strike|sizeToContent|sidebar|signText|sort|\nsup|sub|substr|substring|splice|split|send|set(Milliseconds|Seconds|Minutes|Hours|\nMonth|Year|FullYear|Date|UTC(Milliseconds|Seconds|Minutes|Hours|Month|FullYear|Date)|\nTime|Hotkeys|Cursor|ZOptions|Active|Resizable|RequestHeader)|search|slice|\nsavePreferences|small|home|handleEvent|navigate|char|charCodeAt|charAt|concat|\ncontextual|confirm|compile|clear|captureEvents|call|createStyleSheet|createPopup|\ncreateEventObject|to(GMTString|UTCString|String|Source|UpperCase|LowerCase|LocaleString)|\ntest|taint|taintEnabled|indexOf|italics|disableExternalCapture|dump|detachEvent|unshift|\nuntaint|unwatch|updateCommands|join|javaEnabled|pop|push|plugins.refresh|paddings|parse|\nprint|prompt|preference|enableExternalCapture|elementFromPoint|exec|execScript|\nexecCommand|valueOf|UTC|queryCommandState|queryCommandIndeterm|queryCommandEnabled|\nqueryCommandValue|find|file|fileModifiedDate|fileSize|fileCreatedDate|fileUpdatedDate|\nfixed|fontsize|fontcolor|forward|fromCharCode|watch|link|load|lastIndexOf|\nanchor|attachEvent|atob|apply|alert|abort|routeEvents|\nresize|resizeBy|resizeTo|recalc|returnValue|replace|reverse|reload|releaseCapture|\nreleaseEvents|go|get(Milliseconds|Seconds|Minutes|Hours|Month|Day|Year|FullYear|\nTime|Date|TimezoneOffset|UTC(Milliseconds|Seconds|Minutes|Hours|Day|Month|FullYear|Date)|\nAttention|Selection|ResponseHeader|AllResponseHeaders)|moveBy|moveBelow|moveTo|\nmoveToAbsolute|moveAbove|mergeAttributes|match|margins|btoa|big|bold|borderWidths|blink|back)\\b",
                   "name": "support.function.js"
                 },
                 {

data/grammars/source.js.jsx.json

@@ -7,6 +7,7 @@
   "fileTypes": [
     "js",
     "es6",
+    "es",
     "babel",
     "jsx",
     "flow"
@@ -135,6 +136,9 @@
         },
         {
           "include": "#literal-comma"
+        },
+        {
+          "include": "#miscellaneous"
         }
       ]
     },
@@ -151,7 +155,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*(?=\\(|<)",
+          "begin": "\\s*+([_$a-zA-Z][$\\w]*)\\s*+(:)\\s*+(?:(async)\\s+)?\\s*+(\\bfunction\\b)\\s*+(?:(\\*)\\s*)?\\s*(?=\\(|<)",
           "end": "(?=\\{)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -180,7 +184,7 @@
         {
           "comment": "e.g. 'play': function(arg1, arg2) { }",
           "name": "meta.function.json.js",
-          "begin": "\\s*(('|\\\")(\\b[_$a-zA-Z][$\\w]*)(\\k<2>))\\s*(:)\\s*(async)?\\s+(\\bfunction\\b)\\s*(\\*\\s*)?\\s*(?=\\(|<)",
+          "begin": "\\s*+(('|\\\")(\\b[_$a-zA-Z][$\\w]*)(\\k<2>))\\s*+(:)\\s*+(async)?\\s*+(\\bfunction\\b)\\s*(\\*\\s*)?\\s*(?=\\(|<)",
           "end": "(?=\\{)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -222,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*(\\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*+(\\s*([\"']).*?\\k<-1>(?<!\\\\.))|\\s*[x0-9A-Fa-f]+))*\\s*=>)",
           "end": "\\s*(=>)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -250,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*[$_a-zA-Z0-9]+(<(?:(?>[^<>]+)|\\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*+(\\s*([\"']).*?\\k<-1>(?<!\\\\.))|\\s*+[x0-9A-Fa-f]+))*\\s*+=>)",
           "end": "\\s*(=>)",
           "beginCaptures": {
             "1": {
@@ -280,7 +284,7 @@
         {
           "comment": "e.g. 'play': (args) => { }",
           "name": "meta.function.json.arrow.js",
-          "begin": "\\s*(('|\\\")(\\b[_$a-zA-Z][$\\w]*)(\\k<2>))\\s*(:)\\s*(\\basync\\b)?\\s*(?=(<(?:(?>[^<>]+)|\\g<-1>)*>)?\\s*(\\((?:(?>[^()]+)|\\g<-1>)*\\))\\s*(?:\\s*(:|\\|)(\\s*[$_a-zA-Z0-9]+(<(?:(?>[^<>]+)|\\g<-1>)*>)?|\\s*(\\{(?:(?>[^{}]+)|\\g<-1>)*\\})|\\s*(\\s*([\"']).*?\\k<-1>(?<!\\\\.))|\\s*[x0-9A-Fa-f]+))*\\s*=>)",
+          "begin": "\\s*+(('|\\\")(\\b[_$a-zA-Z][$\\w]*)(\\k<2>))\\s*(:)\\s*+(\\basync\\b)?\\s*+(?=(<(?:(?>[^<>]+)|\\g<-1>)*>)?\\s*+(\\((?:(?>[^()]+)|\\g<-1>)*\\))\\s*+(?:\\s*+(:|\\|)(\\s*+[$_a-zA-Z0-9]+(<(?:(?>[^<>]+)|\\g<-1>)*>)?|\\s*+(\\{(?:(?>[^{}]+)|\\g<-1>)*\\})|\\s*+(\\s*+([\"']).*?\\k<-1>(?<!\\\\.))|\\s*+[x0-9A-Fa-f]+))*\\s*+=>)",
           "end": "\\s*(=>)",
           "applyEndPatternLast": 1,
           "endCaptures": {
@@ -317,7 +321,7 @@
         {
           "comment": "e.g. 'play': arg => { }",
           "name": "meta.function.json.arrow.js",
-          "begin": "\\s*(('|\\\")(\\b[_$a-zA-Z][$\\w]*)(\\k<2>))\\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*(\\s*([\"']).*?\\k<-1>(?<!\\\\.))|\\s*[x0-9A-Fa-f]+))*\\s*=>)",
+          "begin": "\\s*+(('|\\\")(\\b[_$a-zA-Z][$\\w]*)(\\k<2>))\\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*+(\\s*+([\"']).*?\\k<-1>(?<!\\\\.))|\\s*+[x0-9A-Fa-f]+))*\\s*+=>)",
           "end": "\\s*(=>)",
           "beginCaptures": {
             "1": {
@@ -359,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"
@@ -389,8 +393,8 @@
         },
         {
           "comment": "[something] : as  property name",
-          "begin": "\\s*(?<!\\.|\\?|\\?\\s|\\?\\s\\s)(\\[)(?=(?:[^\\[]+)*?\\]\\s*(:)(?=\\s*\\S))",
-          "end": "\\s*(\\])\\s*(:)",
+          "begin": "\\s*+(?<!\\.|\\?|\\?\\s|\\?\\s\\s)(\\[)(?=(?:[^\\[]+)*?\\]\\s*+(:)(?=\\s*+\\S))",
+          "end": "\\s*(\\])\\s*+(:)",
           "beginCaptures": {
             "1": {
               "name": "meta.brace.square.js"
@@ -412,7 +416,7 @@
         },
         {
           "name": "constant.other.object.key.js",
-          "match": "\\s*(?<!\\.|\\?|\\?\\s|\\?\\s\\s)\\s*([_$a-zA-Z][$\\w]*)\\s*(:)",
+          "match": "\\s*+(?<!\\.|\\?|\\?\\s|\\?\\s\\s)\\s*+([_$a-zA-Z][$\\w]*)\\s*+(:)",
           "captures": {
             "1": {
               "name": "string.unquoted.js"
@@ -431,7 +435,7 @@
         },
         {
           "name": "keyword.control.flow.js",
-          "match": "\\s*(?<!\\.)\\b(yield)\\b(?:\\s*(\\*))?",
+          "match": "\\s*+(?<!\\.)\\b(yield)\\b(?:\\s*+(\\*))?",
           "captures": {
             "1": {
               "name": "keyword.control.flow.js"
@@ -443,19 +447,19 @@
         },
         {
           "name": "keyword.control.flow.js",
-          "match": "\\s*(?<!\\.)\\b(await|return)\\b"
+          "match": "\\s*+(?<!\\.)\\b(await|return)\\b"
         },
         {
           "name": "keyword.control.conditional.js",
-          "match": "\\s*(?<!\\.)\\b(if|else)\\b"
+          "match": "\\s*+(?<!\\.)\\b(if|else)\\b"
         },
         {
           "name": "keyword.control.trycatch.js",
-          "match": "\\s*(?<!\\.)\\b(catch|finally|throw|try)\\b"
+          "match": "\\s*+(?<!\\.)\\b(catch|finally|throw|try)\\b"
         },
         {
           "name": "keyword.control.loop.js",
-          "match": "\\s*(?<!\\.)\\b(break|continue|do|goto|while)\\b"
+          "match": "\\s*+(?<!\\.)\\b(break|continue|do|goto|while)\\b"
         }
       ]
     },
@@ -463,7 +467,7 @@
       "patterns": [
         {
           "name": "meta.for.js",
-          "begin": "\\s*(?<!\\.)\\b(for)\\b",
+          "begin": "\\s*+(?<!\\.)\\b(for)\\b",
           "end": "\\s*\\)",
           "endCaptures": {
             "0": {
@@ -477,7 +481,7 @@
           },
           "patterns": [
             {
-              "begin": "\\s*\\(",
+              "begin": "\\s*+\\(",
               "end": "\\s*(?=\\))",
               "beginCaptures": {
                 "0": {
@@ -504,7 +508,7 @@
       "patterns": [
         {
           "name": "meta.switch.js",
-          "begin": "\\s*(?<!\\.)\\b(switch)\\b",
+          "begin": "\\s*+(?<!\\.)\\b(switch)\\b",
           "end": "\\s*\\}",
           "beginCaptures": {
             "1": {
@@ -521,7 +525,7 @@
               "include": "#round-brackets"
             },
             {
-              "begin": "\\s*\\{",
+              "begin": "\\s*+\\{",
               "end": "\\s*(?=})",
               "beginCaptures": {
                 "0": {
@@ -530,7 +534,7 @@
               },
               "patterns": [
                 {
-                  "begin": "\\s*(?<!\\.)\\b(case|default)\\b",
+                  "begin": "\\s*+(?<!\\.)\\b(case|default)\\b",
                   "end": "\\s*(:)",
                   "beginCaptures": {
                     "1": {
@@ -575,7 +579,7 @@
         {
           "comment": "try to avoid ternary operators which have a '? some chars :'",
           "name": "meta.group.braces.round",
-          "begin": "(^|:|;|=|(?<=:|;|=))\\s*(\\((?=((\"|').*?(?<=[^\\\\])\\k<-1>|[^?:])*(:|\\?\\s*:)))",
+          "begin": "(^|:|;|=|(?<=:|;|=))\\s*+(\\((?=((\"|').*?(?<=[^\\\\])\\k<-1>|[^?:])*(:|\\?\\s*+:)))",
           "end": "\\s*\\)",
           "beginCaptures": {
             "2": {
@@ -598,7 +602,7 @@
         },
         {
           "name": "meta.group.braces.round",
-          "begin": "\\s*\\(",
+          "begin": "\\s*+\\(",
           "end": "\\s*\\)",
           "endCaptures": {
             "0": {
@@ -622,7 +626,7 @@
       "patterns": [
         {
           "name": "meta.group.braces.square",
-          "begin": "\\s*\\[",
+          "begin": "\\s*+\\[",
           "end": "\\s*\\]",
           "endCaptures": {
             "0": {
@@ -646,7 +650,7 @@
       "patterns": [
         {
           "name": "meta.group.braces.curly",
-          "begin": "\\s*\\{",
+          "begin": "\\s*+\\{",
           "end": "\\s*\\}",
           "endCaptures": {
             "0": {
@@ -675,7 +679,7 @@
         },
         {
           "comment": "additional jsdoc keywords",
-          "match": "(?<!\\w)@(access|also|arg|arguments|augments|borrows|callback|classdesc|constant|const|constructs|copyright|default|defaultvalue|desc|description|emits|exception|exports|external|file|fileoverview|function|func|global|host|implements|inner|instance|interface|kind|lends|license|listens|memberof|mixes|mixin|module|name|namsepace|overview|prop|public|returns|see|summary|this|todo|tutorial|typedef|undocumented|variation|version|virtual)\\b",
+          "match": "(?<!\\w)@(access|also|arg|arguments|augments|borrows|borrowsThis|callback|callbackDocument|classdesc|constant|const|constructs|copyright|default|defaultvalue|desc|description|emits|exception|exports|external|file|fileoverview|function|func|global|host|implements|inner|instance|interface|kind|lends|license|listens|link|linkcode|linkplain|memberof|mixes|mixin|module|name|namespace|overview|prop|public|returns|see|summary|this|todo|tutorial|typedef|undocumented|variation|version|virtual)\\b",
           "name": "storage.type.class.jsdoc"
         },
         {
@@ -692,7 +696,7 @@
         },
         {
           "name": "comment.block.documentation.js",
-          "begin": "\\s*/\\*\\*(?!/)",
+          "begin": "\\s*+/\\*\\*(?!/)",
           "end": "\\s*\\*/",
           "captures": {
             "0": {
@@ -707,7 +711,7 @@
         },
         {
           "name": "comment.block.js",
-          "begin": "\\s*/\\*",
+          "begin": "\\s*+/\\*",
           "end": "\\s*\\*/",
           "captures": {
             "0": {
@@ -717,7 +721,7 @@
         },
         {
           "name": "comment.block.html.js",
-          "match": "\\s*(<!--|-->)",
+          "match": "\\s*+(<!--|-->)",
           "captures": {
             "0": {
               "name": "punctuation.definition.comment.js"
@@ -726,7 +730,7 @@
         },
         {
           "name": "comment.line.double-slash.js",
-          "begin": "\\s*(//)",
+          "begin": "\\s*+(//)",
           "end": "\\s*$",
           "beginCaptures": {
             "1": {
@@ -749,7 +753,7 @@
       "patterns": [
         {
           "name": "comment.block.conditional.js",
-          "begin": "\\s*/\\*(?=@)",
+          "begin": "\\s*+/\\*(?=@)",
           "end": "\\s*\\*/",
           "captures": {
             "0": {
@@ -767,7 +771,7 @@
           "patterns": [
             {
               "name": "punctuation.definition.comment.js",
-              "match": "\\s*/\\*"
+              "match": "\\s*+/\\*"
             },
             {
               "include": "$self"
@@ -776,7 +780,7 @@
         },
         {
           "name": "keyword.control.conditional.js",
-          "match": "\\s*(?!@)(@)(if|elif|else|end|ifdef|endif|cc_on|set)\\b",
+          "match": "\\s*+(?!@)(@)(if|elif|else|end|ifdef|endif|cc_on|set)\\b",
           "captures": {
             "1": {
               "name": "punctuation.definition.keyword.js"
@@ -785,7 +789,7 @@
         },
         {
           "name": "variable.other.conditional.js",
-          "match": "\\s*(?!@)(@)(_win32|_win16|_mac|_alpha|_x86|_mc680x0|_PowerPC|_jscript|_jscript_build|_jscript_version|_debug|_fast|[a-zA-Z]\\w+)",
+          "match": "\\s*+(?!@)(@)(_win32|_win16|_mac|_alpha|_x86|_mc680x0|_PowerPC|_jscript|_jscript_build|_jscript_version|_debug|_fast|[a-zA-Z]\\w+)",
           "captures": {
             "1": {
               "name": "punctuation.definition.variable.js"
@@ -808,7 +812,7 @@
       "patterns": [
         {
           "name": "punctuation.terminator.statement.js",
-          "match": "\\s*\\;"
+          "match": "\\s*+\\;"
         }
       ]
     },
@@ -816,7 +820,7 @@
       "patterns": [
         {
           "name": "meta.delimiter.comma.js",
-          "match": "\\s*,"
+          "match": "\\s*+,"
         }
       ]
     },
@@ -824,7 +828,7 @@
       "patterns": [
         {
           "comment": "these statements must end in a ;",
-          "begin": "\\s*(?<!\\.)\\b(const|let|var)\\b\\s+(?=[$_\\p{L}](?:[$\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}-]*+\\s*:))",
+          "begin": "\\s*+(?<!\\.)\\b(const|let|var)\\b\\s+(?=[$_\\p{L}](?:[$\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}-]*+\\s*+:))",
           "end": "\\s*\\;",
           "beginCaptures": {
             "1": {
@@ -844,7 +848,7 @@
         },
         {
           "comment": "these statements must end in a ;",
-          "begin": "\\s*(?<!\\.)\\b(const|let|var)\\b\\s+(?=(\\{(?:(?>[^{}]+)|\\g<-1>)*\\})\\s*:)",
+          "begin": "\\s*+(?<!\\.)\\b(const|let|var)\\b\\s+(?=(\\{(?:(?>[^{}]+)|\\g<-1>)*\\})\\s*+:)",
           "end": "\\s*\\;",
           "beginCaptures": {
             "1": {
@@ -864,7 +868,7 @@
         },
         {
           "comment": "these statements must end in a ;",
-          "begin": "\\s*(?<!\\.)\\b(const|let|var)\\b\\s+(?=(\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])\\s*:)",
+          "begin": "\\s*+(?<!\\.)\\b(const|let|var)\\b\\s+(?=(\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])\\s*+:)",
           "end": "\\s*\\;",
           "beginCaptures": {
             "1": {
@@ -885,7 +889,7 @@
         {
           "comment": "var statements that done start with a flow indicator",
           "name": "storage.type.js",
-          "match": "\\s*(?<!\\.)\\b(const|let|var)\\b"
+          "match": "\\s*+(?<!\\.)\\b(const|let|var)\\b"
         }
       ]
     },
@@ -894,8 +898,8 @@
         {
           "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*\\{)",
+          "begin": "\\s*+(?:\\b(async)\\b\\s+)?\\s*+(\\bfunction\\b)\\s*+(\\*?)\\s*+([_$a-zA-Z][$\\w]*)?\\s*+(?=\\(|<)",
+          "end": "(?=\\s*+\\{)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
             "1": {
@@ -920,8 +924,8 @@
         {
           "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*\\{)",
+          "begin": "\\s*+(\\b[_$a-zA-Z][$\\w]*)\\s*+(=)\\s*+(?:(async)\\s+)?\\s*+(\\bfunction\\b)\\s*+(\\*?)\\s*+([_$a-zA-Z][$\\w]*)?\\s*+(?=\\(|<)",
+          "end": "(?=\\s*+\\{)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
             "1": {
@@ -952,8 +956,8 @@
         {
           "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*\\{)",
+          "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*+\\{)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
             "1": {
@@ -996,8 +1000,8 @@
         {
           "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*\\{)",
+          "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*+\\{)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
             "1": {
@@ -1037,7 +1041,7 @@
       "patterns": [
         {
           "name": "string.quasi.js",
-          "begin": "\\s*([a-zA-Z$_][\\w$_]*)?(`)",
+          "begin": "\\s*+([a-zA-Z$_][\\w$_]*)?(`)",
           "end": "\\s*(?<!\\\\)`",
           "beginCaptures": {
             "1": {
@@ -1084,39 +1088,39 @@
       "patterns": [
         {
           "name": "keyword.operator.js",
-          "match": "\\s*(?<!\\.)\\b(delete|in|instanceof|new|of|typeof|void|with)\\b"
+          "match": "\\s*+(?<!\\.)\\b(delete|in|instanceof|new|of|typeof|void|with)\\b"
         },
         {
           "name": "keyword.operator.logical.js",
-          "match": "\\s*(!(?!=)|&&|\\|\\|)"
+          "match": "\\s*+(!(?!=)|&&|\\|\\|)"
         },
         {
           "name": "keyword.operator.assignment.js",
-          "match": "\\s*(=(?!=))"
+          "match": "\\s*+(=(?!(=|>)))"
         },
         {
           "name": "keyword.operator.assignment.augmented.js",
-          "match": "\\s*(%=|&=|\\*=|\\+=|-=|/=|\\^=|\\|=|<<=|>>=|>>>=)"
+          "match": "\\s*+(%=|&=|\\*=|\\+=|-=|/=|\\^=|\\|=|<<=|>>=|>>>=)"
         },
         {
           "name": "keyword.operator.bitwise.js",
-          "match": "\\s*(~|<<|>>>|>>|&|\\^|\\|)"
+          "match": "\\s*+(~|<<|>>>|>>|&|\\^|\\|)"
         },
         {
           "name": "keyword.operator.relational.js",
-          "match": "\\s*(<=|>=|<|>)"
+          "match": "\\s*+(<=|>=|<|>)"
         },
         {
           "name": "keyword.operator.comparison.js",
-          "match": "\\s*(===|!==|==|!=)"
+          "match": "\\s*+(===|!==|==|!=)"
         },
         {
           "name": "keyword.operator.arithmetic.js",
-          "match": "\\s*(--|\\+\\+|/(?!/|\\*)|%|\\*(?<!/\\*)|\\+|-)"
+          "match": "\\s*+(--|\\+\\+|/(?!/|\\*)|%|\\*(?<!/\\*)|\\+|-)"
         },
         {
           "comment": "ternary operator - make sure end : is consumed to avoid mistake as flow type",
-          "begin": "\\s*(\\?)",
+          "begin": "\\s*+(\\?)",
           "end": "\\s*(:)",
           "beginCaptures": {
             "1": {
@@ -1136,7 +1140,7 @@
         },
         {
           "name": "keyword.operator.spread.js",
-          "match": "\\s*(?<!\\.)\\.\\.\\."
+          "match": "\\s*+(?<!\\.)\\.\\.\\."
         },
         {
           "name": "keyword.operator.accessor.js",
@@ -1149,7 +1153,7 @@
       "patterns": [
         {
           "name": "meta.function-call.without-arguments.js",
-          "begin": "\\s*([_$a-zA-Z][$\\w]*)\\s*(?=\\(\\s*\\))",
+          "begin": "\\s*+([_$a-zA-Z][$\\w]*)\\s*+(?=\\(\\s*+\\))",
           "end": "\\s*(?<=\\))",
           "beginCaptures": {
             "1": {
@@ -1164,7 +1168,7 @@
         },
         {
           "name": "meta.function-call.without-arguments.js",
-          "begin": "\\s*(?=(\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])\\s*\\(\\s*\\))",
+          "begin": "\\s*+(?=(\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])\\s*+\\(\\s*+\\))",
           "end": "(?=.)",
           "applyEndPatternLast": 1,
           "patterns": [
@@ -1178,7 +1182,7 @@
         },
         {
           "name": "meta.function-call.with-arguments.js",
-          "begin": "\\s*([_$a-zA-Z][$\\w]*)\\s*(?=\\()",
+          "begin": "\\s*+([_$a-zA-Z][$\\w]*)\\s*+(?=\\()",
           "end": "(?=.)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -1194,7 +1198,7 @@
         },
         {
           "name": "meta.function-call.without-arguments.js",
-          "begin": "\\s*(?=(\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])\\s*\\()",
+          "begin": "\\s*+(?=(\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])\\s*+\\()",
           "end": "(?=.)",
           "applyEndPatternLast": 1,
           "patterns": [
@@ -1212,23 +1216,23 @@
       "patterns": [
         {
           "name": "constant.language.boolean.true.js",
-          "match": "\\s*(?<!\\.)\\btrue\\b"
+          "match": "\\s*+(?<!\\.)\\btrue\\b"
         },
         {
           "name": "constant.language.boolean.false.js",
-          "match": "\\s*(?<!\\.)\\bfalse\\b"
+          "match": "\\s*+(?<!\\.)\\bfalse\\b"
         },
         {
           "name": "constant.language.null.js",
-          "match": "\\s*(?<!\\.)\\bnull\\b"
+          "match": "\\s*+(?<!\\.)\\bnull\\b"
         },
         {
           "name": "constant.language.undefined.js",
-          "match": "\\s*(?<!\\.)\\bundefined\\b"
+          "match": "\\s*+(?<!\\.)\\bundefined\\b"
         },
         {
           "name": "constant.language.nan.js",
-          "match": "\\s*(?<!\\.)\\bNaN\\b"
+          "match": "\\s*+(?<!\\.)\\bNaN\\b"
         }
       ]
     },
@@ -1236,11 +1240,11 @@
       "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"
         },
         {
           "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"
         },
         {
           "name": "support.function.mutator.js",
@@ -1248,22 +1252,22 @@
         },
         {
           "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"
         },
         {
           "name": "keyword.other.js",
-          "match": "\\s*(?<!\\.)\\b(debugger)\\b"
+          "match": "\\s*+(?<!\\.)\\b(debugger)\\b"
         },
         {
           "name": "support.type.object.dom.js",
-          "match": "\\s*(?<!\\.)\\b(document|window)\\b"
+          "match": "\\s*+(?<!\\.)\\b(document|window)\\b"
         },
         {
           "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"
         },
         {
-          "match": "\\s*(?<!\\.)\\b(console)(?:(\\.)(warn|info|log|error|time|timeEnd|assert))?\\b",
+          "match": "\\s*+(?<!\\.)\\b(console)(?:(\\.)(warn|info|log|error|time|timeEnd|assert))?\\b",
           "captures": {
             "1": {
               "name": "support.type.object.console.js"
@@ -1277,7 +1281,7 @@
           }
         },
         {
-          "match": "\\s*(?<!\\.)\\b(process)(?:(\\.)(stdout|stderr|stdin|argv|execPath|execArgv|env|exitCode|version|versions|config|pid|title|arch|platform|mainModule))?\\b",
+          "match": "\\s*+(?<!\\.)\\b(process)(?:(\\.)(stdout|stderr|stdin|argv|execPath|execArgv|env|exitCode|version|versions|config|pid|title|arch|platform|mainModule))?\\b",
           "captures": {
             "1": {
               "name": "support.type.object.process.js"
@@ -1291,7 +1295,7 @@
           }
         },
         {
-          "match": "\\s*(?<!\\.)\\b(process)(?:(\\.)(abort|chdir|cwd|exit|getgid|setgid|getuid|setuid|setgroups|getgroups|initgroups|kill|memoryUsage|nextTick|umask|uptime|hrtime))?\\b",
+          "match": "\\s*+(?<!\\.)\\b(process)(?:(\\.)(abort|chdir|cwd|exit|getgid|setgid|getuid|setuid|setgroups|getgroups|initgroups|kill|memoryUsage|nextTick|umask|uptime|hrtime))?\\b",
           "captures": {
             "1": {
               "name": "support.type.object.process.js"
@@ -1305,7 +1309,7 @@
           }
         },
         {
-          "match": "\\s*\\b(((?<!\\.)module\\.((?<!\\,)exports|id|require|parent|filename|loaded|children)|exports))\\b",
+          "match": "\\s*+\\b(((?<!\\.)module\\.((?<!\\,)exports|id|require|parent|filename|loaded|children)|exports))\\b",
           "captures": {
             "1": {
               "name": "support.type.object.module.js"
@@ -1320,15 +1324,15 @@
         },
         {
           "name": "support.type.object.node.js",
-          "match": "\\s*(?<!\\.)\\b(global|GLOBAL|root|__dirname|__filename)\\b"
+          "match": "\\s*+(?<!\\.)\\b(global|GLOBAL|root|__dirname|__filename)\\b"
         },
         {
           "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"
         },
         {
           "name": "meta.tag.mustache.js",
-          "begin": "\\s*{{",
+          "begin": "\\s*+{{",
           "end": "\\s*}}"
         }
       ]
@@ -1337,7 +1341,7 @@
       "patterns": [
         {
           "comment": "Classes",
-          "begin": "\\s*(?<!\\.)\\b(class)\\s+",
+          "begin": "\\s*+(?<!\\.)\\b(class)\\s+",
           "end": "\\s*(})",
           "beginCaptures": {
             "0": {
@@ -1354,7 +1358,7 @@
           },
           "patterns": [
             {
-              "match": "\\s*\\b(extends)\\b\\s*",
+              "match": "\\s*+\\b(extends)\\b\\s*+",
               "captures": {
                 "0": {
                   "name": "meta.class.extends.js"
@@ -1371,7 +1375,7 @@
               "include": "#flowtype-polymorphs"
             },
             {
-              "begin": "\\s*{",
+              "begin": "\\s*+{",
               "end": "\\s*(?=})",
               "contentName": "meta.class.body.js",
               "beginCaptures": {
@@ -1381,7 +1385,7 @@
               },
               "patterns": [
                 {
-                  "match": "\\s*\\b(?<!\\.)static\\b(?!\\.)",
+                  "match": "\\s*+\\b(?<!\\.)static\\b(?!\\.)",
                   "name": "storage.modifier.js"
                 },
                 {
@@ -1416,7 +1420,7 @@
         {
           "name": "meta.function-call.static.without-arguments.js",
           "comment": "e.g Abc.aaa()",
-          "match": "\\s*(?:(?<=\\.)|\\b)([A-Z][$\\w]*)\\s*(\\.)([_$a-zA-Z][$\\w]*)\\s*(\\(\\s*\\))",
+          "match": "\\s*+(?:(?<=\\.)|\\b)([A-Z][$\\w]*)\\s*+(\\.)([_$a-zA-Z][$\\w]*)\\s*+(\\(\\s*+\\))",
           "captures": {
             "1": {
               "name": "variable.other.class.js"
@@ -1434,7 +1438,7 @@
         },
         {
           "name": "meta.function-call.static.with-arguments.js",
-          "match": "\\s*(?:(?<=\\.)|\\b)\\s*([A-Z][$\\w]*)\\s*(\\.)([_$a-zA-Z][$\\w]*)\\s*(?=\\()",
+          "match": "\\s*+(?:(?<=\\.)|\\b)\\s*+([A-Z][$\\w]*)\\s*+(\\.)([_$a-zA-Z][$\\w]*)\\s*+(?=\\()",
           "captures": {
             "1": {
               "name": "variable.other.class.js"
@@ -1449,7 +1453,7 @@
         },
         {
           "name": "meta.function-call.method.without-arguments.js",
-          "match": "\\s*(?<=\\.)\\s*([_$a-zA-Z][$\\w]*)\\s*(\\(\\s*\\))",
+          "match": "\\s*+(?<=\\.)\\s*+([_$a-zA-Z][$\\w]*)\\s*+(\\(\\s*+\\))",
           "captures": {
             "1": {
               "name": "entity.name.function.js"
@@ -1461,7 +1465,7 @@
         },
         {
           "name": "meta.function-call.method.with-arguments.js",
-          "match": "\\s*(?<=\\.)([_$a-zA-Z][$\\w]*)\\s*(?=\\()",
+          "match": "\\s*+(?<=\\.)([_$a-zA-Z][$\\w]*)\\s*+(?=\\()",
           "captures": {
             "1": {
               "name": "entity.name.function.js"
@@ -1474,31 +1478,31 @@
       "patterns": [
         {
           "name": "variable.language.arguments.js",
-          "match": "\\s*(?<!(?<!\\.\\.)\\.)\\b(arguments)\\b"
+          "match": "\\s*+(?<!(?<!\\.\\.)\\.)\\b(arguments)\\b"
         },
         {
           "name": "variable.language.super.js",
-          "match": "\\s*(?<!(?<!\\.\\.)\\.)\\b(super)\\b\\s*(?!\\()"
+          "match": "\\s*+(?<!(?<!\\.\\.)\\.)\\b(super)\\b\\s*+(?!\\()"
         },
         {
           "name": "variable.language.this.js",
-          "match": "\\s*(?<!(?<!\\.\\.)\\.)\\b(this)\\b"
+          "match": "\\s*+(?<!(?<!\\.\\.)\\.)\\b(this)\\b"
         },
         {
           "name": "variable.language.self.js",
-          "match": "\\s*(?<!(?<!\\.\\.)\\.)\\b(self)\\b\\s*(?!\\()"
+          "match": "\\s*+(?<!(?<!\\.\\.)\\.)\\b(self)\\b\\s*+(?!\\()"
         },
         {
           "name": "variable.language.proto.js",
-          "match": "\\s*(?<=\\.)\\b(__proto__)\\b"
+          "match": "\\s*+(?<=\\.)\\b(__proto__)\\b"
         },
         {
           "name": "variable.language.constructor.js",
-          "match": "\\s*(?<=\\.)\\b(constructor)\\b\\s*(?!\\()"
+          "match": "\\s*+(?<=\\.)\\b(constructor)\\b\\s*+(?!\\()"
         },
         {
           "name": "variable.language.prototype.js",
-          "match": "\\s*(?<=\\.)\\b(prototype)\\b"
+          "match": "\\s*+(?<=\\.)\\b(prototype)\\b"
         }
       ]
     },
@@ -1506,7 +1510,7 @@
       "patterns": [
         {
           "name": "constant.character.escape.newline.js",
-          "match": "\\\\\\s*\\n"
+          "match": "\\\\\n"
         },
         {
           "name": "constant.character.escape",
@@ -1525,23 +1529,7 @@
     "literal-number": {
       "patterns": [
         {
-          "match": "\\s*((?i)(?:\\B[-+]|\\b)0x[0-9a-f]*\\.(\\B|\\b[0-9]+))",
-          "captures": {
-            "1": {
-              "name": "invalid.illegal.numeric.hex.js"
-            }
-          }
-        },
-        {
-          "match": "\\s*((?:\\B[-+]|\\b)0[0-9]+\\.(\\B|\\b[0-9]+))",
-          "captures": {
-            "1": {
-              "name": "invalid.illegal.numeric.octal.js"
-            }
-          }
-        },
-        {
-          "match": "\\s*((?:\\B[-+])?(?:\\b0b[0-1]*|\\b0o[0-7]*|\\b0x[0-9a-f]*|(\\B\\.[0-9]+|\\b[0-9]+(\\.[0-9]*)?)(e[-+]?[0-9]+)?))",
+          "match": "\\s*+((?:\\B[-+])?(?:\\b0[bB][0-1]*|\\b0[oO][0-7]*|\\b0[xX][0-9a-fA-F]*|(\\B\\.[0-9]+|\\b[0-9]+(\\.[0-9]*)?)([eE][-+]?[0-9]+)?))",
           "captures": {
             "1": {
               "name": "constant.numeric.js"
@@ -1549,7 +1537,7 @@
           }
         },
         {
-          "match": "\\s*((?:\\B[-+]|\\b)(Infinity)\\b)",
+          "match": "\\s*+((?:\\B[-+]|\\b)(Infinity)\\b)",
           "captures": {
             "1": {
               "name": "constant.language.infinity.js"
@@ -1563,7 +1551,7 @@
         {
           "disabled": 1,
           "name": "meta.instance.constructor",
-          "begin": "\\s*(new)\\s+(?=[_$a-zA-Z][$\\w.]*)",
+          "begin": "\\s*+(new)\\s+(?=[_$a-zA-Z][$\\w.]*)",
           "end": "(?![_$a-zA-Z][$\\w.]*)",
           "beginCaptures": {
             "1": {
@@ -1591,7 +1579,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*(((')((?:[^']|\\\\')*)('))|\\s*((\")((?:[^\"]|\\\\\")*)(\")))|\\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*+(((')((?:[^']|\\\\')*)('))|\\s*+((\")((?:[^\"]|\\\\\")*)(\")))|\\s*+[x0-9A-Fa-f]+))*\\s*+=>)",
           "end": "\\s*(=>)",
           "applyEndPatternLast": 1,
           "endCaptures": {
@@ -1613,7 +1601,7 @@
         {
           "comment": "e.g. arg => { }",
           "name": "meta.function.arrow.js",
-          "begin": "\\s*(\\basync\\b)?\\s*(?=(<(?:(?>[^<>]+)|\\g<-1>)*>)?\\s*([_$a-zA-Z][$\\w]*)\\s*(?:\\s*(:|\\|)(\\s*[$_a-zA-Z0-9]+(<(?:(?>[^<>]+)|\\g<-1>)*>)?|\\s*(\\{(?:(?>[^{}]+)|\\g<-1>)*\\})|\\s*(((')((?:[^']|\\\\')*)('))|\\s*((\")((?:[^\"]|\\\\\")*)(\")))|\\s*[x0-9A-Fa-f]+))*\\s*=>)",
+          "begin": "\\s*+(\\basync\\b)?\\s*+(?=(<(?:(?>[^<>]+)|\\g<-1>)*>)?\\s*+([_$a-zA-Z][$\\w]*)\\s*+(?:\\s*+(:|\\|)(\\s*+[$_a-zA-Z0-9]+(<(?:(?>[^<>]+)|\\g<-1>)*>)?|\\s*+(\\{(?:(?>[^{}]+)|\\g<-1>)*\\})|\\s*+(((')((?:[^']|\\\\')*)('))|\\s*+((\")((?:[^\"]|\\\\\")*)(\")))|\\s*+[x0-9A-Fa-f]+))*\\s*+=>)",
           "end": "\\s*(=>)",
           "beginCaptures": {
             "1": {
@@ -1637,7 +1625,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*(((')((?:[^']|\\\\')*)('))|\\s*((\")((?:[^\"]|\\\\\")*)(\")))|\\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*+(((')((?:[^']|\\\\')*)('))|\\s*+((\")((?:[^\"]|\\\\\")*)(\")))|\\s*+[x0-9A-Fa-f]+))*\\s*+=>)",
           "end": "\\s*(=>)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -1665,7 +1653,7 @@
         {
           "comment": "e.g. play = arg => { }",
           "name": "meta.function.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*(((')((?:[^']|\\\\')*)('))|\\s*((\")((?:[^\"]|\\\\\")*)(\")))|\\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*+(((')((?:[^']|\\\\')*)('))|\\s*+((\")((?:[^\"]|\\\\\")*)(\")))|\\s*+[x0-9A-Fa-f]+))*\\s*+=>)",
           "end": "\\s*(=>)",
           "beginCaptures": {
             "1": {
@@ -1695,7 +1683,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*(((')((?:[^']|\\\\')*)('))|\\s*((\")((?:[^\"]|\\\\\")*)(\")))|\\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*+(((')((?:[^']|\\\\')*)('))|\\s*+((\")((?:[^\"]|\\\\\")*)(\")))|\\s*+[x0-9A-Fa-f]+))*\\s*+=>)",
           "end": "\\s*(=>)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -1735,7 +1723,7 @@
         {
           "comment": "e.g. Sound.prototype.play = arg => { }",
           "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*([_$a-zA-Z][$\\w]*)\\s*(?:\\s*(:|\\|)(\\s*[$_a-zA-Z0-9]+(<(?:(?>[^<>]+)|\\g<-1>)*>)?|\\s*(\\{(?:(?>[^{}]+)|\\g<-1>)*\\})|\\s*(((')((?:[^']|\\\\')*)('))|\\s*((\")((?:[^\"]|\\\\\")*)(\")))|\\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*+([_$a-zA-Z][$\\w]*)\\s*+(?:\\s*+(:|\\|)(\\s*+[$_a-zA-Z0-9]+(<(?:(?>[^<>]+)|\\g<-1>)*>)?|\\s*+(\\{(?:(?>[^{}]+)|\\g<-1>)*\\})|\\s*+(((')((?:[^']|\\\\')*)('))|\\s*+((\")((?:[^\"]|\\\\\")*)(\")))|\\s*+[x0-9A-Fa-f]+))*\\s*+=>)",
           "end": "\\s*(=>)",
           "beginCaptures": {
             "1": {
@@ -1777,7 +1765,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*(((')((?:[^']|\\\\')*)('))|\\s*((\")((?:[^\"]|\\\\\")*)(\")))|\\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*+(((')((?:[^']|\\\\')*)('))|\\s*+((\")((?:[^\"]|\\\\\")*)(\")))|\\s*+[x0-9A-Fa-f]+))*\\s*+=>)",
           "end": "\\s*(=>)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -1811,7 +1799,7 @@
         {
           "comment": "e.g. Sound.play = arg => { }",
           "name": "meta.function.static.arrow.js",
-          "begin": "\\s*(\\b_?[A-Z][$\\w]*)?(\\.)([_$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*(((')((?:[^']|\\\\')*)('))|\\s*((\")((?:[^\"]|\\\\\")*)(\")))|\\s*[x0-9A-Fa-f]+))*\\s*=>)",
+          "begin": "\\s*+(\\b_?[A-Z][$\\w]*)?(\\.)([_$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*+(((')((?:[^']|\\\\')*)('))|\\s*+((\")((?:[^\"]|\\\\\")*)(\")))|\\s*+[x0-9A-Fa-f]+))*\\s*+=>)",
           "end": "\\s*(=>)",
           "beginCaptures": {
             "1": {
@@ -1851,7 +1839,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*(?<!\\.)([_$a-zA-Z][$\\w]*)\\s*(?=(<(?:(?>[^<>]+)|\\g<-1>)*>)?(\\())",
+          "begin": "\\s*++(\\bstatic\\b)?\\s*++(\\basync\\b)?\\s*++(\\*?)\\s*++(?<!\\.)([_$a-zA-Z][$\\w]*)\\s*++(?=(<(?:(?>[^<>]+)|\\g<-1>)*>)?(\\())",
           "end": "\\s*(?=.)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -1877,7 +1865,7 @@
         {
           "comment": "e.g. [var]<T,T>(arg1, arg2): Type<T> { } or 'var'<T,T>(arg1, arg2)",
           "name": "meta.function.method.js",
-          "begin": "\\s*(\\bstatic\\b)?\\s*(\\basync\\b)?\\s*(\\*?)\\s*(?=((\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])|\\s*(((')((?:[^']|\\\\')*)('))|\\s*((\")((?:[^\"]|\\\\\")*)(\"))))\\s*(<(?:(?>[^<>]+)|\\g<-1>)*>)?\\s*(\\())",
+          "begin": "\\s*++(\\bstatic\\b)?\\s*++(\\basync\\b)?\\s*++(\\*?)\\s*++(?=((\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])|\\s*+(((')((?:[^']|\\\\')*)('))|\\s*+((\")((?:[^\"]|\\\\\")*)(\"))))\\s*+(<(?:(?>[^<>]+)|\\g<-1>)*>)?\\s*+(\\())",
           "end": "\\s*(?=.)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -1912,7 +1900,7 @@
         {
           "comment": "getter/setter",
           "name": "meta.accessor.js",
-          "begin": "\\s*\\b(?:(static)\\s+)?(get|set)\\s+([_$a-zA-Z][$\\w]*)\\s*(?=\\()",
+          "begin": "\\s*+\\b(?:(static)\\s+)?(get|set)\\s+([_$a-zA-Z][$\\w]*)\\s*+(?=\\()",
           "end": "\\s*(?={)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -1935,7 +1923,7 @@
         {
           "comment": "getter/setter set [var]() or get 'name'()",
           "name": "meta.accessor.js",
-          "begin": "\\s*\\b(?:(static)\\s+)?(get|set)\\s+(?=((\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])|\\s*(((')((?:[^']|\\\\')*)('))|\\s*((\")((?:[^\"]|\\\\\")*)(\"))))\\s*(\\())",
+          "begin": "\\s*+\\b(?:(static)\\s+)?(get|set)\\s+(?=((\\[(?:(?>[^\\[\\]]+)|\\g<-1>)*\\])|\\s*+(((')((?:[^']|\\\\')*)('))|\\s*+((\")((?:[^\"]|\\\\\")*)(\"))))\\s*+(\\())",
           "end": "\\s*(?={)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -1967,8 +1955,8 @@
       "patterns": [
         {
           "name": "string.regexp.js",
-          "begin": "(?<=\\.|\\(|,|{|}|\\[|;|,|<|>|<=|>=|==|!=|===|!==|\\+|-|\\*|%|\\+\\+|--|<<|>>|>>>|&|\\||\\^|!|~|&&|\\|\\||\\?|:|=|\\+=|-=|\\*=|%=|<<=|>>=|>>>=|&=|\\|=|\\^=|/|/=|\\Wnew|\\Wdelete|\\Wvoid|\\Wtypeof|\\Winstanceof|\\Win|\\Wdo|\\Wreturn|\\Wcase|\\Wthrow|^new|^delete|^void|^typeof|^instanceof|^in|^do|^return|^case|^throw|^)\\s*(/)(?!/|\\*|$)",
-          "end": "(/)([gimy]*)",
+          "begin": "(?<=\\.|\\(|,|{|}|\\[|;|,|<|>|<=|>=|==|!=|===|!==|\\+|-|\\*|%|\\+\\+|--|<<|>>|>>>|&|\\||\\^|!|~|&&|\\|\\||\\?|:|=|\\+=|-=|\\*=|%=|<<=|>>=|>>>=|&=|\\|=|\\^=|/|/=|\\Wnew|\\Wdelete|\\Wvoid|\\Wtypeof|\\Winstanceof|\\Win|\\Wdo|\\Wreturn|\\Wcase|\\Wthrow|^new|^delete|^void|^typeof|^instanceof|^in|^do|^return|^case|^throw|^)\\s*+(/)(?!/|\\*|$)",
+          "end": "(/)([gimyu]*)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.string.begin.js"
@@ -1994,8 +1982,8 @@
       "patterns": [
         {
           "contentName": "string.quoted.single.js",
-          "begin": "\\s*(('))",
-          "end": "(('))|(\\n)",
+          "begin": "\\s*+(('))",
+          "end": "\\s*+(?:(('))|(\n))",
           "beginCaptures": {
             "1": {
               "name": "string.quoted.single.js"
@@ -2023,8 +2011,8 @@
         },
         {
           "contentName": "string.quoted.double.js",
-          "begin": "\\s*((\"))",
-          "end": "((\"))|(\\n)",
+          "begin": "\\s*+((\"))",
+          "end": "\\s*+(?:((\"))|(\n))",
           "beginCaptures": {
             "1": {
               "name": "string.quoted.double.js"
@@ -2056,11 +2044,11 @@
       "patterns": [
         {
           "name": "keyword.control.module.js",
-          "match": "\\s*(?<!\\.)\\b(import|export|default)\\b"
+          "match": "\\s*+(?<!\\.)\\b(import|export|default)\\b"
         },
         {
           "name": "keyword.control.module.reference.js",
-          "match": "\\s*(?<!\\.)\\b(from|as)\\b"
+          "match": "\\s*+(?<!\\.)\\b(from|as)\\b"
         }
       ]
     },
@@ -2069,17 +2057,17 @@
         {
           "comment": "e.g. CONSTANT",
           "name": "variable.other.constant.js",
-          "match": "\\s*[A-Z][_$\\dA-Z]*\\b"
+          "match": "\\s*+[A-Z][_$\\dA-Z]*\\b"
         },
         {
           "comment": "e.g. dollar vars",
           "name": "variable.other.dollar.js",
-          "match": "\\s*\\$[$\\w]*"
+          "match": "\\s*+\\$[$\\w]*"
         },
         {
           "comment": "e.g. Class.property",
           "name": "meta.property.class.js",
-          "match": "\\s*\\b([A-Z][$\\w]*)\\s*(\\.)([_$a-zA-Z][$\\w]*)",
+          "match": "\\s*+\\b([A-Z][$\\w]*)\\s*+(\\.)([_$a-zA-Z][$\\w]*)",
           "captures": {
             "1": {
               "name": "variable.other.class.js"
@@ -2095,7 +2083,7 @@
         {
           "comment": "e.g. obj.property",
           "name": "variable.other.object.js",
-          "match": "\\s*(?<!\\.)[_$a-zA-Z][$\\w]*\\s*(?=[\\[\\.])",
+          "match": "\\s*+(?<!\\.)[_$a-zA-Z][$\\w]*\\s*+(?=[\\[\\.])",
           "captures": {
             "1": {
               "name": "variable.other.object.js"
@@ -2105,7 +2093,7 @@
         {
           "comment": "e.g. obj.property",
           "name": "meta.property.object.js",
-          "match": "\\s*(?<=\\.)\\s*[_$a-zA-Z][$\\w]*",
+          "match": "\\s*+(?<=\\.)\\s*+[_$a-zA-Z][$\\w]*",
           "captures": {
             "0": {
               "name": "variable.other.property.js"
@@ -2114,7 +2102,7 @@
         },
         {
           "name": "variable.other.readwrite.js",
-          "match": "\\s*[_$a-zA-Z][$\\w]*"
+          "match": "\\s*+[_$a-zA-Z][$\\w]*"
         }
       ]
     },
@@ -2123,7 +2111,7 @@
         {
           "comment": "e.g. Sound.prototype",
           "name": "meta.prototype.access.js",
-          "match": "\\s*([_$a-zA-Z][$\\w]*)(\\.)(prototype)\\b",
+          "match": "\\s*+([_$a-zA-Z][$\\w]*)(\\.)(prototype)\\b",
           "captures": {
             "1": {
               "name": "entity.name.class.js"
@@ -2139,7 +2127,7 @@
         {
           "comment": "e.g. Sound.prototype = { }",
           "name": "meta.prototype.declaration.js",
-          "match": "\\s*([_$a-zA-Z][$\\w]*)(\\.)(prototype)\\s*=\\s*",
+          "match": "\\s*+([_$a-zA-Z][$\\w]*)(\\.)(prototype)\\s*+=\\s*+",
           "captures": {
             "1": {
               "name": "entity.name.class.js"
@@ -2159,7 +2147,7 @@
         {
           "comment": "https://github.com/wycats/javascript-decorators",
           "name": "tag.decorator.js",
-          "match": "\\s*(?<!@)(@)([_$a-zA-Z][$\\w]*)\\b",
+          "match": "\\s*+(?<!@)(@)([_$a-zA-Z][$\\w]*)\\b",
           "captures": {
             "1": {
               "name": "punctuation.definition.tag.js"
@@ -2175,7 +2163,7 @@
       "comment": "Avoid < operator expressions as best we can using Zertosh's regex",
       "patterns": [
         {
-          "begin": "(?<=\\(|\\{|\\[|,|&&|\\|\\||\\?|:|=|=>|\\Wreturn|^return|^)\\s*(?=<[_$a-zA-Z])",
+          "begin": "(?<=\\(|\\{|\\[|,|&&|\\|\\||\\?|:|=|=>|\\Wreturn|^return|\\Wdefault|^)\\s*+(?=<[_$a-zA-Z])",
           "end": "(?=.)",
           "applyEndPatternLast": 1,
           "patterns": [
@@ -2191,7 +2179,7 @@
         {
           "comment": "Tags that end > are trapped in #jsx-tag-termination",
           "name": "meta.tag.jsx",
-          "begin": "\\s*(<)([$_\\p{L}](?:[$.:\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}-](?<!\\.\\.))*+)(?=[/>\\s])(?<![\\.:])",
+          "begin": "\\s*+(<)([$_\\p{L}](?:[$.:\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}-](?<!\\.\\.))*+)(?=[/>\\s])(?<![\\.:])",
           "end": "\\s*(?<=</)(\\2)(>)|(/>)|((?<=</)[\\S ]*?)>",
           "beginCaptures": {
             "1": {
@@ -2410,13 +2398,16 @@
         },
         {
           "comment": "Entity with & and invalid name",
-          "match": "&\\S*;",
+          "match": "&\\s*+;",
           "name": "invalid.illegal.bad-ampersand.jsx"
         }
       ]
     },
     "flowtype": {
       "patterns": [
+        {
+          "include": "#comments"
+        },
         {
           "include": "#flowtype-polymorphs"
         },
@@ -2432,7 +2423,7 @@
       "patterns": [
         {
           "comment": "maybe an issue if a object literal is returned and the start of func block isn't on same line!",
-          "begin": "(?<=\\))\\s*(:)",
+          "begin": "(?<=\\))\\s*+(:)",
           "end": "(?=.)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -2452,7 +2443,7 @@
       "patterns": [
         {
           "comment": "name of variable spread var with flowtype :",
-          "match": "\\s*((?<!\\.)\\.\\.\\.)?([$_\\p{L}](?:[$.\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}])*+)\\s*(\\??)\\s*(?=:|=>)",
+          "match": "\\s*+((?<!\\.)\\.\\.\\.)?([$_\\p{L}](?:[$.\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}])*+)\\s*+(\\??)\\s*+(?=:|=>)",
           "captures": {
             "1": {
               "name": "keyword.operator.spread.js"
@@ -2474,7 +2465,7 @@
       "comment": "use this pattern to colour code the variable part correctly",
       "patterns": [
         {
-          "begin": "\\s*{",
+          "begin": "\\s*+{",
           "end": "\\s*}",
           "patterns": [
             {
@@ -2483,7 +2474,7 @@
           ]
         },
         {
-          "begin": "\\s*\\[",
+          "begin": "\\s*+\\[",
           "end": "\\s*\\]",
           "patterns": [
             {
@@ -2493,7 +2484,7 @@
         },
         {
           "comment": "string as destructor target",
-          "match": "\\s*((['\\\"]).*?\\k<-1>(?<!\\\\.))\\s*(:)\\s*(([$_\\p{L}](?:[$.\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}])*+))",
+          "match": "\\s*+((['\\\"]).*?\\k<-1>(?<!\\\\.))\\s*+(:)\\s*+(([$_\\p{L}](?:[$.\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}])*+))",
           "captures": {
             "1": {
               "name": "string.quoted.js"
@@ -2508,7 +2499,7 @@
         },
         {
           "comment": "prop name : var name as destructor target",
-          "match": "\\s*([$_\\p{L}](?:[$.\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}])*+)\\s*(:)\\s*(([$_\\p{L}](?:[$.\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}])*+))",
+          "match": "\\s*+([$_\\p{L}](?:[$.\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}])*+)\\s*+(:)\\s*+(([$_\\p{L}](?:[$.\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}])*+))",
           "captures": {
             "1": {
               "name": "string.unquoted.js"
@@ -2523,7 +2514,7 @@
         },
         {
           "comment": "var name as destructor target",
-          "match": "\\s*((?<!\\.)\\.\\.\\.)?([$_\\p{L}](?:[$.\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}])*+)",
+          "match": "\\s*+((?<!\\.)\\.\\.\\.)?([$_\\p{L}](?:[$.\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}])*+)",
           "captures": {
             "1": {
               "name": "keyword.operator.spread.js"
@@ -2546,11 +2537,11 @@
         {
           "comment": "flowtype optional arg/parameter e.g. protocol? : string",
           "name": "punctuation.type.flowtype",
-          "match": "\\?(?=\\s*:)"
+          "match": "\\?(?=\\s*+:)"
         },
         {
           "comment": "typed entity :",
-          "begin": "\\s*(:)",
+          "begin": "\\s*+(:)",
           "end": "(?=.)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -2569,10 +2560,10 @@
         },
         {
           "comment": "An Iterator prefix?",
-          "match": "\\s*@@"
+          "match": "\\s*+@@"
         },
         {
-          "match": "\\s*(=>)",
+          "match": "\\s*+(=>)",
           "captures": {
             "1": {
               "name": "storage.type.function.arrow.js"
@@ -2594,7 +2585,7 @@
       "patterns": [
         {
           "comment": "call back with a form  ) => type",
-          "begin": "(?<=\\))\\s*(=>)",
+          "begin": "(?<=\\))\\s*+(=>)",
           "end": "(?=.)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -2610,7 +2601,7 @@
         },
         {
           "comment": "some form of default assignment for func args",
-          "begin": "\\s*=(?!>|=|==)",
+          "begin": "\\s*+=(?!>|=|==)",
           "end": "\\s*(?=,|;|\\))",
           "beginCaptures": {
             "0": {
@@ -2630,15 +2621,15 @@
         {
           "comment": "Maybe types",
           "name": "keyword.operator.maybe.flowtype",
-          "match": "\\s*\\?"
+          "match": "\\s*+\\?"
         },
         {
           "name": "keyword.operator.flowtype",
-          "match": "\\s*\\btypeof\\b\\s*"
+          "match": "\\s*+\\btypeof\\b\\s*+"
         },
         {
           "comment": "primitive flowtypes",
-          "match": "\\s*\\b((?>any|boolean|mixed|number|string|void))\\b",
+          "match": "\\s*+\\b((?>any|boolean|mixed|number|string|void))\\b",
           "captures": {
             "1": {
               "name": "support.type.builtin.primitive.flowtype"
@@ -2647,7 +2638,7 @@
         },
         {
           "comment": "Built-in Class Types",
-          "match": "\\s*\\b((?>ArrayBuffer|ArrayBufferView|Boolean|Date|DataView|Error|EvalError|Float32Array|Float64Array|Function|Int8Array|Int16Array|Int32Array|JSON|Math|Number|Object|RangeError|ReferenceError|RegExp|String|Symbol|TypeError|Uint8Array|Uint16Array|Uint32Array|Uint8ClampedArray))\\b",
+          "match": "\\s*+\\b((?>ArrayBuffer|ArrayBufferView|Boolean|Date|DataView|Error|EvalError|Float32Array|Float64Array|Function|Int8Array|Int16Array|Int32Array|JSON|Math|Number|Object|RangeError|ReferenceError|RegExp|String|Symbol|TypeError|Uint8Array|Uint16Array|Uint32Array|Uint8ClampedArray))\\b",
           "captures": {
             "1": {
               "name": "support.type.builtin.class.flowtype"
@@ -2659,7 +2650,7 @@
         },
         {
           "comment": "custom Class Types e.g. Abc avoid Abc(",
-          "match": "\\s*([$_[\\p{Lu}\\p{Lt}\\p{Lm}\\p{Lo}]][$.\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}]*+)(?!\\s*\\()",
+          "match": "\\s*+([$_[\\p{Lu}\\p{Lt}\\p{Lm}\\p{Lo}]][$.\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}]*+)(?!\\s*+\\()",
           "captures": {
             "1": {
               "name": "support.type.class.flowtype"
@@ -2668,7 +2659,7 @@
         },
         {
           "comment": "custom primitive/var Types e.g. abc avoid abc(",
-          "match": "\\s*([$_\\p{L}][$.\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}]*+)(?!\\s*\\()",
+          "match": "\\s*+([$_\\p{L}][$.\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}]*+)(?!\\s*+\\()",
           "captures": {
             "1": {
               "name": "support.type.primitive.flowtype"
@@ -2678,17 +2669,17 @@
         {
           "comment": "Type Unions |",
           "name": "kewyword.operator.union.flowtype",
-          "match": "\\s*\\|"
+          "match": "\\s*+\\|"
         },
         {
           "comment": "intersection of types &",
           "name": "kewyword.operator.intersection.flowtype",
-          "match": "\\s*\\&"
+          "match": "\\s*+\\&"
         },
         {
           "comment": "as per React declares in flowtype github",
           "name": "kewyword.operator.existential.flowtype",
-          "match": "\\s*\\*"
+          "match": "\\s*+\\*"
         },
         {
           "include": "#literal-string"
@@ -2717,7 +2708,7 @@
       "patterns": [
         {
           "comment": "Get parameters within a function/method call",
-          "begin": "\\s*(\\()",
+          "begin": "\\s*+(\\()",
           "end": "\\s*(\\))",
           "beginCaptures": {
             "1": {
@@ -2742,7 +2733,7 @@
       "patterns": [
         {
           "comment": "Built-in Class Types with elements of type <T>",
-          "begin": "\\s*\\b((?>Array|Class|Map|Promise|Set|WeakMap|WeakSet))\\s*(<)",
+          "begin": "\\s*+\\b((?>Array|Class|Map|Promise|Set|WeakMap|WeakSet))\\s*+(<)",
           "end": "\\s*(>)",
           "beginCaptures": {
             "1": {
@@ -2759,11 +2750,11 @@
           },
           "patterns": [
             {
-              "match": "\\s*,",
+              "match": "\\s*+,",
               "name": "punctuation.type.separator.flowtype"
             },
             {
-              "match": "\\s*:",
+              "match": "\\s*+:",
               "name": "punctuation.type.separator.flowtype"
             },
             {
@@ -2773,7 +2764,7 @@
         },
         {
           "comment": "just the polymorph bit like this <K,V>(arg,arg)",
-          "begin": "\\s*(<)(?!<)",
+          "begin": "\\s*+(<)(?!<)",
           "end": "\\s*(>)",
           "beginCaptures": {
             "1": {
@@ -2787,11 +2778,11 @@
           },
           "patterns": [
             {
-              "match": "\\s*,",
+              "match": "\\s*+,",
               "name": "punctuation.type.separator.flowtype"
             },
             {
-              "match": "\\s*:",
+              "match": "\\s*+:",
               "name": "punctuation.type.separator.flowtype"
             },
             {
@@ -2803,7 +2794,7 @@
     },
     "flowtype-parse-objects": {
       "comment": "object literal flowtype  preceded by either  : | & ? symbols",
-      "begin": "(?<=:|\\||&|\\?)\\s*(\\{)",
+      "begin": "(?<=:|\\||&|\\?)\\s*+(\\{)",
       "end": "\\s*(\\})",
       "applyEndPatternLast": 1,
       "beginCaptures": {
@@ -2826,7 +2817,7 @@
       "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*(?=:)",
+          "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"
@@ -2843,7 +2834,7 @@
     },
     "flowtype-parse-array": {
       "comment": "arrays such as [name: string, dob: Date]",
-      "begin": "\\s*(\\[)",
+      "begin": "\\s*+(\\[)",
       "end": "\\s*(\\])",
       "beginCaptures": {
         "1": {
@@ -2865,7 +2856,7 @@
       "patterns": [
         {
           "comment": "import for types",
-          "match": "\\s*(?<!\\.)\\b(import)\\b\\s*(type)\\b",
+          "match": "\\s*+(?<!\\.)\\b(import)\\b\\s*+(type)\\b",
           "captures": {
             "1": {
               "name": "keyword.control.module.js"
@@ -2877,7 +2868,7 @@
         },
         {
           "comment": "type aliases for export but avoid type instaceof or type in operators",
-          "begin": "\\s*\\b(type)\\b\\s+(?!(instanceof|in)\\b)(?=[$_\\p{L}])",
+          "begin": "\\s*+\\b(type)\\b\\s+(?!(instanceof|in)\\b)(?=[$_\\p{L}])",
           "end": "\\s*;|\\n",
           "beginCaptures": {
             "1": {
@@ -2891,10 +2882,10 @@
           },
           "patterns": [
             {
-              "match": "\\s*="
+              "match": "\\s*+="
             },
             {
-              "begin": "\\s*{",
+              "begin": "\\s*+{",
               "end": "\\s*}",
               "applyEndPatternLast": 1,
               "beginCaptures": {
@@ -2942,7 +2933,7 @@
       "patterns": [
         {
           "comment": "find declare module and declare class defs",
-          "begin": "\\s*\\b(interface)\\s+(?=[$_\\p{L}])",
+          "begin": "\\s*+\\b(interface)\\s+(?=[$_\\p{L}])",
           "end": "\\s*(?:(;)|\\n|(}))",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -2963,7 +2954,7 @@
               "include": "#comments"
             },
             {
-              "match": "\\s*\\b(extends)\\b\\s*",
+              "match": "\\s*+\\b(extends)\\b\\s*+",
               "captures": {
                 "1": {
                   "name": "storage.type.extends.flowtype"
@@ -2977,7 +2968,7 @@
               "include": "#flowtype-interface-name"
             },
             {
-              "begin": "\\s*{",
+              "begin": "\\s*+{",
               "end": "\\s*(?=})",
               "contentName": "meta.class.body.js",
               "beginCaptures": {
@@ -2987,7 +2978,7 @@
               },
               "patterns": [
                 {
-                  "match": "\\s*\\b(?<!\\.)static\\b(?!\\.)",
+                  "match": "\\s*+\\b(?<!\\.)static\\b(?!\\.)",
                   "name": "storage.modifier.js"
                 },
                 {
@@ -3009,7 +3000,7 @@
       ]
     },
     "flowtype-function-name": {
-      "match": "\\s*(\\bstatic\\b)?\\s*([$_\\p{L}][$.\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}]*)?\\s*(?!:)(?=\\(|<.*\\()",
+      "match": "\\s*+(\\bstatic\\b)?\\s*+([$_\\p{L}][$.\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}]*)?\\s*+(?!:)(?=\\(|<.*\\()",
       "captures": {
         "1": {
           "name": "storage.modifier.static.js"
@@ -3021,18 +3012,18 @@
     },
     "flowtype-class-name": {
       "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}])*+)",
+      "match": "(?<!\\.)\\s*+([$_\\p{L}](?:[$\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}])*+)",
       "name": "entity.name.class.js"
     },
     "flowtype-interface-name": {
       "comment": "look for interface names but dont assume uppercase start char",
-      "match": "(?<!\\.)\\s*([$_\\p{L}](?:[$\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}])*+)",
+      "match": "(?<!\\.)\\s*+([$_\\p{L}](?:[$\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}])*+)",
       "name": "support.type.class.interface.js"
     },
     "flowtype-declare": {
       "patterns": [
         {
-          "begin": "\\s*\\b(declare)\\s+(?=(class|function|module|var))\\b",
+          "begin": "\\s*+\\b(declare)\\s+(?=(class|function|module|var))\\b",
           "end": "(?=.)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -3058,13 +3049,13 @@
       ]
     },
     "flowtype-declare-modules": {
-      "match": "\\s*\\bmodule\\b\\s+",
+      "match": "\\s*+\\bmodule\\b\\s+",
       "name": "support.type.object.module.js"
     },
     "flowtype-declare-classes": {
       "patterns": [
         {
-          "begin": "\\s*\\b(class)\\s+",
+          "begin": "\\s*+\\b(class)\\s+",
           "end": "\\s*(})",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -3079,7 +3070,7 @@
           },
           "patterns": [
             {
-              "match": "\\s*\\b(extends|mixins)\\b\\s*",
+              "match": "\\s*+\\b(extends|mixins)\\b\\s*+",
               "captures": {
                 "1": {
                   "name": "storage.type.extends.flowtype"
@@ -3097,7 +3088,7 @@
               },
               "patterns": [
                 {
-                  "match": "\\s*\\b(?<!\\.)static\\b(?!\\.)",
+                  "match": "\\s*+\\b(?<!\\.)static\\b(?!\\.)",
                   "name": "storage.modifier.js"
                 },
                 {
@@ -3130,7 +3121,7 @@
     "flowtype-declare-function": {
       "patterns": [
         {
-          "begin": "\\s*\\b(function)\\s+",
+          "begin": "\\s*+\\b(function)\\s+",
           "end": "\\s*(;)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -3152,7 +3143,7 @@
     "flowtype-declare-vars": {
       "patterns": [
         {
-          "begin": "\\s*\\b(var)\\s+",
+          "begin": "\\s*+\\b(var)\\s+",
           "end": "\\s*(?=.)",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -3171,8 +3162,8 @@
     "flowtype-typecast": {
       "patterns": [
         {
-          "begin": "\\s*:",
-          "end": "(?=\\s*\\))",
+          "begin": "\\s*+:",
+          "end": "(?=\\s*+\\))",
           "patterns": [
             {
               "include": "#flowtype-parse-types"
@@ -3180,6 +3171,20 @@
           ]
         }
       ]
+    },
+    "miscellaneous": {
+      "comment": "trap miscellaneous stuff",
+      "patterns": [
+        {
+          "comment": "match arrow func symbol when it appears by itself",
+          "match": "\\s*(=>)",
+          "captures": {
+            "1": {
+              "name": "storage.type.function.arrow.js"
+            }
+          }
+        }
+      ]
     }
   }
 }