github-linguist 7.0.0 → 7.1.0

data/grammars/source.haproxy-config.json

@@ -0,0 +1,100 @@
+{
+  "name": "HAProxy",
+  "scopeName": "source.haproxy-config",
+  "patterns": [
+    {
+      "name": "meta.tag.haproxy-config",
+      "match": "^(backend|defaults|frontend|global|listen|mailers|peers|ruleset|userlist)\\s*(\\S+)?\\s*((\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3})?:\\d{1,5})?(,)?((\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3})?:\\d{1,5})?",
+      "captures": {
+        "2": {
+          "name": "string.unquoted.sectionname.haproxy-config"
+        },
+        "3": {
+          "name": "variable.parameter.ip-port.haproxy-config"
+        },
+        "5": {
+          "name": "punctuation.separator.ip.haproxy-config"
+        },
+        "6": {
+          "name": "variable.parameter.ip-port.haproxy-config"
+        }
+      }
+    },
+    {
+      "name": "comment.line.number-sign.haproxy-config",
+      "match": "#.+$"
+    },
+    {
+      "name": "constant.numeric.haproxy-config",
+      "match": "\\b[0-9]+([\\.:][0-9]+)*[a-z]?\\b"
+    },
+    {
+      "name": "variable.parameter.ip-port.haproxy-config",
+      "match": "(\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3})?:\\d{1,5}"
+    },
+    {
+      "name": "keyword.other.no-validate-params.haproxy-config",
+      "match": "^\\s*(acl|appsession|backlog|balance|bind|bind-process|block|clitimeout|compression|contimeout|cookie|default-server|default_backend|description|disabled|dispatch|enabled|errorfile|errorloc|errorloc302|errorloc303|filter|force-persist|fullconn|grace|hash-type|http-request|http-response|http-reuse|http-send-name-header|id|ignore-persist|load-server-state-from-file|log|log-format|log-format-sd|log-tag|max-keep-alive-queue|maxconn|mode|monitor-net|monitor-uri|redirect|redisp|redispatch|reqadd|reqallow|reqdel|reqdeny|reqiallow|reqidel|reqideny|reqipass|reqirep|reqitarpit|reqpass|reqrep|reqtarpit|retries|rspadd|rspdel|rspdeny|rspidel|rspideny|rspirep|rsprep|server|server-state-file-name|server-template|source|srvtimeout|stick-table|transparent|unique-id-format|unique-id-header|use-server|use_backend)\\b"
+    },
+    {
+      "name": "keyword.other.no-validate-params.haproxy-config",
+      "match": "^\\s*(51degrees-cache-size|51degrees-data-file|51degrees-property-name-list|51degrees-property-separator|ca-base|chroot|cpu-map|crt-base|daemon|debug|description|deviceatlas-json-file|deviceatlas-log-level|deviceatlas-properties-cookie|deviceatlas-separator|external-check|gid|group|hard-stop-after|log|log-send-hostname|log-tag|lua-load|max-spread-checks|maxcompcpuusage|maxcomprate|maxconn|maxconnrate|maxpipes|maxsessrate|maxsslconn|maxsslrate|maxzlibmem|nbproc|nbthread|node|noepoll|nogetaddrinfo|nokqueue|nopoll|noreuseport|nosplice|pidfile|presetenv|quiet|resetenv|server-state-base|server-state-file|setenv|spread-checks|ssl-default-bind-ciphers|ssl-default-bind-options|ssl-default-server-ciphers|ssl-default-server-options|ssl-dh-param-file|ssl-engine|ssl-mode-async|ssl-server-verify|stats|tune.buffers.limit|tune.buffers.reserve|tune.bufsize|tune.chksize|tune.comp.maxlevel|tune.h2.header-table-size|tune.h2.initial-window-size|tune.h2.max-concurrent-streams|tune.http.cookielen|tune.http.logurilen|tune.http.maxhdr|tune.idletimer|tune.lua.forced-yield|tune.lua.maxmem|tune.lua.service-timeout|tune.lua.session-timeout|tune.lua.task-timeout|tune.maxaccept|tune.maxpollevents|tune.maxrewrite|tune.pattern.cache-size|tune.pipesize|tune.rcvbuf.client|tune.rcvbuf.server|tune.recv_enough|tune.sndbuf.client|tune.sndbuf.server|tune.ssl.cachesize|tune.ssl.capture-cipherlist-size|tune.ssl.default-dh-param|tune.ssl.force-private-cache|tune.ssl.lifetime|tune.ssl.maxrecord|tune.ssl.ssl-ctx-cache-size|tune.vars.global-max-size|tune.vars.proc-max-size|tune.vars.reqres-max-size|tune.vars.sess-max-size|tune.vars.txn-max-size|tune.zlib.memlevel|tune.zlib.windowsize|uid|ulimit-n|unix-bind|unsetenv|user|wurfl-cache-size|wurfl-data-file|wurfl-engine-mode|wurfl-information-list|wurfl-information-list-separator|wurfl-useragent-priority)\\b"
+    },
+    {
+      "name": "keyword.other.no-validate-params.haproxy-config",
+      "match": "\\s+(mailer|timeout)(?=\\s+)"
+    },
+    {
+      "name": "keyword.other.no-validate-params.haproxy-config",
+      "match": "\\s+(disabled|enable|peer)(?=\\s+)"
+    },
+    {
+      "name": "keyword.other.no-validate-params.haproxy-config",
+      "match": "^\\s*(capture|declare|email-alert|external-check|http-check|monitor|option|persist|rate-limit|stats|stick|tcp-check|tcp-request|tcp-response|timeout)\\b"
+    },
+    {
+      "name": "variable.language.reserved.haproxy-config",
+      "match": "\\s+(abortonclose|accept-invalid-http-request|accept-invalid-http-response|admin|allbackups|auth|capture|check|checkcache|client|client-fin|clitcpka|clitimeout|command|connect|connection|content|contimeout|contstats|cookie|disable-on-404|dontlog-normal|dontlognull|enable|expect|external-check|fail|forceclose|forwardfor|from|hide-version|http-buffer-request|http-ignore-probes|http-keep-alive|http-no-delay|http-pretend-keepalive|http-request|http-server-close|http-tunnel|http-use-proxy-header|http_proxy|httpchk|httpclose|httplog|independent-streams|inspect-delay|ldap-check|level|log-health-checks|log-separate-errors|logasap|mailers|match|myhostname|mysql-check|nolinger|on|originalto|path|persist|pgsql-check|prefer-last-server|queue|rdp-cookie|realm|redis-check|redispatch|refresh|scope|send|send-binary|send-state|server|server-fin|session|sessions|show-desc|show-legends|show-node|smtpchk|socket-stats|splice-auto|splice-request|splice-response|spop-check|srvtcpka|srvtimeout|ssl-hello-chk|store-request|store-response|tarpit|tcp-check|tcp-smart-accept|tcp-smart-connect|tcpka|tcplog|to|transparent|tunnel|uri)(?=\\s+)"
+    },
+    {
+      "name": "variable.language.reserved.haproxy-config",
+      "match": "\\s+(accept-netscaler-cip|accept-proxy|allow-0rtt|alpn|backlog|ca-file|ca-ignore-err|ca-sign-file|ca-sign-pass|ciphers|crl-file|crt|crt-ignore-err|crt-list|curves|defer-accept|ecdhe|expose-fd|force-sslv3|force-tlsv10|force-tlsv11|force-tlsv12|force-tlsv13|generate-certificates|gid|group|id|interface|level|maxconn|mode|mss|name|namespace|nice|no-ca-names|no-sslv3|no-tls-tickets|no-tlsv10|no-tlsv11|no-tlsv12|no-tlsv13|npn|prefer-client-ciphers|process|severity-output|ssl|ssl-max-ver|ssl-min-ver|strict-sni|tcp-ut|tfo|tls-ticket-keys|transparent|uid|user|v4v6|v6only|verify)(?=\\s+)"
+    },
+    {
+      "name": "variable.language.reserved.haproxy-config",
+      "match": "\\s+(addr|agent-addr|agent-check|agent-inter|agent-port|agent-send|backup|ca-file|check|check-send-proxy|check-sni|check-ssl|ciphers|cookie|crl-file|crt|disabled|downinter|enabled|error-limit|fall|fastinter|force-sslv3|force-tlsv10|force-tlsv11|force-tlsv12|force-tlsv13|id|init-addr|inter|maxconn|maxqueue|minconn|namespace|no-agent-check|no-backup|no-check|no-check-ssl|no-send-proxy|no-send-proxy-v2|no-send-proxy-v2-ssl|no-send-proxy-v2-ssl-cn|no-ssl|no-ssl-reuse|no-sslv3|no-tls-tickets|no-tlsv10|no-tlsv11|no-tlsv12|no-tlsv13|no-verifyhost|non-stick|observe|on-error|on-marked-down|on-marked-up|port|redir|resolve-net|resolve-opts|resolve-prefer|resolvers|rise|send-proxy|send-proxy-v2|send-proxy-v2-ssl|send-proxy-v2-ssl-cn|slowstart|sni|source|ssl|ssl-max-ver|ssl-min-ver|ssl-reuse|stick|tcp-ut|tls-tickets|track|verify|verifyhost|weight)(?=\\s+)"
+    },
+    {
+      "name": "variable.language.reserved.haproxy-config",
+      "match": "\\s+(type|size|expire|nopurge|peers|store)(?=\\s+)"
+    },
+    {
+      "name": "variable.language.reserved.haproxy-config",
+      "match": "\\s+(allow|auth|redirect|reject|tarpit|deny|deny_status|add-header|set-challenge|set-header|set-src|set-status|capture|len|id|del-header|set-nice|set-log-level|replace-header|replace-value|set-method|set-uri|add-acl|del-acl|del-map|set-map|set-var|unset-var|track-sc0|track-sc1|track-sc2|sc-inc-gpc0|sc-inc-gpc1|sc-set-gpt0|silent-drop|send-spoe-group|cache-store|cache-use)(?=\\s+)"
+    },
+    {
+      "name": "variable.language.reserved.extra.haproxy-config",
+      "match": "\\s+(roundrobin|static-rr|leastconn|first|url_param|health|global|httplog|except|kern|user|mail|daemon|auth|syslog|lpr|news|uucp|cron|auth2|ftp|ntp|audit|alert|cron2|local0|local1|local2|local3|local4|local5|local6|local7|emerg|crit|err|warning|notice|info|debug|rewrite|insert|nocache|postonly|indirect|prefix|location|scheme|code|request|response|header|check|cookie|weight|usesrc|http|tcp)(?=\\s+)"
+    },
+    {
+      "name": "constant.character.escape.haproxy-config",
+      "match": "\\\\"
+    },
+    {
+      "name": "entity.name.function.hdr.haproxy-config",
+      "match": "\\s+((base|cook|hdr|path|shdr|url|urlp)(_beg|_dir|_dom|_end|_len|_reg|_sub)?)\\b"
+    },
+    {
+      "name": "keyword.control.directive.module.http.rewrite",
+      "match": "\\b(if|rewrite)\\b"
+    },
+    {
+      "name": "variable.language.other.haproxy-config",
+      "match": "%\\[[^\\]]+\\]"
+    },
+    {
+      "name": "keyword.operator.logical.haproxy-config",
+      "match": "\\s+(or|\\|\\||!)\\s+"
+    }
+  ]
+}

data/grammars/source.jison.json

@@ -656,7 +656,7 @@
     }
   },
   "injections": {
-    "L:(meta.action.jison - (comment | string)), source.js.embedded.jison": {
+    "L:(meta.action.jison - (comment | string)), source.js.embedded.jison - (comment | string)": {
       "patterns": [
         {
           "name": "variable.language.semantic-value.jison",

data/grammars/source.js.css.json

@@ -0,0 +1,328 @@
+{
+  "name": "Styled Components",
+  "scopeName": "source.js.css",
+  "patterns": [
+    {
+      "include": "#comment-block"
+    },
+    {
+      "include": "#rule-list"
+    }
+  ],
+  "repository": {
+    "color-values": {
+      "patterns": [
+        {
+          "name": "support.constant.color.w3c-standard-color-name.css",
+          "match": "\\b(aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow)\\b"
+        },
+        {
+          "name": "invalid.deprecated.color.w3c-non-standard-color-name.css",
+          "match": "\\b(aliceblue|antiquewhite|aquamarine|azure|beige|bisque|blanchedalmond|blueviolet|brown|burlywood|cadetblue|chartreuse|chocolate|coral|cornflowerblue|cornsilk|crimson|cyan|darkblue|darkcyan|darkgoldenrod|darkgray|darkgreen|darkgrey|darkkhaki|darkmagenta|darkolivegreen|darkorange|darkorchid|darkred|darksalmon|darkseagreen|darkslateblue|darkslategray|darkslategrey|darkturquoise|darkviolet|deeppink|deepskyblue|dimgray|dimgrey|dodgerblue|firebrick|floralwhite|forestgreen|gainsboro|ghostwhite|gold|goldenrod|greenyellow|grey|honeydew|hotpink|indianred|indigo|ivory|khaki|lavender|lavenderblush|lawngreen|lemonchiffon|lightblue|lightcoral|lightcyan|lightgoldenrodyellow|lightgray|lightgreen|lightgrey|lightpink|lightsalmon|lightseagreen|lightskyblue|lightslategray|lightslategrey|lightsteelblue|lightyellow|limegreen|linen|magenta|mediumaquamarine|mediumblue|mediumorchid|mediumpurple|mediumseagreen|mediumslateblue|mediumspringgreen|mediumturquoise|mediumvioletred|midnightblue|mintcream|mistyrose|moccasin|navajowhite|oldlace|olivedrab|orangered|orchid|palegoldenrod|palegreen|paleturquoise|palevioletred|papayawhip|peachpuff|peru|pink|plum|powderblue|rosybrown|royalblue|saddlebrown|salmon|sandybrown|seagreen|seashell|sienna|skyblue|slateblue|slategray|slategrey|snow|springgreen|steelblue|tan|thistle|tomato|turquoise|violet|wheat|whitesmoke|yellowgreen)\\b"
+        },
+        {
+          "begin": "(hsla?|rgba?)\\s*(\\()",
+          "end": "(\\))",
+          "patterns": [
+            {
+              "name": "constant.other.color.rgb-value.css",
+              "match": "(?x)\\b\n\t\t\t\t\t\t\t    (0*((1?[0-9]{1,2})|(2([0-4][0-9]|5[0-5])))\\s*,\\s*){2}\n\t\t\t\t\t\t\t    (0*((1?[0-9]{1,2})|(2([0-4][0-9]|5[0-5])))\\b)\n\t\t\t\t\t\t\t    (\\s*,\\s*((0?\\.[0-9]+)|[0-1]))?\n\t\t\t\t\t\t\t"
+            },
+            {
+              "name": "constant.other.color.rgb-percentage.css",
+              "match": "\\b([0-9]{1,2}|100)\\s*%,\\s*([0-9]{1,2}|100)\\s*%,\\s*([0-9]{1,2}|100)\\s*%"
+            },
+            {
+              "include": "#numeric-values"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "support.function.misc.css"
+            },
+            "2": {
+              "name": "punctuation.section.function.css"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.section.function.css"
+            }
+          }
+        }
+      ]
+    },
+    "comment-block": {
+      "name": "comment.block.css",
+      "begin": "/\\*",
+      "end": "\\*/",
+      "captures": {
+        "0": {
+          "name": "punctuation.definition.comment.css"
+        }
+      }
+    },
+    "media-query": {
+      "begin": "(?i)\\s*(only|not)?\\s*(all|aural|braille|embossed|handheld|print|projection|screen|tty|tv)?",
+      "end": "\\s*(?:(,)|(?=[{;]))",
+      "patterns": [
+        {
+          "begin": "\\s*(and)?\\s*(\\()\\s*",
+          "end": "\\)",
+          "patterns": [
+            {
+              "begin": "(?x)\n\t                            (\n\t                                ((min|max)-)?\n\t                                (\n\t                                    ((device-)?(height|width|aspect-ratio))|\n\t                                    (color(-index)?)|monochrome|resolution\n\t                                )\n\t                            )|grid|scan|orientation\n\t                            \\s*(?=[:)])",
+              "end": "(:)|(?=\\))",
+              "beginCaptures": {
+                "0": {
+                  "name": "support.type.property-name.media.css"
+                }
+              },
+              "endCaptures": {
+                "1": {
+                  "name": "punctuation.separator.key-value.css"
+                }
+              }
+            },
+            {
+              "name": "support.constant.property-value.css",
+              "match": "\\b(portrait|landscape|progressive|interlace)"
+            },
+            {
+              "match": "\\s*(\\d+)(/)(\\d+)",
+              "captures": {
+                "1": {
+                  "name": "constant.numeric.css"
+                },
+                "2": {
+                  "name": "keyword.operator.arithmetic.css"
+                },
+                "3": {
+                  "name": "constant.numeric.css"
+                }
+              }
+            },
+            {
+              "include": "#numeric-values"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.operator.logic.media.css"
+            }
+          }
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.operator.logic.media.css"
+        },
+        "2": {
+          "name": "support.constant.media.css"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.arbitrary-repitition.css"
+        }
+      }
+    },
+    "media-query-list": {
+      "begin": "\\s*(?=[^{;])",
+      "end": "\\s*(?=[{;])",
+      "patterns": [
+        {
+          "include": "#media-query"
+        }
+      ]
+    },
+    "numeric-values": {
+      "patterns": [
+        {
+          "name": "constant.other.color.rgb-value.css",
+          "match": "(#)([0-9a-fA-F]{3}|[0-9a-fA-F]{6})\\b",
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.constant.css"
+            }
+          }
+        },
+        {
+          "name": "constant.numeric.css",
+          "match": "(?x)\n\t\t\t\t\t    (?:-|\\+)?(?:(?:[0-9]+(?:\\.[0-9]+)?)|(?:\\.[0-9]+))\n\t\t\t\t\t    ((?:px|pt|ch|cm|mm|in|r?em|ex|pc|deg|g?rad|dpi|dpcm|s)\\b|%)?\n\t\t\t\t\t",
+          "captures": {
+            "1": {
+              "name": "keyword.other.unit.css"
+            }
+          }
+        }
+      ]
+    },
+    "property-values": {
+      "patterns": [
+        {
+          "name": "support.constant.property-value.css",
+          "match": "\\b(absolute|all(-scroll)?|always|armenian|auto|avoid|baseline|below|bidi-override|block|bold|bolder|both|bottom|break-all|break-word|capitalize|center|char|circle|cjk-ideographic|col-resize|collapse|crosshair|dashed|decimal-leading-zero|decimal|default|disabled|disc|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ellipsis|fixed|geometricPrecision|georgian|groove|hand|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|inactive|inherit|inline-block|inline|inset|inside|inter-ideograph|inter-word|italic|justify|katakana-iroha|katakana|keep-all|left|lighter|line-edge|line-through|line|list-item|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|medium|middle|move|n-resize|ne-resize|newspaper|no-drop|no-repeat|nw-resize|none|normal|not-allowed|nowrap|oblique|optimize(Legibility|Quality|Speed)|outset|outside|overline|pointer|pre(-(wrap|line))?|progress|relative|repeat-x|repeat-y|repeat|right|ridge|row-resize|rtl|s-resize|scroll|se-resize|separate|small-caps|solid|square|static|strict|sub|super|sw-resize|table-footer-group|table-header-group|tb-rl|text-bottom|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|vertical(-(ideographic|text))?|visible(Painted|Fill|Stroke)?|w-resize|wait|whitespace|zero|smaller|larger|((xx?-)?(small|large))|painted|fill|stroke)\\b"
+        },
+        {
+          "name": "support.constant.font-name.css",
+          "match": "(\\b(?i:arial|century|comic|courier|garamond|georgia|helvetica|impact|lucida|symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|serif|monospace)\\b)"
+        },
+        {
+          "include": "#numeric-values"
+        },
+        {
+          "include": "#color-values"
+        },
+        {
+          "include": "#string-double"
+        },
+        {
+          "include": "#string-single"
+        },
+        {
+          "begin": "(rect)\\s*(\\()",
+          "end": "(\\))",
+          "patterns": [
+            {
+              "include": "#numeric-values"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "support.function.misc.css"
+            },
+            "2": {
+              "name": "punctuation.section.function.css"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.section.function.css"
+            }
+          }
+        },
+        {
+          "begin": "(format|local|url|attr|counter|counters)\\s*(\\()",
+          "end": "(\\))",
+          "patterns": [
+            {
+              "include": "#string-single"
+            },
+            {
+              "include": "#string-double"
+            },
+            {
+              "name": "variable.parameter.misc.css",
+              "match": "[^'\") \\t]+"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "support.function.misc.css"
+            },
+            "2": {
+              "name": "punctuation.section.function.css"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.section.function.css"
+            }
+          }
+        },
+        {
+          "name": "keyword.other.important.css",
+          "match": "\\!\\s*important"
+        }
+      ]
+    },
+    "rule-list": {
+      "name": "meta.property-list.css",
+      "end": "(?=\\s*)",
+      "patterns": [
+        {
+          "include": "#comment-block"
+        },
+        {
+          "name": "meta.property-name.css",
+          "begin": "(?\u003c![-a-z])(?=[-a-z])",
+          "end": "$|(?![-a-z])",
+          "patterns": [
+            {
+              "name": "support.type.property-name.css",
+              "match": "\\b(azimuth|background-attachment|background-color|background-image|background-position|background-repeat|background|box-shadow|border-radius|border-bottom-color|border-bottom-style|border-bottom-width|border-bottom|border-collapse|border-color|border-left-color|border-left-style|border-left-width|border-left|border-right-color|border-right-style|border-right-width|border-right|border-spacing|border-style|border-top-color|border-top-style|border-top-width|border-top|border-width|border|bottom|caption-side|clear|clip|color|content|counter-increment|counter-reset|cue-after|cue-before|cue|cursor|direction|display|elevation|empty-cells|flex-basis|flex-direction|flex-flow|flex-grow|flex-shrink|flex-wrap|flex|float|font-family|font-size-adjust|font-size|font-stretch|font-style|font-variant|font-weight|font|height|image-rendering|left|letter-spacing|line-height|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|marker-offset|margin|marks|max-height|max-width|min-height|min-width|-moz-border-radius|opacity|orphans|outline-color|outline-style|outline-width|outline|overflow(-[xy])?|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page|pause-after|pause-before|pause|pitch-range|pitch|play-during|pointer-events|position|quotes|resize|richness|right|size|speak-header|speak-numeral|speak-punctuation|speech-rate|speak|src|stress|table-layout|text-(align|decoration|indent|rendering|shadow|transform)|top|transition|unicode-bidi|vertical-align|visibility|voice-family|volume|white-space|widows|width|word-(spacing|wrap)|zoom|z-index)\\b"
+            }
+          ]
+        },
+        {
+          "name": "meta.property-value.css",
+          "begin": "(?\u003c!\u0026|:)(:)\\s*",
+          "end": "\\s*(;|(?=\\}))",
+          "patterns": [
+            {
+              "include": "#property-values"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.separator.key-value.css"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.terminator.rule.css"
+            }
+          }
+        }
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.section.property-list.css"
+        }
+      }
+    },
+    "string-double": {
+      "name": "string.quoted.double.css",
+      "begin": "\"",
+      "end": "\"",
+      "patterns": [
+        {
+          "name": "constant.character.escape.css",
+          "match": "\\\\."
+        }
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.css"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.css"
+        }
+      }
+    },
+    "string-single": {
+      "name": "string.quoted.single.css",
+      "begin": "'",
+      "end": "'",
+      "patterns": [
+        {
+          "name": "constant.character.escape.css",
+          "match": "\\\\."
+        }
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.css"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.css"
+        }
+      }
+    }
+  }
+}

data/grammars/source.js.json

@@ -1733,7 +1733,7 @@
         },
         {
           "name": "string.quoted.template.graphql.js",
-          "begin": "(Relay\\.QL)\\s*(`)",
+          "begin": "(Relay\\.QL|gql)\\s*(`)",
           "end": "`",
           "patterns": [
             {

data/grammars/source.js.jsx.json

@@ -1,5 +1,5 @@
 {
-  "name": "Babel ES6 JavaScript",
+  "name": "JavaScript (Babel)",
   "scopeName": "source.js.jsx",
   "patterns": [
     {
@@ -20,63 +20,218 @@
         }
       ]
     },
-    "class-body": {
+    "class-method-definition": {
       "patterns": [
         {
-          "include": "#flowtype-keywords"
-        },
-        {
-          "include": "#literal-method"
-        },
-        {
-          "include": "#brackets"
+          "name": "meta.short-method.flowtype.js",
+          "begin": "(@@[_$a-zA-Z][$\\w]*|static|return)(?=\\s*[\u003c(])|(?=\\s*\u003c)",
+          "end": "(?=\\s*[;{])",
+          "patterns": [
+            {
+              "include": "#flowtype-polymorph"
+            },
+            {
+              "include": "#function-declaration-parameters"
+            },
+            {
+              "include": "#flowtype-annotation"
+            },
+            {
+              "include": "#comments"
+            },
+            {
+              "include": "#curly-brackets"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.operator.flowtype.js"
+            }
+          }
         },
         {
-          "include": "#es7-decorators"
+          "name": "meta.class-method.computed.js",
+          "begin": "(?\u003c=[]\"'])\\s*(?=[\u003c(])",
+          "end": "(?=\\s*[;{])",
+          "patterns": [
+            {
+              "include": "#flowtype-polymorph"
+            },
+            {
+              "include": "#function-declaration-parameters"
+            },
+            {
+              "include": "#flowtype-annotation"
+            },
+            {
+              "include": "#comments"
+            },
+            {
+              "include": "#curly-brackets"
+            }
+          ]
         },
         {
-          "include": "#comments"
+          "name": "meta.class-accessor.js",
+          "begin": "(?x)\n  ((?\u003eget|set)\\s+)\n  (?\u003e\n    ((')((?\u003e[^'\\\\]|\\\\.)*)('))|\n    ((\")((?\u003e[^\"\\\\]|\\\\.)*)(\"))|\n    (([_$a-zA-Z][$\\w]*|\\d+))\n  )(?=\\s*[\u003c(])",
+          "end": "(?=\\s*[;{])",
+          "patterns": [
+            {
+              "include": "#flowtype-polymorph"
+            },
+            {
+              "include": "#function-declaration-parameters"
+            },
+            {
+              "include": "#flowtype-annotation"
+            },
+            {
+              "include": "#comments"
+            },
+            {
+              "include": "#curly-brackets"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.js"
+            },
+            "10": {
+              "name": "string.unquoted.js"
+            },
+            "11": {
+              "name": "entity.name.function.js"
+            },
+            "2": {
+              "name": "string.quoted.js"
+            },
+            "3": {
+              "name": "punctuation.definition.string.begin.js"
+            },
+            "4": {
+              "name": "entity.name.function.js"
+            },
+            "5": {
+              "name": "punctuation.definition.string.end.js"
+            },
+            "6": {
+              "name": "string.quoted.js"
+            },
+            "7": {
+              "name": "punctuation.definition.string.begin.js"
+            },
+            "8": {
+              "name": "entity.name.function.js"
+            },
+            "9": {
+              "name": "punctuation.definition.string.end.js"
+            }
+          }
         },
         {
-          "begin": "\\s*+(?==[^=\u003e])",
-          "end": "(^\\s*+(?=([$\\w]*\\s*+\\??\\s*+(:|=(?!^==|=\u003e))|\\[|[$\\w]\\s*+\\(|\\bstatic\\b|\\s*+)))|\\s*(;)",
+          "name": "meta.class-method.js",
+          "begin": "(?x)\n  (?\u003e\n    ((')((?\u003e[^'\\\\]|\\\\.)*)('))|\n    ((\")((?\u003e[^\"\\\\]|\\\\.)*)(\"))|\n    (([_$a-zA-Z][$\\w]*|\\d+))\n  )(?=\\s*[\u003c(])",
+          "end": "(?=\\s*[;{])",
           "patterns": [
             {
-              "include": "#expression"
+              "include": "#flowtype-polymorph"
+            },
+            {
+              "include": "#function-declaration-parameters"
+            },
+            {
+              "include": "#flowtype-annotation"
+            },
+            {
+              "include": "#comments"
+            },
+            {
+              "include": "#curly-brackets"
             }
           ],
-          "endCaptures": {
+          "beginCaptures": {
+            "1": {
+              "name": "string.quoted.js"
+            },
+            "10": {
+              "name": "entity.name.function.js"
+            },
+            "2": {
+              "name": "punctuation.definition.string.begin.js"
+            },
+            "3": {
+              "name": "entity.name.function.js"
+            },
             "4": {
-              "name": "punctuation.terminator.statement.js"
+              "name": "punctuation.definition.string.end.js"
+            },
+            "5": {
+              "name": "string.quoted.js"
+            },
+            "6": {
+              "name": "punctuation.definition.string.begin.js"
+            },
+            "7": {
+              "name": "entity.name.function.js"
+            },
+            "8": {
+              "name": "punctuation.definition.string.end.js"
+            },
+            "9": {
+              "name": "string.unquoted.js"
             }
           }
-        },
+        }
+      ]
+    },
+    "class-method-storage": {
+      "patterns": [
         {
           "name": "storage.modifier.js",
-          "match": "\\s*+\\b(?\u003c!\\.)static\\b(?!\\.)"
+          "match": "(?\u003c!\\.)\\b(?\u003estatic|declare)\\b"
+        },
+        {
+          "name": "storage.type.js",
+          "match": "(?\u003c!\\.)\\b(async)\\b"
         },
         {
-          "include": "#flowtype-variable"
+          "name": "storage.type.js",
+          "match": "(?\u003c!\\.)\\b(get|set)\\b(?!\\s*\\()"
         },
         {
-          "include": "#literal-semi-colon"
+          "name": "keyword.generator.asterisk.js",
+          "match": "\\*"
         }
       ]
     },
-    "comments": {
+    "class-properties": {
       "patterns": [
         {
-          "include": "#special-comments-conditional-compilation"
-        },
-        {
-          "name": "comment.block.documentation.js",
-          "begin": "\\s*+/\\*\\*(?!/)",
-          "end": "\\s*\\*/",
+          "name": "meta.class.property.js",
+          "begin": "([_$a-zA-Z][$\\w]*)(?=\\s*[:=])",
+          "end": "(?=\\s*[;}])",
           "patterns": [
             {
-              "include": "#jsdoc"
+              "include": "#flowtype-annotation"
+            },
+            {
+              "include": "#expression"
             }
           ],
+          "beginCaptures": {
+            "1": {
+              "name": "variable.other.property.js"
+            }
+          }
+        }
+      ]
+    },
+    "comments": {
+      "patterns": [
+        {
+          "name": "comment.block.documentation.js",
+          "begin": "/\\*\\*(?!/)",
+          "end": "\\*/",
           "captures": {
             "0": {
               "name": "punctuation.definition.comment.js"
@@ -85,17 +240,22 @@
         },
         {
           "name": "comment.block.js",
-          "begin": "\\s*+/\\*",
-          "end": "\\s*\\*/",
-          "captures": {
+          "begin": "/\\*",
+          "end": "\\*/",
+          "beginCaptures": {
             "0": {
-              "name": "punctuation.definition.comment.js"
+              "name": "punctuation.definition.comment.begin.js"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.comment.end.js"
             }
           }
         },
         {
           "name": "comment.block.html.js",
-          "match": "\\s*+(\u003c!--|--\u003e)",
+          "match": "(?\u003e\u003c!--|--\u003e)",
           "captures": {
             "0": {
               "name": "punctuation.definition.comment.js"
@@ -104,9 +264,8 @@
         },
         {
           "name": "comment.line.double-slash.js",
-          "begin": "\\s*+(//)",
-          "end": "\\s*$",
-          "beginCaptures": {
+          "match": "(//).*$\\n?",
+          "captures": {
             "1": {
               "name": "punctuation.definition.comment.js"
             }
@@ -125,12 +284,6 @@
     },
     "core": {
       "patterns": [
-        {
-          "include": "#ignore-long-lines"
-        },
-        {
-          "include": "#flowtype-keywords"
-        },
         {
           "include": "#literal-function-labels"
         },
@@ -147,10 +300,13 @@
           "include": "#literal-switch"
         },
         {
-          "include": "#expression"
+          "include": "#styled-components"
         },
         {
-          "include": "#literal-keywords"
+          "include": "#graphql"
+        },
+        {
+          "include": "#expression"
         },
         {
           "include": "#literal-punctuation"
@@ -160,8 +316,9 @@
     "curly-brackets": {
       "patterns": [
         {
-          "begin": "\\s*+\\{",
-          "end": "\\s*\\}",
+          "name": "meta.group.braces.curly.js",
+          "begin": "{",
+          "end": "}",
           "patterns": [
             {
               "include": "$self"
@@ -169,12 +326,12 @@
           ],
           "beginCaptures": {
             "0": {
-              "name": "meta.brace.curly.js"
+              "name": "meta.brace.curly.begin.js"
             }
           },
           "endCaptures": {
             "0": {
-              "name": "meta.brace.curly.js"
+              "name": "meta.brace.curly.end.js"
             }
           }
         }
@@ -184,7 +341,7 @@
       "patterns": [
         {
           "name": "tag.decorator.js",
-          "match": "\\s*+(?\u003c!@)(@)([_$a-zA-Z][$\\w]*)\\b",
+          "match": "(?x)\n  (@)([_$a-zA-Z][$\\w]*)\\b",
           "captures": {
             "1": {
               "name": "punctuation.definition.tag.js"
@@ -199,22 +356,22 @@
     "expression": {
       "patterns": [
         {
-          "include": "#ignore-long-lines"
+          "include": "#merge-conflits"
         },
         {
-          "include": "#jsx"
+          "include": "#literal-regexp"
         },
         {
-          "include": "#es7-decorators"
+          "include": "#literal-jsx"
         },
         {
-          "include": "#support"
+          "include": "#es7-decorators"
         },
         {
-          "include": "#literal-function-labels"
+          "include": "#support-class"
         },
         {
-          "include": "#literal-arrow-function-labels"
+          "include": "#support-other"
         },
         {
           "include": "#literal-function"
@@ -223,37 +380,37 @@
           "include": "#literal-arrow-function"
         },
         {
-          "include": "#literal-method-alternate"
+          "include": "#literal-prototype"
         },
         {
-          "include": "#literal-prototype"
+          "include": "#literal-keywords"
         },
         {
-          "include": "#literal-regexp"
+          "include": "#literal-method"
         },
         {
-          "include": "#literal-number"
+          "include": "#literal-module"
         },
         {
-          "include": "#literal-quasi"
+          "include": "#literal-class"
         },
         {
-          "include": "#literal-string"
+          "include": "#flowtype-declaration"
         },
         {
-          "include": "#literal-language-constant"
+          "include": "#literal-number"
         },
         {
-          "include": "#literal-language-variable"
+          "include": "#literal-template-string"
         },
         {
-          "include": "#literal-object"
+          "include": "#literal-string"
         },
         {
-          "include": "#literal-module"
+          "include": "#literal-language-constant"
         },
         {
-          "include": "#literal-class"
+          "include": "#literal-language-variable"
         },
         {
           "include": "#literal-constructor"
@@ -275,802 +432,396 @@
         },
         {
           "include": "#literal-variable"
-        },
-        {
-          "include": "#literal-comma"
-        },
-        {
-          "include": "#miscellaneous"
         }
       ]
     },
-    "flowtype": {
+    "flowtype-annotation": {
       "patterns": [
         {
-          "include": "#comments"
-        },
-        {
-          "include": "#flowtype-polymorphs"
-        },
-        {
-          "include": "#flowtype-bracketed-parameters"
-        },
-        {
-          "include": "#flowtype-return"
+          "name": "meta.flowtype.annotation.js",
+          "begin": "(?:(\\?)\\s*)?(:)",
+          "end": "(?=\\S)",
+          "patterns": [
+            {
+              "include": "#flowtype-tokens"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.operator.flowtype.optional.js"
+            },
+            "2": {
+              "name": "keyword.operator.flowtype.annotation.js"
+            }
+          },
+          "applyEndPatternLast": true
         }
       ]
     },
-    "flowtype-bracketed-parameters": {
+    "flowtype-brackets": {
       "patterns": [
         {
-          "begin": "(?\u003c!=)\\s*+(\\()",
-          "end": "\\s*(\\))",
+          "begin": "{",
+          "end": "}",
           "patterns": [
             {
-              "include": "#flowtype-variable"
+              "include": "#flowtype-tokens"
             }
           ],
           "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.parameters.begin.js"
+            "0": {
+              "name": "punctuation.section.flowtype.begin.js"
             }
           },
           "endCaptures": {
-            "1": {
-              "name": "punctuation.definition.parameters.end.js"
+            "0": {
+              "name": "punctuation.section.flowtype.end.js"
             }
           }
         }
       ]
     },
-    "flowtype-declare": {
+    "flowtype-declaration": {
       "patterns": [
         {
-          "match": "\\s*+(?\u003c!\\.)\\b(declare)\\b\\s++(?=\\b(function|var|type|interface)\\s++)",
-          "captures": {
-            "1": {
-              "name": "keyword.other.declare.flowtype"
-            }
-          }
+          "name": "support.type.declare.flowtype.js",
+          "match": "(?\u003c!\\.)\\b(declare)\\b"
         },
         {
-          "begin": "\\s*+(?\u003c!\\.)\\b(declare)\\b\\s*+\\b(module)(.)(exports)(:)",
-          "end": "(?=.)",
+          "name": "meta.type.flowtype.js",
+          "begin": "(?\u003c!\\.)\\b(type)\\b(?=\\s*[_$a-zA-Z])",
+          "end": "(?=\\s*(;|from))",
           "patterns": [
             {
-              "include": "#flowtype-parse-types"
+              "include": "#flowtype-tokens"
             }
           ],
           "beginCaptures": {
             "1": {
-              "name": "keyword.other.declare.flowtype"
-            },
-            "2": {
-              "name": "storage.type.module.flowtype"
-            },
-            "3": {
-              "name": "keyword.operator.accessor.flowtype"
-            },
-            "4": {
-              "name": "storage.type.module.flowtype"
-            },
-            "5": {
-              "name": "punctuation.type.flowtype"
+              "name": "support.type.type.flowtype.js"
             }
-          },
-          "applyEndPatternLast": true
+          }
         },
         {
-          "begin": "\\s*+(?\u003c!\\.)\\b(declare)\\b\\s*+\\b(module)\\b",
-          "end": "\\s*(?\u003c=})",
+          "name": "meta.type.flowtype.js",
+          "begin": "(?\u003c!\\.)\\b(type)\\b(?=\\s*{)",
+          "end": "(?\u003c=})",
           "patterns": [
             {
-              "include": "#flowtype-polymorphs"
+              "include": "#comments"
             },
             {
-              "name": "entity.name.class.js",
-              "match": "(?\u003c!\\.)\\s*+([$_\\p{L}](?:[$\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}])*+)"
+              "include": "#flowtype-brackets"
             },
             {
-              "include": "#literal-string"
+              "include": "#flowtype-polymorph"
             },
             {
-              "contentName": "meta.class.body.js",
-              "begin": "\\s*+({)",
-              "end": "\\s*(})",
-              "patterns": [
-                {
-                  "include": "#flowtype-literal-method"
-                },
-                {
-                  "include": "#class-body"
-                }
-              ],
-              "beginCaptures": {
-                "1": {
-                  "name": "punctuation.section.class.begin.js"
-                }
-              },
-              "endCaptures": {
-                "1": {
-                  "name": "punctuation.section.class.end.js"
-                }
-              }
+              "name": "entity.name.type.js",
+              "match": "([_$a-zA-Z][$\\w]*)"
             }
           ],
           "beginCaptures": {
             "1": {
-              "name": "keyword.other.declare.flowtype"
-            },
-            "2": {
-              "name": "storage.type.module.flowtype"
+              "name": "support.type.type.flowtype.js"
             }
           }
+        }
+      ]
+    },
+    "flowtype-identifier": {
+      "patterns": [
+        {
+          "include": "#support-class"
         },
         {
-          "begin": "\\s*+(?\u003c!\\.)\\b(declare)\\b\\s*+\\b(class)\\b",
-          "end": "\\s*(?\u003c=})",
-          "patterns": [
-            {
-              "include": "#flowtype-polymorphs"
-            },
-            {
-              "match": "\\s*+\\b((extends))\\b\\s*+",
-              "captures": {
-                "1": {
-                  "name": "meta.class.extends.js"
-                },
-                "2": {
-                  "name": "storage.type.extends.js"
-                }
-              }
-            },
-            {
-              "begin": "\\s*+\\b((mixins))\\b\\s*+",
-              "end": "\\s*(?={)",
-              "patterns": [
-                {
-                  "name": "entity.name.class.js",
-                  "match": "(?\u003c!\\.)\\s*+([$_\\p{L}](?:[$\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}])*+)"
-                },
-                {
-                  "include": "#literal-coma"
-                }
-              ],
-              "beginCaptures": {
-                "1": {
-                  "name": "meta.class.extends.js"
-                },
-                "2": {
-                  "name": "storage.type.extends.js"
-                }
-              }
-            },
-            {
-              "name": "entity.name.class.js",
-              "match": "(?\u003c!\\.)\\s*+([$_\\p{L}](?:[$\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}])*+)"
-            },
-            {
-              "contentName": "meta.class.body.js",
-              "begin": "\\s*+({)",
-              "end": "\\s*(})",
-              "patterns": [
-                {
-                  "include": "#flowtype-literal-method"
-                },
-                {
-                  "include": "#class-body"
-                }
-              ],
-              "beginCaptures": {
-                "1": {
-                  "name": "punctuation.section.class.begin.js"
-                }
-              },
-              "endCaptures": {
-                "1": {
-                  "name": "punctuation.section.class.end.js"
-                }
-              }
-            }
-          ],
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.other.declare.flowtype"
-            },
-            "2": {
-              "name": "storage.type.class.flowtype"
-            }
-          }
-        }
-      ]
-    },
-    "flowtype-interface": {
-      "begin": "\\s*+(?\u003c!\\.)\\b(interface)\\s++",
-      "end": "\\s*(?\u003c=})",
-      "patterns": [
-        {
-          "name": "support.type.class.interface.js",
-          "match": "(?\u003c!\\.)\\s*+([$_\\p{L}](?:[$\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}])*+)"
+          "name": "constant.other.primitve.flowtype.js",
+          "match": "\\b(?:any|bool|boolean|mixed|number|string|void)\\b"
         },
         {
-          "include": "#flowtype-polymorphs"
+          "name": "variable.other.flowtype.js",
+          "match": "[_$a-zA-Z][$\\w]*"
         },
         {
-          "contentName": "meta.class.body.js",
-          "begin": "\\s*+{",
-          "end": "\\s*(})",
-          "patterns": [
-            {
-              "include": "#flowtype-literal-method"
-            },
-            {
-              "include": "#class-body"
-            }
-          ],
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.section.class.begin.js"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.section.class.end.js"
-            }
-          }
-        }
-      ],
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.interface.flowtype"
-        }
-      }
-    },
-    "flowtype-keywords": {
-      "patterns": [
-        {
-          "include": "#flowtype-declare"
-        },
-        {
-          "include": "#flowtype-type-aliases"
-        },
-        {
-          "include": "#flowtype-interface"
+          "name": "keyword.operator.flowtype.optional.js",
+          "match": "\\?"
         }
       ]
     },
-    "flowtype-literal-method": {
-      "begin": "(?\u003c!:)\\s*+(?=(\u003c(?:(?\u003e[^\u003c\u003e]+)|\\g\u003c-1\u003e)*\u003e)?(\\())",
-      "end": "\\s*(?=.)",
+    "flowtype-polymorph": {
+      "name": "meta.flowtype.polymorph.js",
+      "begin": "\u003c",
+      "end": "\u003e",
       "patterns": [
         {
-          "include": "#flowtype"
+          "include": "#flowtype-tokens"
         }
       ],
       "beginCaptures": {
-        "1": {
-          "name": "storage.modifier.js"
-        },
-        "2": {
-          "name": "storage.type.js"
-        },
-        "3": {
-          "name": "keyword.generator.asterisk.js"
-        }
-      },
-      "applyEndPatternLast": true
-    },
-    "flowtype-object-property": {
-      "patterns": [
-        {
-          "match": "\\s*+(((?P\u003cquote\u003e\"|').*?(?\u003c=[^\\\\])(?P=quote))|([$_\\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-vars-and-props"
-        }
-      ]
-    },
-    "flowtype-parse-array": {
-      "begin": "(?\u003c!=|[$_A-Za-z0-9])\\s*+(\\[)",
-      "end": "\\s*(\\])",
-      "patterns": [
-        {
-          "include": "#flowtype-variable"
-        }
-      ],
-      "beginCaptures": {
-        "1": {
-          "name": "meta.brace.square.open.flowtype"
+        "0": {
+          "name": "punctuation.section.flowtype.begin.js"
         }
       },
       "endCaptures": {
-        "1": {
-          "name": "meta.brace.square.end.flowtype"
+        "0": {
+          "name": "punctuation.section.flowtype.end.js"
         }
       }
     },
-    "flowtype-parse-objects": {
-      "begin": "(?\u003c=:|\\||\u0026|\\?|=\u003e|\u003c)\\s*+(\\{)",
-      "end": "\\s*(\\})",
+    "flowtype-tokens": {
       "patterns": [
         {
-          "include": "#flowtype-object-property"
-        }
-      ],
-      "beginCaptures": {
-        "1": {
-          "name": "meta.brace.round.open.flowtype"
-        }
-      },
-      "endCaptures": {
-        "1": {
-          "name": "meta.brace.round.close.flowtype"
-        }
-      },
-      "applyEndPatternLast": true
-    },
-    "flowtype-parse-types": {
-      "patterns": [
-        {
-          "name": "keyword.operator.maybe.flowtype",
-          "match": "\\s*+\\?"
-        },
-        {
-          "name": "keyword.operator.flowtype",
-          "match": "\\s*+\\btypeof\\b\\s*+"
-        },
-        {
-          "match": "(?!^)\\s*+\\b((?\u003eany|boolean|mixed|number|string|void))\\b",
-          "captures": {
-            "1": {
-              "name": "support.type.builtin.primitive.flowtype"
+          "begin": "(?\u003c=[:?|\u0026=])(?=\\s*{)",
+          "end": "(?\u003c=})",
+          "patterns": [
+            {
+              "include": "#flowtype-brackets"
             }
-          }
+          ]
         },
         {
-          "match": "(?!^)\\s*+\\b((?\u003eArrayBuffer|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",
+          "name": "meta.flowtype.set.js",
+          "match": "\\s*([|\u0026])\\s*",
           "captures": {
             "1": {
-              "name": "support.type.builtin.class.flowtype"
+              "name": "keyword.operator.flowtype.other.js"
             }
           }
         },
         {
-          "include": "#flowtype-polymorphs"
+          "name": "keyword.operator.flowtype.other.js",
+          "match": "[*:?\u0026|.]|\\.\\.\\.|\\b(typeof)\\b"
         },
         {
-          "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"
+          "begin": "\u003c",
+          "end": "\u003e",
+          "patterns": [
+            {
+              "include": "#flowtype-tokens"
             }
-          }
-        },
-        {
-          "match": "(?!^)\\s*+(?!\\b(if|switch|try|var|let|const|static|function|return|class|do|for|while|debugger|export|import|yield|type|declare|interface)\\b)([$_\\p{L}][$.\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}]*+)(?!\\s*+\\()",
-          "captures": {
-            "2": {
-              "name": "support.type.primitive.flowtype"
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.flowtype.begin.js"
             }
-          }
-        },
-        {
-          "name": "kewyword.operator.union.flowtype",
-          "match": "\\s*+\\|"
-        },
-        {
-          "name": "kewyword.operator.intersection.flowtype",
-          "match": "\\s*+\\\u0026"
-        },
-        {
-          "name": "kewyword.operator.existential.flowtype",
-          "match": "\\s*+\\*"
-        },
-        {
-          "name": "punctuation.type.flowtype",
-          "match": "\\s*+(:)"
-        },
-        {
-          "match": "(?\u003c=\\))\\s*+(=\u003e)",
-          "captures": {
-            "1": {
-              "name": "storage.type.function.arrow.js"
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.flowtype.end.js"
             }
           }
         },
         {
-          "include": "#literal-string"
-        },
-        {
-          "include": "#literal-number"
-        },
-        {
-          "include": "#flowtype-bracketed-parameters"
-        },
-        {
-          "include": "#flowtype-parse-objects"
-        },
-        {
-          "include": "#flowtype-parse-array"
-        },
-        {
-          "include": "#comments"
-        }
-      ]
-    },
-    "flowtype-polymorphs": {
-      "patterns": [
-        {
-          "begin": "\\s*+\\b((?\u003eArray|Class|Map|Promise|Set|WeakMap|WeakSet))\\s*+(\u003c)",
-          "end": "\\s*(\u003e)",
+          "begin": "\\[",
+          "end": "\\]",
           "patterns": [
             {
-              "include": "#literal-comma"
-            },
-            {
-              "match": "\\s*+(\\+|-)",
-              "captures": {
-                "1": {
-                  "name": "support.type.variant.flowtype"
-                }
-              }
-            },
-            {
-              "include": "#flowtype-parse-types"
+              "include": "#flowtype-tokens"
             }
           ],
           "beginCaptures": {
-            "1": {
-              "name": "support.type.builtin.class.flowtype"
-            },
-            "2": {
-              "name": "punctuation.flowtype"
+            "0": {
+              "name": "punctuation.section.flowtype.begin.js"
             }
           },
           "endCaptures": {
-            "1": {
-              "name": "punctuation.flowtype"
+            "0": {
+              "name": "punctuation.section.flowtype.end.js"
             }
           }
         },
         {
-          "begin": "\\s*+(\u003c)(?!\u003c)",
-          "end": "\\s*(\u003e)",
+          "begin": "\\(",
+          "end": "\\)",
           "patterns": [
             {
-              "include": "#literal-comma"
-            },
-            {
-              "match": "\\s*+(\\+|-)",
-              "captures": {
-                "1": {
-                  "name": "support.type.variant.flowtype"
-                }
-              }
-            },
-            {
-              "include": "#flowtype-parse-types"
+              "include": "#flowtype-tokens"
             }
           ],
           "beginCaptures": {
-            "1": {
-              "name": "punctutation.flowtype"
+            "0": {
+              "name": "punctuation.section.flowtype.begin.js"
             }
           },
           "endCaptures": {
-            "1": {
-              "name": "punctutation.flowtype"
+            "0": {
+              "name": "punctuation.section.flowtype.end.js"
             }
           }
-        }
-      ]
-    },
-    "flowtype-return": {
-      "patterns": [
+        },
         {
-          "begin": "(?\u003c=\\))\\s*+(:)",
-          "end": "(?=.)",
+          "name": "meta.flowtype.function.js",
+          "begin": "=\u003e",
+          "end": "(?\u003c=}|[_$a-zA-Z])",
           "patterns": [
             {
-              "include": "#flowtype-parse-types"
+              "include": "#flowtype-brackets"
+            },
+            {
+              "include": "#flowtype-identifier"
+            },
+            {
+              "include": "#comments"
             }
           ],
           "beginCaptures": {
-            "1": {
-              "name": "punctuation.type.flowtype"
+            "0": {
+              "name": "keyword.operator.flowtype.js"
             }
-          },
-          "applyEndPatternLast": true
+          }
+        },
+        {
+          "include": "#flowtype-identifier"
+        },
+        {
+          "include": "#literal-string"
+        },
+        {
+          "include": "#comments"
         }
       ]
     },
-    "flowtype-type-aliases": {
+    "function-declaration-parameters": {
       "patterns": [
         {
-          "begin": "\\s*+(?:\\b(import|export))?\\b\\s*(type)\\b\\s*(?!(instanceof|in)\\b)(?=[$_A-Za-z{\\[])",
-          "end": "\\s*(\\;)|\\b(?=if|switch|try|var|let|const|static|function|return|class|do|for|while|debugger|export|import|yield|type|declare|interface)\\b",
+          "begin": "\\(",
+          "end": "\\)",
           "patterns": [
             {
-              "match": "\\s*+="
+              "include": "#comments"
             },
             {
-              "begin": "\\s*+{",
-              "end": "\\s*}",
-              "patterns": [
-                {
-                  "include": "#flowtype"
-                },
-                {
-                  "include": "#flowtype-variable"
-                },
-                {
-                  "include": "#comments"
-                },
-                {
-                  "include": "#flowtype-function-name"
-                }
-              ],
-              "beginCaptures": {
-                "0": {
-                  "name": "meta.brace.curly.js"
-                }
-              },
-              "endCaptures": {
-                "0": {
-                  "name": "meta.brace.curly.js"
-                }
-              },
-              "applyEndPatternLast": true
+              "include": "#flowtype-annotation"
             },
             {
-              "include": "#flowtype"
+              "name": "keyword.operator.spread.js",
+              "match": "(?\u003c!\\.)\\.\\.\\."
             },
             {
-              "include": "#flowtype-parse-types"
+              "name": "variable.parameter.function.js",
+              "match": "([_$a-zA-Z][$\\w]*)"
             },
             {
-              "include": "#comments"
+              "name": "punctuation.separator.parameter.function.js",
+              "match": ","
             },
             {
-              "include": "#flowtype-function-name"
+              "name": "meta.parameter.optional.js",
+              "begin": "=",
+              "end": "(?=[,)])",
+              "patterns": [
+                {
+                  "include": "#expression"
+                }
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "keyword.operator.assignment.js"
+                }
+              }
             }
           ],
           "beginCaptures": {
-            "1": {
-              "name": "keyword.control.module.js"
-            },
-            "2": {
-              "name": "keyword.other.typedef.flowtype"
+            "0": {
+              "name": "punctuation.definition.parameters.begin.js"
             }
           },
           "endCaptures": {
-            "1": {
-              "name": "punctuation.object.end.flowtype"
+            "0": {
+              "name": "punctuation.definition.parameters.end.js"
             }
           }
         }
       ]
     },
-    "flowtype-typecast": {
+    "graphql": {
       "patterns": [
         {
-          "begin": "\\s*+:",
-          "end": "(?=\\s*+\\))",
+          "name": "meta.graphql.js",
+          "begin": "\\s*+gql`",
+          "end": "`",
           "patterns": [
             {
-              "include": "#flowtype-parse-types"
-            }
-          ]
-        }
-      ]
-    },
-    "flowtype-variable": {
-      "patterns": [
-        {
-          "match": "(?\u003c!\\.)\\s*+([$_\\p{L}](?:[$.\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}])*+)\\s*+(\\??)\\s*+(?=:\\s*(\\bFunction\\b|(\\((?:(?\u003e[^()]+)|\\g\u003c-1\u003e)*\\))\\s*=\u003e|\\(\\s*$))",
-          "captures": {
-            "1": {
-              "name": "storage.type.function.js"
-            },
-            "2": {
-              "name": "keyword.operator.optional.parameter.flowtype"
-            }
-          }
-        },
-        {
-          "match": "\\s*+((?\u003c!\\.)\\.\\.\\.)?([$_\\p{L}](?:[$.\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}])*+)\\s*+(\\??)\\s*+(?=:|=\u003e)",
-          "captures": {
-            "1": {
-              "name": "keyword.operator.spread.js"
+              "include": "source.graphql"
             },
-            "2": {
-              "name": "variable.other.readwrite.js"
-            },
-            "3": {
-              "name": "keyword.operator.optional.parameter.flowtype"
-            }
-          }
-        },
-        {
-          "include": "#flowtype-vars-and-props"
-        }
-      ]
-    },
-    "flowtype-vars-and-props": {
-      "patterns": [
-        {
-          "name": "punctuation.type.flowtype",
-          "match": "\\s*+\\?"
-        },
-        {
-          "name": "kewyword.operator.union.flowtype",
-          "match": "\\s*+\\|"
-        },
-        {
-          "name": "kewyword.operator.intersection.flowtype",
-          "match": "\\s*+\\\u0026"
-        },
-        {
-          "begin": "\\s*+(:)",
-          "end": "(?=.)",
-          "patterns": [
             {
-              "include": "#flowtype-parse-types"
-            }
-          ],
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.type.flowtype"
-            }
-          },
-          "applyEndPatternLast": true
-        },
-        {
-          "include": "#literal-comma"
-        },
-        {
-          "match": "\\s*+@@"
-        },
-        {
-          "begin": "\\s*+(=\u003e)",
-          "end": "(?=.)",
-          "patterns": [
-            {
-              "include": "#flowtype-parse-types"
-            }
-          ],
-          "beginCaptures": {
-            "1": {
-              "name": "storage.type.function.arrow.js"
-            }
-          },
-          "applyEndPatternLast": true
-        },
-        {
-          "begin": "\\s*+(?=([$_\\p{L}](?:[$.\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}])*+)?\\s*=)(?!=\u003e|==)",
-          "end": "\\s*(?=,|;|\\)|}|\\]|\\b(if|switch|try|var|let|const|static|function|return|class|do|for|while|debugger|export|import|yield)\\b|type\\s+[$\\w]+|declare\\s+[$\\w]+|interface\\s+[$\\w]+)",
-          "patterns": [
-            {
-              "include": "#expression"
-            }
-          ]
-        },
-        {
-          "include": "#flowtype-bracketed-parameters"
-        },
-        {
-          "include": "#flowtype-parse-array"
-        },
-        {
-          "include": "#expression"
-        }
-      ]
-    },
-    "ignore-long-lines": {
-      "patterns": [
-        {
-          "match": "^(?:).{1000,}"
-        }
-      ]
-    },
-    "jsdoc": {
-      "patterns": [
-        {
-          "name": "storage.type.class.doc",
-          "match": "(?\u003c!\\w)@(abstract|alias|author|class|constructor|deprecated|enum|event|example|extends|fires|ignore|inheritdoc|member|method|param|private|property|protected|readonly|requires|return|since|static|throws|type|var)\\b"
-        },
-        {
-          "name": "storage.type.class.jsdoc",
-          "match": "(?\u003c!\\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": "js",
+              "begin": "\\${",
+              "end": "}",
+              "patterns": [
+                {
+                  "include": "#core"
+                }
+              ]
+            }
+          ]
         },
         {
-          "name": "storage.type.class.jsduck",
-          "match": "(?\u003c!\\w)@(accessor|alternateClassName|aside|cfg|chainable|docauthor|evented|experimental|ftype|hide|inheritable|localdoc|markdown|mixins|new|override|preventable|ptype|removed|scss mixin|singleton|template|uses|xtype)\\b"
-        }
-      ]
-    },
-    "jsx": {
-      "patterns": [
-        {
-          "begin": "(?\u003c=\\(|\\{|\\[|,|\u0026\u0026|\\|\\||\\?|:|=|=\u003e|\\Wreturn|^return|\\Wdefault|^)\\s*+(?=\u003c[$_\\p{L}])",
-          "end": "(?=.)",
+          "name": "meta.graphql.js",
+          "begin": "\\s*+`#graphql",
+          "end": "`",
           "patterns": [
             {
-              "include": "#jsx-tag-element-name"
+              "include": "source.graphql"
+            },
+            {
+              "name": "js",
+              "begin": "\\${",
+              "end": "}",
+              "patterns": [
+                {
+                  "include": "#core"
+                }
+              ]
             }
-          ],
-          "applyEndPatternLast": true
+          ]
         }
       ]
     },
-    "jsx-assignment": {
-      "patterns": [
-        {
-          "name": "keyword.operator.assignment.jsx",
-          "match": "=(?=\\s*(?:'|\"|{|/\\*|\u003c|//|\\n))"
-        }
-      ]
+    "jsx-attribute-assignment": {
+      "name": "keyword.operator.assignment.jsx",
+      "match": "="
     },
     "jsx-attribute-name": {
+      "name": "entity.other.attribute-name.jsx",
+      "match": "[_$a-zA-Z][-$\\w]*"
+    },
+    "jsx-attributes": {
       "patterns": [
         {
-          "match": "(?\u003c!\\S)([$_\\p{L}](?:[$.\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}-](?\u003c!\\.\\.))*+)(?\u003c!\\.)(?=//|/\\*|=|\\s|\u003e|/\u003e)",
-          "captures": {
-            "0": {
-              "name": "entity.other.attribute-name.jsx"
-            }
-          }
+          "include": "#jsx-attribute-name"
+        },
+        {
+          "include": "#jsx-attribute-assignment"
+        },
+        {
+          "include": "#jsx-string-quoted"
+        },
+        {
+          "include": "#jsx-evaluated-code"
+        },
+        {
+          "include": "#comments"
         }
       ]
     },
     "jsx-entities": {
       "patterns": [
         {
-          "match": "(\u0026)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
-          "captures": {
-            "0": {
-              "name": "constant.character.entity.jsx"
-            },
-            "1": {
-              "name": "punctuation.definition.entity.jsx"
-            },
-            "2": {
-              "name": "entity.name.tag.html.jsx"
-            },
-            "3": {
-              "name": "punctuation.definition.entity.jsx"
-            }
-          }
+          "name": "constant.character.entity.jsx",
+          "match": "\u0026(?:[a-zA-Z0-9]+|#\\d+|#x[[:xdigit:]]+);"
         },
         {
           "name": "invalid.illegal.bad-ampersand.jsx",
-          "match": "\u0026\\s*+;"
+          "match": "\u0026\\S*;"
         }
       ]
     },
     "jsx-evaluated-code": {
-      "name": "meta.embedded.expression.js",
-      "contentName": "source.js.jsx",
+      "name": "meta.embedded.expression.jsx",
       "begin": "{",
       "end": "}",
       "patterns": [
-        {
-          "include": "#jsx-string-double-quoted"
-        },
-        {
-          "include": "#jsx-string-single-quoted"
-        },
-        {
-          "include": "#jsx-spread-attribute"
-        },
         {
           "include": "#expression"
         }
@@ -1086,18 +837,10 @@
         }
       }
     },
-    "jsx-spread-attribute": {
-      "patterns": [
-        {
-          "name": "keyword.operator.spread.jsx",
-          "match": "(?\u003c!\\.)\\.\\.\\."
-        }
-      ]
-    },
-    "jsx-string-double-quoted": {
-      "name": "string.quoted.double.js",
-      "begin": "\"",
-      "end": "\"(?\u003c!\\\\\")",
+    "jsx-string-quoted": {
+      "name": "string.quoted.jsx",
+      "begin": "([\"'])",
+      "end": "\\1",
       "patterns": [
         {
           "include": "#jsx-entities"
@@ -1114,128 +857,65 @@
         }
       }
     },
-    "jsx-string-single-quoted": {
-      "name": "string.quoted.single.js",
-      "begin": "'",
-      "end": "'(?\u003c!\\\\')",
+    "jsx-tag-end": {
+      "begin": "\u003e",
+      "end": "(?=\u003c/)",
       "patterns": [
+        {
+          "include": "#jsx-tag-start"
+        },
+        {
+          "include": "#jsx-evaluated-code"
+        },
         {
           "include": "#jsx-entities"
         }
       ],
       "beginCaptures": {
         "0": {
-          "name": "punctuation.definition.string.begin.jsx"
-        }
-      },
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.end.jsx"
+          "name": "punctuation.definition.tag.end.jsx"
         }
       }
     },
-    "jsx-tag-attributes": {
-      "patterns": [
-        {
-          "include": "#jsx-attribute-name"
-        },
-        {
-          "include": "#jsx-assignment"
-        },
-        {
-          "include": "#jsx-string-double-quoted"
-        },
-        {
-          "include": "#jsx-string-single-quoted"
-        },
-        {
-          "include": "#jsx-evaluated-code"
-        },
-        {
-          "include": "#jsx-tag-element-name"
-        },
-        {
-          "include": "#comments"
-        }
-      ]
-    },
-    "jsx-tag-element-name": {
+    "jsx-tag-start": {
       "patterns": [
         {
-          "name": "meta.tag.jsx",
-          "begin": "\\s*+(\u003c)((\\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}\\.-](?\u003c!\\.\\.))*+)+))(?=[ /\u003e\\s])(?![:])(?\u003c!\\.|:)",
-          "end": "\\s*(?\u003c=\u003c/)((\\4)|\\2)(\u003e)|(/\u003e)|((?\u003c=\u003c/)[\\S ]*?)\u003e",
+          "begin": "(\u003c)([_$a-zA-Z][-$:.\\w]*[$\\w]*)",
+          "end": "(\u003c/)(\\2)(\u003e)|(/\u003e)",
           "patterns": [
             {
-              "include": "#jsx-tag-termination"
+              "include": "#jsx-tag-end"
             },
             {
-              "include": "#jsx-tag-attributes"
+              "include": "#jsx-attributes"
             }
           ],
           "beginCaptures": {
             "1": {
-              "name": "punctuation.definition.tag.jsx"
+              "name": "punctuation.definition.tag.begin.jsx"
             },
             "2": {
-              "name": "entity.name.tag.open.jsx"
-            },
-            "4": {
-              "name": "support.class.component.open.jsx"
+              "name": "entity.name.tag.html.jsx"
             }
           },
           "endCaptures": {
             "1": {
-              "name": "entity.name.tag.close.jsx"
+              "name": "punctuation.definition.tag.begin.jsx"
             },
             "2": {
-              "name": "support.class.component.close.jsx"
+              "name": "entity.name.tag.html.jsx"
             },
             "3": {
-              "name": "punctuation.definition.tag.jsx"
+              "name": "punctuation.definition.tag.end.jsx"
             },
             "4": {
-              "name": "punctuation.definition.tag.jsx"
-            },
-            "5": {
-              "name": "invalid.illegal.termination.jsx"
+              "name": "punctuation.definition.tag.end.jsx"
             }
           }
-        }
-      ]
-    },
-    "jsx-tag-termination": {
-      "patterns": [
+        },
         {
-          "begin": "(\u003e)",
-          "end": "(\u003c/)",
-          "patterns": [
-            {
-              "include": "#jsx-evaluated-code"
-            },
-            {
-              "include": "#jsx-entities"
-            },
-            {
-              "include": "#jsx-tag-element-name"
-            }
-          ],
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.tag.jsx"
-            },
-            "1": {
-              "name": "JSXStartTagEnd"
-            }
-          },
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.tag.jsx"
-            },
-            "1": {
-              "name": "JSXEndTagStart"
-            }
-          }
+          "name": "invalid.illegal.tag.incomplete.jsx",
+          "match": "\u003c"
         }
       ]
     },
@@ -1243,47 +923,11 @@
       "patterns": [
         {
           "name": "meta.function.arrow.js",
-          "begin": "\\s*+(\\basync\\b)?\\s*+(?=(\u003c(?:(?\u003e[^\u003c\u003e]+)|\\g\u003c-1\u003e)*\u003e)?\\s*+(\\((?:(?\u003e[^()]+)|\\g\u003c-1\u003e)*\\))\\s*+(?:\\s*:(\\s*+(\u0026|\\|)?(\\s*+[$_a-zA-Z0-9]+(\u003c(?:(?\u003e[^\u003c\u003e]+)|\\g\u003c-1\u003e)*\u003e)?|\\s*+(\\{(?:(?\u003e[^{}]+)|\\g\u003c-1\u003e)*\\})|\\s*+(\\[(?:(?\u003e[^\\[\\]]+)|\\g\u003c-1\u003e)*\\])|\\s*+(\\s*(?P\u003cquote\u003e[\"']).*?(?P=quote)(?\u003c!\\\\.))|\\s*[x0-9A-Fa-f]+))*+)*\\s*=\u003e)",
-          "end": "\\s*(=\u003e)",
-          "patterns": [
-            {
-              "include": "#flowtype"
-            }
-          ],
-          "beginCaptures": {
-            "1": {
-              "name": "storage.type.js"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "storage.type.function.arrow.js"
-            }
-          },
-          "applyEndPatternLast": true
-        },
-        {
-          "name": "meta.function.arrow.js",
-          "match": "\\s*+(\\basync\\b)?\\s*+([_$a-zA-Z][$\\w]*)\\s*(=\u003e)",
-          "captures": {
-            "1": {
-              "name": "storage.type.js"
-            },
-            "2": {
-              "name": "variable.other.readwrite.js"
-            },
-            "3": {
-              "name": "storage.type.function.arrow.js"
-            }
-          }
-        },
-        {
-          "name": "meta.function.arrow.js",
-          "begin": "\\s*+(\\b[_$a-zA-Z][$\\w]*)\\s*+(=)\\s*+(\\basync\\b)?\\s*+(?=(\u003c(?:(?\u003e[^\u003c\u003e]+)|\\g\u003c-1\u003e)*\u003e)?\\s*+(\\((?:(?\u003e[^()]+)|\\g\u003c-1\u003e)*\\))\\s*+(?:\\s*:(\\s*+(\u0026|\\|)?(\\s*+[$_a-zA-Z0-9]+(\u003c(?:(?\u003e[^\u003c\u003e]+)|\\g\u003c-1\u003e)*\u003e)?|\\s*+(\\{(?:(?\u003e[^{}]+)|\\g\u003c-1\u003e)*\\})|\\s*+(\\[(?:(?\u003e[^\\[\\]]+)|\\g\u003c-1\u003e)*\\])|\\s*+(\\s*(?P\u003cquote\u003e[\"']).*?(?P=quote)(?\u003c!\\\\.))|\\s*[x0-9A-Fa-f]+))*+)*\\s*=\u003e)",
-          "end": "\\s*(=\u003e)",
+          "begin": "(?x)\n  (?:([_$a-zA-Z][$\\w]*)\\s*(=)\\s*)?\n  (?:\\b(async)\\s+)?\n  (?=(\\((?\u003e(?\u003e[^()]+)|\\g\u003c-1\u003e)*\\))\\s*(=\u003e))",
+          "end": "(?\u003c=\\))\\s*(=\u003e)",
           "patterns": [
             {
-              "include": "#flowtype"
+              "include": "#function-declaration-parameters"
             }
           ],
           "beginCaptures": {
@@ -1301,12 +945,11 @@
             "1": {
               "name": "storage.type.function.arrow.js"
             }
-          },
-          "applyEndPatternLast": true
+          }
         },
         {
           "name": "meta.function.arrow.js",
-          "match": "\\s*+(\\b[_$a-zA-Z][$\\w]*)\\s*+(=)\\s*+\\s*+(\\basync\\b)?\\s*+([_$a-zA-Z][$\\w]*)\\s*(=\u003e)",
+          "match": "(?x)\n  (?:([_$a-zA-Z][$\\w]*)\\s*(=)\\s*)?\n  (?:(async)\\s+)?\n  \\b([_$a-zA-Z][$\\w]*)\\s*(=\u003e)",
           "captures": {
             "1": {
               "name": "entity.name.function.js"
@@ -1318,7 +961,7 @@
               "name": "storage.type.js"
             },
             "4": {
-              "name": "variable.other.readwrite.js"
+              "name": "variable.parameter.function.js"
             },
             "5": {
               "name": "storage.type.function.arrow.js"
@@ -1327,11 +970,11 @@
         },
         {
           "name": "meta.prototype.function.arrow.js",
-          "begin": "\\s*+(\\b[A-Z][$\\w]*)?(\\.)(prototype)(\\.)([_$a-zA-Z][$\\w]*)\\s*+(=)\\s*+(\\basync\\b)?\\s*+(?=(\u003c(?:(?\u003e[^\u003c\u003e]+)|\\g\u003c-1\u003e)*\u003e)?\\s*+(\\((?:(?\u003e[^()]+)|\\g\u003c-1\u003e)*\\))\\s*+(?:\\s*:(\\s*+(\u0026|\\|)?(\\s*+[$_a-zA-Z0-9]+(\u003c(?:(?\u003e[^\u003c\u003e]+)|\\g\u003c-1\u003e)*\u003e)?|\\s*+(\\{(?:(?\u003e[^{}]+)|\\g\u003c-1\u003e)*\\})|\\s*+(\\[(?:(?\u003e[^\\[\\]]+)|\\g\u003c-1\u003e)*\\])|\\s*+(\\s*(?P\u003cquote\u003e[\"']).*?(?P=quote)(?\u003c!\\\\.))|\\s*[x0-9A-Fa-f]+))*+)*\\s*=\u003e)",
-          "end": "\\s*(=\u003e)",
+          "begin": "(?x)\n  (\\b_?[A-Z][$\\w]*)?\n  (\\.)(prototype)\n  (\\.)([_$a-zA-Z][$\\w]*)\n  \\s*(=)\n  \\s*(async)?\n  \\s*(?=(\\((?\u003e(?\u003e[^()]+)|\\g\u003c-1\u003e)*\\))\\s*(=\u003e))",
+          "end": "(?\u003c=\\))\\s*(=\u003e)",
           "patterns": [
             {
-              "include": "#flowtype"
+              "include": "#function-declaration-parameters"
             }
           ],
           "beginCaptures": {
@@ -1361,12 +1004,11 @@
             "1": {
               "name": "storage.type.function.arrow.js"
             }
-          },
-          "applyEndPatternLast": true
+          }
         },
         {
           "name": "meta.prototype.function.arrow.js",
-          "match": "\\s*+(\\b_?[A-Z][$\\w]*)?(\\.)(prototype)(\\.)([_$a-zA-Z][$\\w]*)\\s*+(=)\\s*+(\\basync\\b)?\\s*+([_$a-zA-Z][$\\w]*)\\s*(=\u003e)",
+          "match": "(?x)\n  (\\b_?[A-Z][$\\w]*)?\n  (\\.)(prototype)\n  (\\.)([_$a-zA-Z][$\\w]*)\n  \\s*(=)\n  \\s*(async)?\n  \\s*\\b([_$a-zA-Z][$\\w]*)\\s*(=\u003e)",
           "captures": {
             "1": {
               "name": "entity.name.class.js"
@@ -1390,7 +1032,7 @@
               "name": "storage.type.js"
             },
             "8": {
-              "name": "variable.other.readwrite.js"
+              "name": "variable.parameter.function.js"
             },
             "9": {
               "name": "storage.type.function.arrow.js"
@@ -1399,11 +1041,11 @@
         },
         {
           "name": "meta.function.static.arrow.js",
-          "begin": "\\s*+(\\b_?[A-Z][$\\w]*)?(\\.)([_$a-zA-Z][$\\w]*)\\s*+(=)\\s*+(\\basync\\b)?\\s*+(?=(\u003c(?:(?\u003e[^\u003c\u003e]+)|\\g\u003c-1\u003e)*\u003e)?\\s*+(\\((?:(?\u003e[^()]+)|\\g\u003c-1\u003e)*\\))\\s*+(?:\\s*:(\\s*+(\u0026|\\|)?(\\s*+[$_a-zA-Z0-9]+(\u003c(?:(?\u003e[^\u003c\u003e]+)|\\g\u003c-1\u003e)*\u003e)?|\\s*+(\\{(?:(?\u003e[^{}]+)|\\g\u003c-1\u003e)*\\})|\\s*+(\\[(?:(?\u003e[^\\[\\]]+)|\\g\u003c-1\u003e)*\\])|\\s*+(\\s*(?P\u003cquote\u003e[\"']).*?(?P=quote)(?\u003c!\\\\.))|\\s*[x0-9A-Fa-f]+))*+)*\\s*=\u003e)",
-          "end": "\\s*(=\u003e)",
+          "begin": "(?x)\n  (\\b_?[A-Z][$\\w]*)?\n  (\\.)([_$a-zA-Z][$\\w]*)\n  \\s*(=)\n  \\s*(async)?\n  \\s*(?=(\\((?\u003e(?\u003e[^()]+)|\\g\u003c-1\u003e)*\\))\\s*(=\u003e))",
+          "end": "(?\u003c=\\))\\s*(=\u003e)",
           "patterns": [
             {
-              "include": "#flowtype"
+              "include": "#function-declaration-parameters"
             }
           ],
           "beginCaptures": {
@@ -1427,12 +1069,11 @@
             "1": {
               "name": "storage.type.function.arrow.js"
             }
-          },
-          "applyEndPatternLast": true
+          }
         },
         {
           "name": "meta.function.static.arrow.js",
-          "match": "\\s*+(\\b_?[A-Z][$\\w]*)?(\\.)([_$a-zA-Z][$\\w]*)\\s*+(=)\\s*+(\\basync\\b)?\\s*+([_$a-zA-Z][$\\w]*)\\s*(=\u003e)",
+          "match": "(?x)\n  (\\b_?[A-Z][$\\w]*)?\n  (\\.)([_$a-zA-Z][$\\w]*)\n  \\s*(=)\n  \\s*(async)?\n  \\s*\\b([_$a-zA-Z][$\\w]*)\\s*(=\u003e)",
           "captures": {
             "1": {
               "name": "entity.name.class.js"
@@ -1450,7 +1091,7 @@
               "name": "storage.type.js"
             },
             "6": {
-              "name": "variable.other.readwrite.js"
+              "name": "variable.parameter.function.js"
             },
             "7": {
               "name": "storage.type.function.arrow.js"
@@ -1463,71 +1104,25 @@
       "patterns": [
         {
           "name": "meta.function.json.arrow.js",
-          "begin": "(?\u003c=^|{|,)\\s*+(\\b[_$a-zA-Z][$\\w]*)\\s*+(:)\\s*+(\\basync\\b)?\\s*+(?=(\u003c(?:(?\u003e[^\u003c\u003e]+)|\\g\u003c-1\u003e)*\u003e)?\\s*+(\\((?:(?\u003e[^()]+)|\\g\u003c-1\u003e)*\\))\\s*+(?:\\s*:(\\s*+(\u0026|\\|)?(\\s*+[$_a-zA-Z0-9]+(\u003c(?:(?\u003e[^\u003c\u003e]+)|\\g\u003c-1\u003e)*\u003e)?|\\s*+(\\{(?:(?\u003e[^{}]+)|\\g\u003c-1\u003e)*\\})|\\s*+(\\[(?:(?\u003e[^\\[\\]]+)|\\g\u003c-1\u003e)*\\])|\\s*+(\\s*(?P\u003cquote\u003e[\"']).*?(?P=quote)(?\u003c!\\\\.))|\\s*[x0-9A-Fa-f]+))*+)*\\s*=\u003e)",
-          "end": "\\s*(=\u003e)",
+          "begin": "(?x)\n  (?\u003e\n    ((')((?\u003e[^'\\\\]|\\\\.)*)('))|\n    ((\")((?\u003e[^\"\\\\]|\\\\.)*)(\"))|\n    (([_$a-zA-Z][$\\w]*|\\d+))\n  )\n  \\s*(:)\n  \\s*(?:\\b(async)\\s+)?\n  \\s*(?=(\\((?\u003e(?\u003e[^()]+)|\\g\u003c-1\u003e)*\\))\\s*(=\u003e))",
+          "end": "(?\u003c=\\))\\s*(=\u003e)",
           "patterns": [
             {
-              "include": "#flowtype"
+              "include": "#function-declaration-parameters"
             }
           ],
           "beginCaptures": {
             "1": {
-              "name": "entity.name.function.js"
-            },
-            "2": {
-              "name": "punctuation.separator.key-value.js"
-            },
-            "3": {
-              "name": "storage.type.js"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "storage.type.function.arrow.js"
-            }
-          }
-        },
-        {
-          "name": "meta.function.json.arrow.js",
-          "begin": "(?\u003c=^|{|,)\\s*+(\\b[_$a-zA-Z][$\\w]*)\\s*+(:)\\s*+(\\basync\\b)?\\s*+(?=(\u003c(?:(?\u003e[^\u003c\u003e]+)|\\g\u003c-1\u003e)*\u003e)?\\s*+([_$a-zA-Z][$\\w]*)\\s*+(?:\\s*:(\\s*+(\u0026|\\|)?(\\s*+[$_a-zA-Z0-9]+(\u003c(?:(?\u003e[^\u003c\u003e]+)|\\g\u003c-1\u003e)*\u003e)?|\\s*+(\\{(?:(?\u003e[^{}]+)|\\g\u003c-1\u003e)*\\})|\\s*+(\\[(?:(?\u003e[^\\[\\]]+)|\\g\u003c-1\u003e)*\\])|\\s*+(\\s*(?P\u003cquote\u003e[\"']).*?(?P=quote)(?\u003c!\\\\.))|\\s*[x0-9A-Fa-f]+))*+)*\\s*=\u003e)",
-          "end": "\\s*(=\u003e)",
-          "patterns": [
-            {
-              "include": "#flowtype-polymorphs"
+              "name": "string.quoted.js"
             },
-            {
-              "include": "#flowtype-variable"
-            }
-          ],
-          "beginCaptures": {
-            "1": {
+            "10": {
               "name": "entity.name.function.js"
             },
-            "2": {
+            "11": {
               "name": "punctuation.separator.key-value.js"
             },
-            "3": {
+            "12": {
               "name": "storage.type.js"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "storage.type.function.arrow.js"
-            }
-          }
-        },
-        {
-          "name": "meta.function.json.arrow.js",
-          "begin": "(?\u003c=^|{|,)\\s*+((?P\u003cquote1\u003e'|\\\")([^\"']*)(?P=quote1))\\s*(:)\\s*+(\\basync\\b)?\\s*+(?=(\u003c(?:(?\u003e[^\u003c\u003e]+)|\\g\u003c-1\u003e)*\u003e)?\\s*+(\\((?:(?\u003e[^()]+)|\\g\u003c-1\u003e)*\\))\\s*+(?:\\s*:(\\s*+(\u0026|\\|)?(\\s*+[$_a-zA-Z0-9]+(\u003c(?:(?\u003e[^\u003c\u003e]+)|\\g\u003c-1\u003e)*\u003e)?|\\s*+(\\{(?:(?\u003e[^{}]+)|\\g\u003c-1\u003e)*\\})|\\s*+(\\[(?:(?\u003e[^\\[\\]]+)|\\g\u003c-1\u003e)*\\])|\\s*+(\\s*(?P\u003cquote2\u003e[\"']).*?(?P=quote2)(?\u003c!\\\\.))|\\s*[x0-9A-Fa-f]+))*+)*\\s*=\u003e)",
-          "end": "\\s*(=\u003e)",
-          "patterns": [
-            {
-              "include": "#flowtype"
-            }
-          ],
-          "beginCaptures": {
-            "1": {
-              "name": "string.quoted.js"
             },
             "2": {
               "name": "punctuation.definition.string.begin.js"
@@ -1539,35 +1134,49 @@
               "name": "punctuation.definition.string.end.js"
             },
             "5": {
-              "name": "punctuation.separator.key-value.js"
+              "name": "string.quoted.js"
             },
             "6": {
-              "name": "storage.type.js"
+              "name": "punctuation.definition.string.begin.js"
+            },
+            "7": {
+              "name": "entity.name.function.js"
+            },
+            "8": {
+              "name": "punctuation.definition.string.end.js"
+            },
+            "9": {
+              "name": "string.unquoted.js"
             }
           },
           "endCaptures": {
             "1": {
               "name": "storage.type.function.arrow.js"
             }
-          },
-          "applyEndPatternLast": true
+          }
         },
         {
           "name": "meta.function.json.arrow.js",
-          "begin": "(?\u003c=^|{|,)\\s*+((?P\u003cquote1\u003e'|\\\")([^\"']*)(?P=quote1))\\s*+(:)\\s*+(\\basync\\b)?\\s*+(?=(\u003c(?:(?\u003e[^\u003c\u003e]+)|\\g\u003c-1\u003e)*\u003e)?\\s*+([_$a-zA-Z][$\\w]*)\\s*+(?:\\s*:(\\s*+(\u0026|\\|)?(\\s*+[$_a-zA-Z0-9]+(\u003c(?:(?\u003e[^\u003c\u003e]+)|\\g\u003c-1\u003e)*\u003e)?|\\s*+(\\{(?:(?\u003e[^{}]+)|\\g\u003c-1\u003e)*\\})|\\s*+(\\[(?:(?\u003e[^\\[\\]]+)|\\g\u003c-1\u003e)*\\])|\\s*+(\\s*(?P\u003cquote2\u003e[\"']).*?(?P=quote2)(?\u003c!\\\\.))|\\s*[x0-9A-Fa-f]+))*+)*\\s*=\u003e)",
-          "end": "\\s*(=\u003e)",
-          "patterns": [
-            {
-              "include": "#flowtype-polymorphs"
-            },
-            {
-              "include": "#flowtype-variable"
-            }
-          ],
-          "beginCaptures": {
+          "match": "(?x)\n  (?\u003e\n    ((')((?\u003e[^'\\\\]|\\\\.)*)('))|\n    ((\")((?\u003e[^\"\\\\]|\\\\.)*)(\"))|\n    (([_$a-zA-Z][$\\w]*|\\d+))\n  )\n  \\s*(:)\n  \\s*(?:\\b(async)\\s+)?\n  \\s*\\b([_$a-zA-Z][$\\w]*)\\s*(=\u003e)",
+          "captures": {
             "1": {
               "name": "string.quoted.js"
             },
+            "10": {
+              "name": "entity.name.function.js"
+            },
+            "11": {
+              "name": "punctuation.separator.key-value.js"
+            },
+            "12": {
+              "name": "storage.type.js"
+            },
+            "13": {
+              "name": "variable.parameter.function.js"
+            },
+            "14": {
+              "name": "storage.type.function.arrow.js"
+            },
             "2": {
               "name": "punctuation.definition.string.begin.js"
             },
@@ -1578,15 +1187,19 @@
               "name": "punctuation.definition.string.end.js"
             },
             "5": {
-              "name": "punctuation.separator.key-value.js"
+              "name": "string.quoted.js"
             },
             "6": {
-              "name": "storage.type.js"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "storage.type.function.arrow.js"
+              "name": "punctuation.definition.string.begin.js"
+            },
+            "7": {
+              "name": "entity.name.function.js"
+            },
+            "8": {
+              "name": "punctuation.definition.string.end.js"
+            },
+            "9": {
+              "name": "string.unquoted.js"
             }
           }
         }
@@ -1595,85 +1208,112 @@
     "literal-class": {
       "patterns": [
         {
-          "begin": "\\s*+(?\u003c!\\.)\\b(class)\\s+",
-          "end": "\\s*(?\u003c=})",
+          "name": "meta.class.js",
+          "begin": "(?\u003c!\\.)\\b(?:(class)|(interface))\\b",
+          "end": "\\}",
           "patterns": [
             {
-              "match": "\\s*+\\b(extends)\\b\\s*+",
-              "captures": {
-                "0": {
-                  "name": "meta.class.extends.js"
+              "include": "#comments"
+            },
+            {
+              "begin": "([_$a-zA-Z][$\\w]*)",
+              "end": "(?={)",
+              "patterns": [
+                {
+                  "include": "#comments"
+                },
+                {
+                  "include": "#flowtype-polymorph"
                 },
-                "1": {
-                  "name": "storage.type.extends.js"
+                {
+                  "name": "meta.class.extends.js",
+                  "begin": "(?\u003c!\\.)\\b(extends)\\b",
+                  "end": "(?={)",
+                  "patterns": [
+                    {
+                      "include": "#flowtype-polymorph"
+                    },
+                    {
+                      "include": "#expression"
+                    }
+                  ],
+                  "beginCaptures": {
+                    "0": {
+                      "name": "storage.type.extends.js"
+                    }
+                  }
+                }
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "entity.name.class.js"
                 }
               }
             },
             {
-              "name": "entity.name.class.js",
-              "match": "(?\u003c!\\.)\\s*+([$_\\p{L}](?:[$\\p{L}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Nl}\\p{Pc}])*+)"
-            },
-            {
-              "include": "#flowtype-polymorphs"
-            },
-            {
-              "contentName": "meta.class.body.js",
-              "begin": "\\s*+{",
-              "end": "\\s*(})",
+              "begin": "\\{",
+              "end": "(?=})",
               "patterns": [
                 {
-                  "include": "#class-body"
+                  "include": "#es7-decorators"
+                },
+                {
+                  "include": "#class-properties"
+                },
+                {
+                  "include": "#class-method-definition"
+                },
+                {
+                  "include": "#class-method-storage"
+                },
+                {
+                  "include": "#brackets"
+                },
+                {
+                  "include": "#comments"
                 }
               ],
               "beginCaptures": {
                 "0": {
-                  "name": "punctuation.section.class.begin.js"
-                }
-              },
-              "endCaptures": {
-                "1": {
-                  "name": "punctuation.section.class.end.js"
+                  "name": "meta.brace.curly.begin.js"
                 }
               }
-            },
-            {
-              "include": "#expression"
             }
           ],
           "beginCaptures": {
-            "0": {
-              "name": "meta.class.js"
-            },
             "1": {
               "name": "storage.type.class.js"
+            },
+            "2": {
+              "name": "storage.type.interface.flowtype.js"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "meta.brace.curly.end.js"
             }
           }
         }
       ]
     },
-    "literal-comma": {
-      "patterns": [
-        {
-          "name": "meta.delimiter.comma.js",
-          "match": "\\s*+,"
-        }
-      ]
-    },
     "literal-constructor": {
       "patterns": [
         {
-          "name": "meta.instance.constructor",
-          "begin": "\\s*+(new)\\s+(?=[_$a-zA-Z][$\\w.]*)",
+          "name": "meta.instance.constructor.js",
+          "begin": "(new)\\s+(?=[_$a-zA-Z][$\\w.]*)",
           "end": "(?![_$a-zA-Z][$\\w.]*)",
           "patterns": [
             {
-              "include": "#support"
+              "include": "#support-class"
+            },
+            {
+              "include": "#support-other"
             },
             {
               "match": "([_$a-zA-Z][$\\w.]*\\.)?([_$a-zA-Z][$\\w]*)",
               "captures": {
                 "2": {
-                  "name": "entity.name.type.new.js"
+                  "name": "variable.function.constructor.js"
                 }
               }
             }
@@ -1682,8 +1322,7 @@
             "1": {
               "name": "keyword.operator.new.js"
             }
-          },
-          "disabled": true
+          }
         }
       ]
     },
@@ -1691,12 +1330,15 @@
       "patterns": [
         {
           "name": "meta.for.js",
-          "begin": "\\s*+(?\u003c!\\.)\\b(for)\\b",
-          "end": "\\s*\\)",
+          "begin": "(?\u003c!\\.)\\b(for)\\b",
+          "end": "\\)",
           "patterns": [
             {
-              "begin": "\\s*+\\(",
-              "end": "\\s*(?=\\))",
+              "include": "#comments"
+            },
+            {
+              "begin": "\\(",
+              "end": "(?=\\))",
               "patterns": [
                 {
                   "include": "#literal-keyword-storage"
@@ -1710,7 +1352,7 @@
               ],
               "beginCaptures": {
                 "0": {
-                  "name": "meta.brace.round.js"
+                  "name": "meta.brace.round.begin.js"
                 }
               }
             }
@@ -1722,7 +1364,7 @@
           },
           "endCaptures": {
             "0": {
-              "name": "meta.brace.round.js"
+              "name": "meta.brace.round.end.js"
             }
           }
         }
@@ -1732,36 +1374,14 @@
       "patterns": [
         {
           "name": "meta.function.js",
-          "begin": "\\s*+(?:\\b(async)\\b\\s+)?\\s*+(?:(?\u003c=\\.\\.\\.)|(?\u003c!\\.))(\\bfunction\\b)\\s*+(\\*?)\\s*+([_$a-zA-Z][$\\w]*)?\\s*+(?=\\(|\u003c)",
-          "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": "(?x)\n  (?:([_$a-zA-Z][$\\w]*)\\s*(=)\\s*)?\n  (?:(async)\\s+)?\n  (function)(?\u003e\\s*(\\*)|(?=[\\s(\u003c]))\n  \\s*([_$a-zA-Z][$\\w]*)?",
+          "end": "(?\u003c=\\))",
           "patterns": [
             {
-              "include": "#flowtype"
-            }
-          ],
-          "beginCaptures": {
-            "1": {
-              "name": "storage.type.js"
-            },
-            "2": {
-              "name": "storage.type.function.js"
-            },
-            "3": {
-              "name": "keyword.generator.asterisk.js"
+              "include": "#flowtype-polymorph"
             },
-            "4": {
-              "name": "entity.name.function.js"
-            }
-          },
-          "applyEndPatternLast": true
-        },
-        {
-          "name": "meta.function.js",
-          "begin": "\\s*+(\\b[_$a-zA-Z][$\\w]*)\\s*+(=)\\s*+(?:(async)\\s+)?\\s*+((?\u003c!\\.)\\bfunction\\b)\\s*+(\\*?)\\s*+([_$a-zA-Z][$\\w]*)?\\s*+(?=\\(|\u003c)",
-          "end": "\\s*(?=\\;|{|\\b(if|switch|try|var|let|const|static|function|return|class|do|for|while|debugger|export|import|yield|type|declare|interface)\\b|\\)|})",
-          "patterns": [
             {
-              "include": "#flowtype"
+              "include": "#function-declaration-parameters"
             }
           ],
           "beginCaptures": {
@@ -1783,16 +1403,18 @@
             "6": {
               "name": "entity.name.function.js"
             }
-          },
-          "applyEndPatternLast": true
+          }
         },
         {
-          "name": "meta.prototype.function.js",
-          "begin": "\\s*+(\\b_?[A-Z][$\\w]*)?(\\.)(prototype)(\\.)([_$a-zA-Z][$\\w]*)\\s*+(=)\\s*+(?:(async)\\s+)?\\s*+((?\u003c!\\.)\\bfunction\\b)\\s*+(\\*?)\\s*+([_$a-zA-Z][$\\w]*)?\\s*+(?=\\(|\u003c)",
-          "end": "\\s*(?=\\;|{|\\b(if|switch|try|var|let|const|static|function|return|class|do|for|while|debugger|export|import|yield|type|declare|interface)\\b|\\)|})",
+          "name": "meta.function.prototype.js",
+          "begin": "(?x)\n  (\\b_?[A-Z][$\\w]*)?\n  (\\.)(prototype)\n  (\\.)([_$a-zA-Z][$\\w]*)\n  \\s*(=)\n  \\s*(?:(async)\\s+)?\n  \\s*(function)(?\u003e\\s*(\\*)|(?=[\\s(\u003c]))\n  \\s*([_$a-zA-Z][$\\w]*)?\\s*",
+          "end": "(?\u003c=\\))",
           "patterns": [
             {
-              "include": "#flowtype"
+              "include": "#flowtype-polymorph"
+            },
+            {
+              "include": "#function-declaration-parameters"
             }
           ],
           "beginCaptures": {
@@ -1826,16 +1448,18 @@
             "9": {
               "name": "keyword.generator.asterisk.js"
             }
-          },
-          "applyEndPatternLast": true
+          }
         },
         {
           "name": "meta.function.static.js",
-          "begin": "\\s*+(\\b_?[A-Z][$\\w]*)?(\\.)([_$a-zA-Z][$\\w]*)\\s*+(=)\\s*+(?:(async)\\s+)?\\s*+((?\u003c!\\.)\\bfunction\\b)\\s*+(\\*?)\\s*+([_$a-zA-Z][$\\w]*)?\\s*+(?=\\(|\u003c)",
-          "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": "(?x)\n  (\\b_?[A-Z][$\\w]*)?\n  (\\.)([_$a-zA-Z][$\\w]*)\n  \\s*(=)\n  \\s*(?:(async)\\s+)?\n  \\s*(function)(?\u003e\\s*(\\*)|(?=[\\s(\u003c]))\n  \\s*([_$a-zA-Z][$\\w]*)?\\s*",
+          "end": "(?\u003c=\\))",
           "patterns": [
             {
-              "include": "#flowtype"
+              "include": "#flowtype-polymorph"
+            },
+            {
+              "include": "#function-declaration-parameters"
             }
           ],
           "beginCaptures": {
@@ -1863,90 +1487,41 @@
             "8": {
               "name": "entity.name.function.js"
             }
-          },
-          "applyEndPatternLast": true
+          }
         }
       ]
     },
     "literal-function-call": {
       "patterns": [
-        {
-          "include": "#literal-keywords"
-        },
         {
           "name": "meta.function-call.without-arguments.js",
-          "match": "\\s*+((\\bnew\\b)*)\\s*+([_$a-zA-Z][$\\w]*)\\s*+(\\()\\s*+(\\))",
+          "match": "([_$a-zA-Z][$\\w]*)\\s*(\\(\\s*\\))",
           "captures": {
-            "2": {
-              "name": "keyword.operator.js"
-            },
-            "3": {
+            "1": {
               "name": "entity.name.function.js"
             },
-            "4": {
-              "name": "meta.brace.round.js"
-            },
-            "5": {
-              "name": "meta.brace.round.js"
-            }
-          }
-        },
-        {
-          "name": "meta.function-call.without-arguments.js",
-          "begin": "\\s*+((\\bnew\\b)*)\\s*+(?=(\\[(?:(?\u003e[^\\[\\]]+)|\\g\u003c-1\u003e)*\\])\\s*+\\(\\s*+\\))",
-          "end": "(?=.)",
-          "patterns": [
-            {
-              "include": "#square-brackets"
-            },
-            {
-              "include": "#round-brackets"
-            }
-          ],
-          "beginCaptures": {
             "2": {
-              "name": "keyword.operator.js"
+              "name": "meta.group.braces.round.function.arguments.js"
             }
-          },
-          "applyEndPatternLast": true
+          }
         },
         {
           "name": "meta.function-call.with-arguments.js",
-          "begin": "\\s*+((\\bnew\\b)*)\\s*+([_$a-zA-Z][$\\w]*)\\s*+(?=\\()",
-          "end": "(?=.)",
-          "patterns": [
-            {
-              "include": "#round-brackets"
-            }
-          ],
-          "beginCaptures": {
-            "2": {
-              "name": "keyword.operator.js"
-            },
-            "3": {
+          "match": "([_$a-zA-Z][$\\w]*)\\s*(?=\\()",
+          "captures": {
+            "1": {
               "name": "entity.name.function.js"
             }
-          },
-          "applyEndPatternLast": true
+          }
         },
         {
-          "name": "meta.function-call.without-arguments.js",
-          "begin": "\\s*+((\\bnew\\b)*)\\s*+(?=(\\[(?:(?\u003e[^\\[\\]]+)|\\g\u003c-1\u003e)*\\])\\s*+\\()",
-          "end": "(?=.)",
-          "patterns": [
-            {
-              "include": "#square-brackets"
-            },
-            {
-              "include": "#round-brackets"
-            }
-          ],
-          "beginCaptures": {
-            "2": {
-              "name": "keyword.operator.js"
+          "name": "meta.function-call.tagged-template.js",
+          "match": "([_$a-zA-Z][$\\w]*)\\s*(?=`)",
+          "captures": {
+            "1": {
+              "name": "entity.name.function.js"
             }
-          },
-          "applyEndPatternLast": true
+          }
         }
       ]
     },
@@ -1954,44 +1529,37 @@
       "patterns": [
         {
           "name": "meta.function.json.js",
-          "begin": "(?\u003c=^|{|,)\\s*+([_$a-zA-Z][$\\w]*)\\s*+(:)\\s*+(?:(async)\\s+)?\\s*+((?\u003c!\\.)\\bfunction\\b)\\s*+(?:(\\*)\\s*)?\\s*(?=\\(|\u003c)",
-          "end": "(?=\\{)",
+          "begin": "(?x)\n  (?\u003e\n    ((')((?\u003e[^'\\\\]|\\\\.)*)('))|\n    ((\")((?\u003e[^\"\\\\]|\\\\.)*)(\"))|\n    (([_$a-zA-Z][$\\w]*|\\d+))\n  )\n  \\s*(:)\n  \\s*(?:\\b(async)\\s+)?\n  \\s*(function)(?\u003e\\s*(\\*)|(?=[\\s(\u003c]))\n  \\s*([_$a-zA-Z][$\\w]*)?",
+          "end": "(?\u003c=\\))",
           "patterns": [
             {
-              "include": "#flowtype"
+              "include": "#flowtype-polymorph"
+            },
+            {
+              "include": "#function-declaration-parameters"
             }
           ],
           "beginCaptures": {
             "1": {
+              "name": "string.quoted.js"
+            },
+            "10": {
               "name": "entity.name.function.js"
             },
-            "2": {
+            "11": {
               "name": "punctuation.separator.key-value.js"
             },
-            "3": {
+            "12": {
               "name": "storage.type.js"
             },
-            "4": {
+            "13": {
               "name": "storage.type.function.js"
             },
-            "5": {
+            "14": {
               "name": "keyword.generator.asterisk.js"
-            }
-          },
-          "applyEndPatternLast": true
-        },
-        {
-          "name": "meta.function.json.js",
-          "begin": "(?\u003c=^|{|,)\\s*+((?P\u003cquote\u003e'|\\\")([^\"']*)(?P=quote))\\s*+(:)\\s*+(async)?\\s*+((?\u003c!\\.)\\bfunction\\b)\\s*(\\*\\s*)?\\s*(?=\\(|\u003c)",
-          "end": "(?=\\{)",
-          "patterns": [
-            {
-              "include": "#flowtype"
-            }
-          ],
-          "beginCaptures": {
-            "1": {
-              "name": "string.quoted.js"
+            },
+            "15": {
+              "name": "entity.name.function.js"
             },
             "2": {
               "name": "punctuation.definition.string.begin.js"
@@ -2003,48 +1571,39 @@
               "name": "punctuation.definition.string.end.js"
             },
             "5": {
-              "name": "punctuation.separator.key-value.js"
+              "name": "string.quoted.js"
             },
             "6": {
-              "name": "storage.type.js"
+              "name": "punctuation.definition.string.begin.js"
             },
             "7": {
-              "name": "storage.type.function.js"
+              "name": "entity.name.function.js"
             },
             "8": {
-              "name": "keyword.generator.asterisk.js"
+              "name": "punctuation.definition.string.end.js"
+            },
+            "9": {
+              "name": "string.unquoted.js"
             }
-          },
-          "applyEndPatternLast": true
+          }
+        }
+      ]
+    },
+    "literal-jsx": {
+      "contentName": "meta.jsx.js",
+      "begin": "(?\u003c=\\(|\\{|\\[|,|\u0026\u0026|\\|\\||\\?|:|=|=\u003e|\\Wreturn|^return|\\Wdefault|^)(?=\\s*\u003c[_$a-zA-Z])",
+      "end": "(?\u003c=/\u003e|\u003e)",
+      "patterns": [
+        {
+          "include": "#jsx-tag-start"
         }
       ]
     },
     "literal-keyword-storage": {
       "patterns": [
         {
-          "begin": "\\s*+(?\u003c!\\.)\\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|\\)|})",
-          "patterns": [
-            {
-              "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|\\)|}))",
-              "patterns": [
-                {
-                  "include": "#flowtype-variable"
-                }
-              ],
-              "endCaptures": {
-                "2": {
-                  "name": "punctuation.terminator.statement.js"
-                }
-              }
-            }
-          ],
-          "beginCaptures": {
-            "1": {
-              "name": "storage.type.js"
-            }
-          }
+          "name": "storage.type.js",
+          "match": "(?\u003c!\\.)\\b(?\u003econst|let|var)\\b"
         }
       ]
     },
@@ -2054,8 +1613,7 @@
           "include": "#literal-keyword-storage"
         },
         {
-          "name": "keyword.control.flow.js",
-          "match": "\\s*+(?\u003c!\\.)\\b(yield)\\b(?:\\s*+(\\*))?",
+          "match": "(?\u003c!\\.)\\b((?\u003eawait|yield))\\b(?:\\s*(\\*))?",
           "captures": {
             "1": {
               "name": "keyword.control.flow.js"
@@ -2067,81 +1625,52 @@
         },
         {
           "name": "keyword.control.flow.js",
-          "match": "\\s*+(?\u003c!\\.)\\b(await|return)\\b"
+          "match": "(?\u003c!\\.)\\b(return)\\b"
         },
         {
           "name": "keyword.control.conditional.js",
-          "match": "\\s*+(?\u003c!\\.)\\b(if|else)\\b"
+          "match": "(?\u003c!\\.)\\b(?\u003eif|else)\\b"
         },
         {
           "name": "keyword.control.trycatch.js",
-          "match": "\\s*+(?\u003c!\\.)\\b(catch|finally|throw|try)\\b"
+          "match": "(?\u003c!\\.)\\b(?\u003ecatch|finally|throw|try)\\b"
         },
         {
           "name": "keyword.control.loop.js",
-          "match": "\\s*+(?\u003c!\\.)\\b(break|continue|do|goto|while)\\b"
+          "match": "(?\u003c!\\.)\\b(?\u003ebreak|continue|do|goto|while|case|default)\\b"
+        },
+        {
+          "name": "keyword.other.reserved.js",
+          "match": "(?\u003c!\\.)\\b(?\u003eenum|module|public|package|private|interface|protected)\\b"
+        },
+        {
+          "name": "keyword.other.js",
+          "match": "(?\u003c!\\.)\\b(debugger)\\b"
         }
       ]
     },
     "literal-labels": {
       "patterns": [
         {
-          "match": "\\s*+(?\u003c!\\.|\\?|\\?\\s|\\?\\s\\s)(((\\\")(\\\\.|[^\\\\\"])*(\\\"))|((')(\\\\.|[^\\\\'])*(')))\\s*+(:)",
-          "captures": {
-            "1": {
-              "name": "constant.other.object.key.js"
-            },
-            "10": {
-              "name": "punctuation.separator.key-value.js"
-            },
-            "2": {
-              "name": "string.quoted.double.js"
-            },
-            "3": {
-              "name": "punctuation.definition.string.begin.js"
-            },
-            "5": {
-              "name": "punctuation.definition.string.end.js"
-            },
-            "6": {
-              "name": "string.quoted.single.js"
-            },
-            "7": {
-              "name": "punctuation.definition.string.begin.js"
-            },
-            "9": {
-              "name": "punctuation.definition.string.end.js"
-            }
-          }
-        },
-        {
-          "begin": "\\s*+(?\u003c!\\.|\\?|\\?\\s|\\?\\s\\s)(\\[)(?=(?:[^\\[]+)*?\\]\\s*+(:)(?=\\s*+\\S))",
-          "end": "\\s*(\\])\\s*+(:)",
+          "begin": "(?x)\n  (?\u003c!\\?)(?\u003c!\\?\\s)(?=(?\u003e\n    ((')((?\u003e[^'\\\\]|\\\\.)*)('))|\n    ((\")((?\u003e[^\"\\\\]|\\\\.)*)(\"))|\n  )\\s*:)",
+          "end": ":",
           "patterns": [
             {
-              "include": "#expression"
-            }
-          ],
-          "beginCaptures": {
-            "1": {
-              "name": "meta.brace.square.js"
+              "include": "#literal-string"
             }
-          },
+          ],
           "endCaptures": {
-            "1": {
-              "name": "meta.brace.square.js"
-            },
-            "2": {
+            "0": {
               "name": "punctuation.separator.key-value.js"
             }
           }
         },
         {
           "name": "constant.other.object.key.js",
-          "match": "\\s*+(?\u003c!\\.|\\?|\\?\\s|\\?\\s\\s)\\s*+([_$a-zA-Z][$\\w]*)\\s*+(:)",
+          "match": "(?\u003c!\\.|\\?|\\?\\s)([_$a-zA-Z][$\\w]*)\\s*(:)",
           "captures": {
             "1": {
-              "name": "string.unquoted.js"
+              "name": "string.unquoted.label.js"
             },
             "2": {
               "name": "punctuation.separator.key-value.js"
@@ -2154,23 +1683,23 @@
       "patterns": [
         {
           "name": "constant.language.boolean.true.js",
-          "match": "\\s*+(?\u003c!\\.)\\btrue\\b"
+          "match": "(?\u003c!\\.)\\b(true)\\b"
         },
         {
           "name": "constant.language.boolean.false.js",
-          "match": "\\s*+(?\u003c!\\.)\\bfalse\\b"
+          "match": "(?\u003c!\\.)\\b(false)\\b"
         },
         {
           "name": "constant.language.null.js",
-          "match": "\\s*+(?\u003c!\\.)\\bnull\\b"
+          "match": "(?\u003c!\\.)\\b(null)\\b"
         },
         {
           "name": "constant.language.undefined.js",
-          "match": "\\s*+(?\u003c!\\.)\\bundefined\\b"
+          "match": "(?\u003c!\\.)\\b(undefined)\\b"
         },
         {
           "name": "constant.language.nan.js",
-          "match": "\\s*+(?\u003c!\\.)\\bNaN\\b"
+          "match": "(?\u003c!\\.)\\b(NaN)\\b"
         }
       ]
     },
@@ -2178,73 +1707,60 @@
       "patterns": [
         {
           "name": "variable.language.arguments.js",
-          "match": "\\s*+(?\u003c!(?\u003c!\\.\\.)\\.)\\b(arguments)\\b"
+          "match": "(?\u003c!(?\u003c!\\.\\.)\\.)\\b(arguments)\\b"
         },
         {
           "name": "variable.language.super.js",
-          "match": "\\s*+(?\u003c!(?\u003c!\\.\\.)\\.)\\b(super)\\b\\s*+(?!\\()"
+          "match": "(?\u003c!(?\u003c!\\.\\.)\\.)\\b(super)\\b"
         },
         {
           "name": "variable.language.this.js",
-          "match": "\\s*+(?\u003c!(?\u003c!\\.\\.)\\.)\\b(this)\\b"
+          "match": "(?\u003c!(?\u003c!\\.\\.)\\.)\\b(this)\\b"
         },
         {
           "name": "variable.language.self.js",
-          "match": "\\s*+(?\u003c!(?\u003c!\\.\\.)\\.)\\b(self)\\b\\s*+(?!\\()"
+          "match": "(?\u003c!(?\u003c!\\.\\.)\\.)\\b(self)\\b"
         },
         {
           "name": "variable.language.proto.js",
-          "match": "\\s*+(?\u003c=\\.)\\b(__proto__)\\b"
+          "match": "(?\u003c=\\.)(__proto__)\\b"
         },
         {
           "name": "variable.language.constructor.js",
-          "match": "\\s*+(?\u003c=\\.)\\b(constructor)\\b\\s*+(?!\\()"
+          "match": "(?\u003c=\\.)(constructor)\\b"
         },
         {
           "name": "variable.language.prototype.js",
-          "match": "\\s*+(?\u003c=\\.)\\b(prototype)\\b"
+          "match": "(?\u003c=\\.)(prototype)\\b"
         }
       ]
     },
     "literal-method": {
       "patterns": [
         {
-          "name": "meta.function.method.js",
-          "begin": "(?\u003c!:)\\s*+(\\bstatic\\b)?\\s*+(\\basync\\b)?\\s*+(\\*?)\\s*+(?\u003c!\\.)([_$a-zA-Z][$\\w]*)\\s*+(?=(\u003c(?:(?\u003e[^\u003c\u003e]+)|\\g\u003c-1\u003e)*\u003e)?(\\())",
-          "end": "\\s*(?=.)",
+          "name": "meta.method.js",
+          "begin": "(?x)\n  (?:\\b(static)\\s+)?\n  (?:\\b(async)\\s+)?\n  (?:(\\*)\\s*)?\n  (?\u003e\n    ((')((?\u003e[^'\\\\]|\\\\.)*)('))|\n    ((\")((?\u003e[^\"\\\\]|\\\\.)*)(\"))|\n    (([_$a-zA-Z][$\\w]*|\\d+))\n  )\n  (?=\\s*(\\((?\u003e(?\u003e[^()]+)|\\g\u003c-1\u003e)*\\))(?\u003e\\s|/\\*.*\\*/)*\\{)",
+          "end": "(?\u003c=\\))",
           "patterns": [
             {
-              "include": "#flowtype"
+              "include": "#function-declaration-parameters"
             }
           ],
           "beginCaptures": {
             "1": {
-              "name": "storage.modifier.js"
-            },
-            "2": {
               "name": "storage.type.js"
             },
-            "3": {
-              "name": "keyword.generator.asterisk.js"
+            "10": {
+              "name": "entity.name.function.js"
             },
-            "4": {
-              "name": "entity.name.function.method.js"
-            }
-          },
-          "applyEndPatternLast": true
-        },
-        {
-          "name": "meta.function.method.js",
-          "begin": "(?\u003c!:)\\s*+(\\bstatic\\b)?\\s*+(\\basync\\b)?\\s*+(\\*?)\\s*+(?\u003c!\\.)((?P\u003cquote\u003e'|\\\")([^\"']*)(?P=quote))\\s*+(?=(\u003c(?:(?\u003e[^\u003c\u003e]+)|\\g\u003c-1\u003e)*\u003e)?(\\())",
-          "end": "\\s*(?=.)",
-          "patterns": [
-            {
-              "include": "#flowtype"
-            }
-          ],
-          "beginCaptures": {
-            "1": {
-              "name": "storage.modifier.js"
+            "11": {
+              "name": "punctuation.definition.string.end.js"
+            },
+            "12": {
+              "name": "string.unquoted.js"
+            },
+            "13": {
+              "name": "entity.name.function.js"
             },
             "2": {
               "name": "storage.type.js"
@@ -2253,79 +1769,37 @@
               "name": "keyword.generator.asterisk.js"
             },
             "4": {
-              "name": "entity.name.function.method.js"
-            }
-          },
-          "applyEndPatternLast": true
-        },
-        {
-          "name": "meta.function.method.js",
-          "begin": "(?\u003c!:)\\s*+(\\bstatic\\b)?\\s*+(\\basync\\b)?\\s*+(\\*?)\\s*+(?=((\\[(?:(?\u003e[^\\[\\]]+)|\\g\u003c-1\u003e)*\\]))\\s*+(\u003c(?:(?\u003e[^\u003c\u003e]+)|\\g\u003c-1\u003e)*\u003e)?\\s*+(\\())",
-          "end": "\\s*(?=.)",
-          "patterns": [
-            {
-              "include": "#flowtype"
-            },
-            {
-              "include": "#square-brackets"
-            }
-          ],
-          "beginCaptures": {
-            "1": {
-              "name": "storage.modifier.js"
+              "name": "string.quoted.js"
             },
-            "2": {
-              "name": "storage.type.js"
+            "5": {
+              "name": "punctuation.definition.string.begin.js"
             },
-            "3": {
-              "name": "keyword.generator.asterisk.js"
+            "6": {
+              "name": "entity.name.function.js"
             },
-            "4": {
-              "name": "entity.name.function.method.js"
-            }
-          },
-          "applyEndPatternLast": true
-        },
-        {
-          "name": "meta.accessor.js",
-          "begin": "\\s*+\\b(?:(static)\\s+)?(get|set)\\s+([_$a-zA-Z][$\\w]*)\\s*+(?=\\()",
-          "end": "\\s*(?={)",
-          "patterns": [
-            {
-              "include": "#flowtype"
-            }
-          ],
-          "beginCaptures": {
-            "1": {
-              "name": "storage.modifier.js"
+            "7": {
+              "name": "punctuation.definition.string.end.js"
             },
-            "2": {
-              "name": "storage.type.accessor.js"
+            "8": {
+              "name": "string.quoted.js"
             },
-            "3": {
-              "name": "entity.name.accessor.js"
+            "9": {
+              "name": "punctuation.definition.string.begin.js"
             }
-          },
-          "applyEndPatternLast": true
+          }
         },
         {
           "name": "meta.accessor.js",
-          "begin": "\\s*+\\b(?:(static)\\s+)?(get|set)\\s+(?=((\\[(?:(?\u003e[^\\[\\]]+)|\\g\u003c-1\u003e)*\\])|\\s*+(((')((?:[^']|\\\\')*)('))|\\s*+((\")((?:[^\"]|\\\\\")*)(\"))))\\s*+(\\())",
-          "end": "\\s*(?={)",
+          "begin": "(?x)\n  \\b(?:(static)\\s+)?\n  (get|set)\\s+\n  ([_$a-zA-Z][$\\w]*|\\d+)\\s*\n  (?=(\\((?\u003e(?\u003e[^()]+)|\\g\u003c-1\u003e)*\\))(?\u003e\\s|/\\*.*\\*/)*\\{)",
+          "end": "(?\u003c=\\))",
           "patterns": [
             {
-              "include": "#flowtype-parse-array"
-            },
-            {
-              "include": "#literal-string"
-            },
-            {
-              "include": "#flowtype"
+              "include": "#function-declaration-parameters"
             }
           ],
           "beginCaptures": {
             "1": {
-              "name": "storage.modifier.js"
+              "name": "storage.type.js"
             },
             "2": {
               "name": "storage.type.accessor.js"
@@ -2333,37 +1807,7 @@
             "3": {
               "name": "entity.name.accessor.js"
             }
-          },
-          "applyEndPatternLast": true
-        }
-      ]
-    },
-    "literal-method-alternate": {
-      "patterns": [
-        {
-          "name": "meta.function.method.js",
-          "begin": "(?:^|;)\\s*+(\\bstatic\\b)?\\s*+(\\basync\\b)?\\s*+(\\*?)\\s*+(?\u003c!\\.)(?!\\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*+(?=(\u003c(?:(?\u003e[^\u003c\u003e]+)|\\g\u003c-1\u003e)*\u003e)?(\\((?:(?\u003e[^()]+)|\\g\u003c-1\u003e)*\\))\\s*+(?:\\s*:(\\s*+(\u0026|\\|)?(\\s*+[$_a-zA-Z0-9]+(\u003c(?:(?\u003e[^\u003c\u003e]+)|\\g\u003c-1\u003e)*\u003e)?|\\s*+(\\{(?:(?\u003e[^{}]+)|\\g\u003c-1\u003e)*\\})|\\s*+(\\[(?:(?\u003e[^\\[\\]]+)|\\g\u003c-1\u003e)*\\])|\\s*+(\\s*(?P\u003cquote\u003e[\"']).*?(?P=quote)(?\u003c!\\\\.))|\\s*[x0-9A-Fa-f]+))*+)*\\s*\\{)",
-          "end": "\\s*(?=.)",
-          "patterns": [
-            {
-              "include": "#flowtype"
-            }
-          ],
-          "beginCaptures": {
-            "1": {
-              "name": "storage.modifier.js"
-            },
-            "2": {
-              "name": "storage.type.js"
-            },
-            "3": {
-              "name": "keyword.generator.asterisk.js"
-            },
-            "5": {
-              "name": "entity.name.function.method.js"
-            }
-          },
-          "applyEndPatternLast": true
+          }
         }
       ]
     },
@@ -2371,7 +1815,7 @@
       "patterns": [
         {
           "name": "meta.function-call.static.without-arguments.js",
-          "match": "\\s*+(?:(?\u003c=\\.)|\\b)([A-Z][$\\w]*)\\s*+(\\.)([_$a-zA-Z][$\\w]*)\\s*+(\\(\\s*+\\))",
+          "match": "(?x)\n  (?:(?\u003c=\\.)|\\b)\n  ([A-Z][$\\w]*)\\s*(\\.)\n  ([_$a-zA-Z][$\\w]*)\\s*\n  (\\(\\s*\\))",
           "captures": {
             "1": {
               "name": "variable.other.class.js"
@@ -2389,14 +1833,8 @@
         },
         {
           "name": "meta.function-call.static.with-arguments.js",
-          "begin": "\\s*+(?:(?\u003c=\\.)|\\b)\\s*+([A-Z][$\\w]*)\\s*+(\\.)([_$a-zA-Z][$\\w]*)\\s*+(?=\\()",
-          "end": "(?=.)",
-          "patterns": [
-            {
-              "include": "#round-brackets"
-            }
-          ],
-          "beginCaptures": {
+          "match": "(?x)\n  (?:(?\u003c=\\.)|\\b)\n  ([A-Z][$\\w]*)\\s*(\\.)\n  ([_$a-zA-Z][$\\w]*)\\s*\n  (?=\\()",
+          "captures": {
             "1": {
               "name": "variable.other.class.js"
             },
@@ -2406,12 +1844,11 @@
             "3": {
               "name": "entity.name.function.js"
             }
-          },
-          "applyEndPatternLast": true
+          }
         },
         {
           "name": "meta.function-call.method.without-arguments.js",
-          "match": "\\s*+(?\u003c=\\.)\\s*+([_$a-zA-Z][$\\w]*)\\s*+(\\(\\s*+\\))",
+          "match": "(?x)\n  (?\u003c=\\.)\n  ([_$a-zA-Z][$\\w]*)\\s*\n  (\\(\\s*\\))",
           "captures": {
             "1": {
               "name": "entity.name.function.js"
@@ -2423,104 +1860,40 @@
         },
         {
           "name": "meta.function-call.method.with-arguments.js",
-          "begin": "\\s*+(?\u003c=\\.)([_$a-zA-Z][$\\w]*)\\s*+(?=\\()",
-          "end": "(?=.)",
-          "patterns": [
-            {
-              "include": "#round-brackets"
-            }
-          ],
-          "beginCaptures": {
+          "match": "(?x)\n  (?\u003c=\\.)\n  ([_$a-zA-Z][$\\w]*)\\s*\n  (?=\\()",
+          "captures": {
             "1": {
               "name": "entity.name.function.js"
             }
-          },
-          "applyEndPatternLast": true
+          }
         }
       ]
     },
     "literal-module": {
       "patterns": [
         {
-          "name": "keyword.control.module.js",
-          "match": "\\s*+(?\u003c!\\.)\\b(import|export|default)\\b"
-        },
-        {
-          "name": "keyword.control.module.reference.js",
-          "match": "\\s*+(?\u003c!\\.)\\b(from|as)\\b"
+          "name": "keyword.operator.module.js",
+          "match": "(?\u003c!\\.)\\b(?\u003eimport|export|default|from|as)\\b"
         }
       ]
     },
     "literal-number": {
       "patterns": [
         {
-          "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"
-            }
-          }
+          "name": "invalid.illegal.numeric.hex.js",
+          "match": "(?i)(?:\\B[-+]|\\b)0x[0-9a-f]*\\.(\\B|\\b[0-9]+)"
         },
         {
-          "match": "\\s*+((?:\\B[-+]|\\b)(Infinity)\\b)",
-          "captures": {
-            "1": {
-              "name": "constant.language.infinity.js"
-            }
-          }
-        }
-      ]
-    },
-    "literal-object": {
-      "patterns": [
+          "name": "invalid.illegal.numeric.octal.js",
+          "match": "(?:\\B[-+]|\\b)0[0-9]+\\.(\\B|\\b[0-9]+)"
+        },
         {
-          "begin": "(?:(?\u003c=\\(|\\[)|(?:\\s*(?:(=)|\\b(default)\\b|\\b(return)\\b|(,))))\\s*({)",
-          "end": "\\s*+(})",
-          "patterns": [
-            {
-              "include": "#literal-function-labels"
-            },
-            {
-              "include": "#literal-arrow-function-labels"
-            },
-            {
-              "include": "#literal-arrow-function"
-            },
-            {
-              "include": "#literal-method"
-            },
-            {
-              "include": "#literal-labels"
-            },
-            {
-              "include": "#expression"
-            },
-            {
-              "include": "#literal-punctuation"
-            }
-          ],
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.operator.assignment.js"
-            },
-            "2": {
-              "name": "keyword.control.module.js"
-            },
-            "3": {
-              "name": "keyword.control.flow.js"
-            },
-            "4": {
-              "name": "meta.delimiter.comma.js"
-            },
-            "5": {
-              "name": "meta.brace.curly.js"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "meta.brace.curly.js"
-            }
-          }
+          "name": "constant.numeric.js",
+          "match": "(?xi)\n  (?:\\B[-+])?\n  (?:\n    \\b0b[0-1]*|                 # binary\n    \\b0o[0-7]*|                 # octal\n    \\b0x[0-9a-f]*|              # hex\n    (\n      \\B\\.[0-9]+|               # e.g. .999\n      \\b[0-9]+(\\.[0-9]*)?       # e.g. 999.999, 999. or 999\n    )(e[-+]?[0-9]+)?            # e.g. e+123, E-123\n  )"
+        },
+        {
+          "name": "constant.language.infinity.js",
+          "match": "(?:\\B[-+]|\\b)(Infinity)\\b"
         }
       ]
     },
@@ -2528,58 +1901,43 @@
       "patterns": [
         {
           "name": "keyword.operator.js",
-          "match": "\\s*+(?\u003c!\\.)\\b(delete|in|instanceof|new|of|typeof|void|with)\\b"
+          "match": "(?\u003c!\\.)\\b(?\u003edelete|instanceof|in|new|of|typeof|void|with)\\b"
         },
         {
           "name": "keyword.operator.logical.js",
-          "match": "\\s*+(!(?!=)|\u0026\u0026|\\|\\|)"
+          "match": "(?x)\n  !(?!=)| # logical-not     right-to-left   right\n  \u0026\u0026    | # logical-and     left-to-right   both\n  \\|\\|    # logical-or      left-to-right   both"
         },
         {
           "name": "keyword.operator.assignment.js",
-          "match": "\\s*+(=(?!(=|\u003e)))"
+          "match": "(?x)\n  =(?!=)  # assignment      right-to-left   both"
         },
         {
           "name": "keyword.operator.assignment.augmented.js",
-          "match": "\\s*+(%=|\u0026=|\\*=|\\+=|-=|/=|\\^=|\\|=|\u003c\u003c=|\u003e\u003e=|\u003e\u003e\u003e=)"
+          "match": "(?x)\n  %=   | # assignment      right-to-left   both\n  \u0026=   | # assignment      right-to-left   both\n  \\*=  | # assignment      right-to-left   both\n  \\+=  | # assignment      right-to-left   both\n  -=   | # assignment      right-to-left   both\n  /=   | # assignment      right-to-left   both\n  \\^=  | # assignment      right-to-left   both\n  \\|=  | # assignment      right-to-left   both\n  \u003c\u003c=  | # assignment      right-to-left   both\n  \u003e\u003e=  | # assignment      right-to-left   both\n  \u003e\u003e\u003e=   # assignment      right-to-left   both"
         },
         {
           "name": "keyword.operator.bitwise.js",
-          "match": "\\s*+(~|\u003c\u003c|\u003e\u003e\u003e|\u003e\u003e|\u0026|\\^|\\|)"
+          "match": "(?x)\n  ~    | # bitwise-not     right-to-left   right\n  \u003c\u003c   | # bitwise-shift   left-to-right   both\n  \u003e\u003e\u003e  | # bitwise-shift   left-to-right   both\n  \u003e\u003e   | # bitwise-shift   left-to-right   both\n  \u0026    | # bitwise-and     left-to-right   both\n  \\^   | # bitwise-xor     left-to-right   both\n  \\|     # bitwise-or      left-to-right   both"
         },
         {
           "name": "keyword.operator.relational.js",
-          "match": "\\s*+(\u003c=|\u003e=|\u003c|\u003e)"
+          "match": "(?x)\n  \u003c=   | # relational      left-to-right   both\n  \u003e=   | # relational      left-to-right   both\n  \u003c    | # relational      left-to-right   both\n  \u003e      # relational      left-to-right   both"
         },
         {
           "name": "keyword.operator.comparison.js",
-          "match": "\\s*+(===|!==|==|!=)"
+          "match": "(?x)\n  ===  | # equality        left-to-right   both\n  !==  | # equality        left-to-right   both\n  ==   | # equality        left-to-right   both\n  !=     # equality        left-to-right   both"
         },
         {
           "name": "keyword.operator.arithmetic.js",
-          "match": "\\s*+(--|\\+\\+|/(?!/|\\*)|%|\\*(?\u003c!/\\*)|\\+|-)"
+          "match": "(?x)\n  --   | # decrement       n/a             right-or-left\n  \\+\\+ | # increment       n/a             right-or-left\n  /    | # division        left-to-right   both\n  %    | # modulus         left-to-right   both\n  \\*   | # multiplication  left-to-right   both\n  \\+   | # addition        left-to-right   both\n  -      # subtraction     left-to-right   both"
         },
         {
-          "begin": "\\s*+(\\?)",
-          "end": "\\s*(:)",
-          "patterns": [
-            {
-              "include": "#expression"
-            }
-          ],
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.operator.ternary.js"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "keyword.operator.ternary.js"
-            }
-          }
+          "name": "keyword.operator.ternary.js",
+          "match": "[?:]"
         },
         {
           "name": "keyword.operator.spread.js",
-          "match": "\\s*+(?\u003c!\\.)\\.\\.\\."
+          "match": "(?\u003c!\\.)\\.\\.\\."
         },
         {
           "name": "keyword.operator.accessor.js",
@@ -2589,112 +1947,61 @@
     },
     "literal-prototype": {
       "patterns": [
-        {
-          "name": "meta.prototype.access.js",
-          "match": "\\s*+([_$a-zA-Z][$\\w]*)(\\.)(prototype)\\b",
-          "captures": {
-            "1": {
-              "name": "entity.name.class.js"
-            },
-            "2": {
-              "name": "keyword.operator.accessor.js"
-            },
-            "3": {
-              "name": "variable.language.prototype.js"
-            }
-          }
-        },
-        {
-          "name": "meta.prototype.declaration.js",
-          "match": "\\s*+([_$a-zA-Z][$\\w]*)(\\.)(prototype)\\s*+=\\s*+",
-          "captures": {
-            "1": {
-              "name": "entity.name.class.js"
-            },
-            "2": {
-              "name": "keyword.operator.accessor.js"
-            },
-            "3": {
-              "name": "variable.language.prototype.js"
-            }
-          }
-        }
-      ]
-    },
-    "literal-punctuation": {
-      "patterns": [
-        {
-          "include": "#literal-semi-colon"
-        },
-        {
-          "include": "#literal-comma"
-        }
-      ]
-    },
-    "literal-quasi": {
-      "patterns": [
-        {
-          "name": "string.quasi.js",
-          "contentName": "string.quoted.template.js",
-          "begin": "\\s*+([a-zA-Z$_][\\w$_]*)?((`))",
-          "end": "\\s*(?\u003c!\\\\)((`))",
-          "patterns": [
-            {
-              "name": "entity.quasi.element.js",
-              "begin": "(?\u003c!\\\\)\\${",
-              "end": "\\s*}",
-              "patterns": [
-                {
-                  "include": "#expression"
-                }
-              ],
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.quasi.element.begin.js"
-                }
-              },
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.quasi.element.end.js"
-                }
-              }
-            },
-            {
-              "include": "#string-content"
-            }
-          ],
-          "beginCaptures": {
+        {
+          "name": "meta.prototype.declaration.js",
+          "match": "([_$a-zA-Z][$\\w]*)(\\.)(prototype)\\s*(=)\\s*",
+          "captures": {
             "1": {
-              "name": "entity.quasi.tag.name.js"
+              "name": "entity.name.class.js"
             },
             "2": {
-              "name": "punctuation.definition.quasi.begin.js"
+              "name": "keyword.operator.accessor.js"
             },
             "3": {
-              "name": "string.quoted.template.js"
+              "name": "variable.language.prototype.js"
+            },
+            "4": {
+              "name": "keyword.operator.assignment.js"
             }
-          },
-          "endCaptures": {
+          }
+        },
+        {
+          "name": "meta.prototype.access.js",
+          "match": "([_$a-zA-Z][$\\w]*)(\\.)(prototype)\\b",
+          "captures": {
             "1": {
-              "name": "punctuation.definition.quasi.end.js"
+              "name": "entity.name.class.js"
             },
             "2": {
-              "name": "string.quoted.template.js"
+              "name": "keyword.operator.accessor.js"
+            },
+            "3": {
+              "name": "variable.language.prototype.js"
             }
           }
         }
       ]
     },
+    "literal-punctuation": {
+      "patterns": [
+        {
+          "name": "punctuation.terminator.statement.js",
+          "match": ";"
+        },
+        {
+          "name": "meta.delimiter.comma.js",
+          "match": ","
+        }
+      ]
+    },
     "literal-regexp": {
       "patterns": [
         {
           "name": "string.regexp.js",
-          "begin": "(?\u003c=\\.|\\(|,|{|}|\\[|;|,|\u003c|\u003e|\u003c=|\u003e=|==|!=|===|!==|\\+|-|\\*|%|\\+\\+|--|\u003c\u003c|\u003e\u003e|\u003e\u003e\u003e|\u0026|\\||\\^|!|~|\u0026\u0026|\\|\\||\\?|:|=|\\+=|-=|\\*=|%=|\u003c\u003c=|\u003e\u003e=|\u003e\u003e\u003e=|\u0026=|\\|=|\\^=|/|/=|\\Wnew|\\Wdelete|\\Wvoid|\\Wtypeof|\\Winstanceof|\\Win|\\Wdo|\\Wreturn|\\Wcase|\\Wthrow|^new|^delete|^void|^typeof|^instanceof|^in|^do|^return|^case|^throw|^)\\s*+(/)(?!/|\\*|$)",
-          "end": "(/)([gimyu]*)",
+          "begin": "(?x)\n  (?\u003c=\n    \\.|\\(|,|{|}|\\[|;|\u003c|\u003e|\u003c=|\u003e=|==|!=|===|!==|\\+|-|\\*|%|\\+\\+|--|\u003c\u003c|\u003e\u003e|\u003e\u003e\u003e|\u0026|\\||\\^|!|~|\u0026\u0026|\\|\\||\\?|:|=|\\+=|-=|\\*=|%=|\u003c\u003c=|\u003e\u003e=|\u003e\u003e\u003e=|\u0026=|\\|=|\\^=|/|/=|\n    \\Wnew|\\Wdelete|\\Wvoid|\\Wtypeof|\\Winstanceof|\\Win|\\Wdo|\\Wreturn|\\Wcase|\\Wthrow|\\Wyield|\n    ^new|^delete|^void|^typeof|^instanceof|^in|^do|^return|^case|^throw|^yield|^\n  )\\s*\n  (/)\n  (?!/|\\*|$)",
+          "end": "(/)([gimy]*)",
           "patterns": [
-            {
-              "include": "source.regexp.babel"
-            }
+            {}
           ],
           "beginCaptures": {
             "1": {
@@ -2712,70 +2019,27 @@
         }
       ]
     },
-    "literal-semi-colon": {
-      "patterns": [
-        {
-          "name": "punctuation.terminator.statement.js",
-          "match": "\\s*+\\;"
-        }
-      ]
-    },
     "literal-string": {
       "patterns": [
         {
-          "contentName": "string.quoted.single.js",
-          "begin": "\\s*+(('))",
-          "end": "\\s*+(?:(('))|(\n))",
+          "name": "string.quoted.js",
+          "begin": "([\"'])",
+          "end": "(\\1)|(\\n)",
           "patterns": [
             {
               "include": "#string-content"
             }
           ],
           "beginCaptures": {
-            "1": {
-              "name": "string.quoted.single.js"
-            },
-            "2": {
+            "0": {
               "name": "punctuation.definition.string.begin.js"
             }
           },
           "endCaptures": {
             "1": {
-              "name": "string.quoted.single.js"
-            },
-            "2": {
               "name": "punctuation.definition.string.end.js"
             },
-            "3": {
-              "name": "invalid.illegal.newline.js"
-            }
-          }
-        },
-        {
-          "contentName": "string.quoted.double.js",
-          "begin": "\\s*+((\"))",
-          "end": "\\s*+(?:((\"))|(\n))",
-          "patterns": [
-            {
-              "include": "#string-content"
-            }
-          ],
-          "beginCaptures": {
-            "1": {
-              "name": "string.quoted.double.js"
-            },
-            "2": {
-              "name": "punctuation.definition.string.begin.js"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "string.quoted.double.js"
-            },
             "2": {
-              "name": "punctuation.definition.string.end.js"
-            },
-            "3": {
               "name": "invalid.illegal.newline.js"
             }
           }
@@ -2786,19 +2050,22 @@
       "patterns": [
         {
           "name": "meta.switch.js",
-          "begin": "\\s*+(?\u003c!\\.)\\b(switch)\\b",
-          "end": "\\s*\\}",
+          "begin": "(?\u003c!\\.)\\b(switch)\\b",
+          "end": "\\}",
           "patterns": [
+            {
+              "include": "#comments"
+            },
             {
               "include": "#round-brackets"
             },
             {
-              "begin": "\\s*+\\{",
-              "end": "\\s*(?=})",
+              "begin": "\\{",
+              "end": "(?=})",
               "patterns": [
                 {
-                  "begin": "\\s*+(?\u003c!\\.)\\b(case|default)\\b",
-                  "end": "\\s*(:)",
+                  "begin": "(?\u003c!\\.)\\b(case|default)\\b",
+                  "end": "(?=:)",
                   "patterns": [
                     {
                       "include": "#expression"
@@ -2808,11 +2075,6 @@
                     "1": {
                       "name": "keyword.control.switch.js"
                     }
-                  },
-                  "endCaptures": {
-                    "1": {
-                      "name": "keyword.operator.js"
-                    }
                   }
                 },
                 {
@@ -2821,7 +2083,7 @@
               ],
               "beginCaptures": {
                 "0": {
-                  "name": "meta.brace.curly.js"
+                  "name": "meta.brace.curly.begin.js"
                 }
               }
             }
@@ -2833,25 +2095,67 @@
           },
           "endCaptures": {
             "0": {
-              "name": "meta.brace.curly.js"
+              "name": "meta.brace.curly.end.js"
             }
           }
         }
       ]
     },
-    "literal-variable": {
+    "literal-template-string": {
+      "begin": "`",
+      "end": "`",
       "patterns": [
         {
-          "name": "variable.other.constant.js",
-          "match": "\\s*+[A-Z][_$\\dA-Z]*\\b"
+          "include": "#string-content"
+        },
+        {
+          "name": "constant.character.escape.js",
+          "match": "\\\\`"
+        },
+        {
+          "begin": "\\${",
+          "end": "}",
+          "patterns": [
+            {
+              "include": "#expression"
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.other.substitution.begin.js"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "keyword.other.substitution.end.js"
+            }
+          }
         },
         {
-          "name": "variable.other.dollar.js",
-          "match": "\\s*+\\$[$\\w]*"
+          "name": "string.interpolated.js",
+          "match": "."
+        }
+      ],
+      "captures": {
+        "0": {
+          "name": "keyword.other.template.end.js"
+        }
+      },
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.other.template.begin.js"
+        }
+      }
+    },
+    "literal-variable": {
+      "patterns": [
+        {
+          "name": "variable.other.constant.js",
+          "match": "_*?[A-Z][_$\\dA-Z]*\\b"
         },
         {
           "name": "meta.property.class.js",
-          "match": "\\s*+\\b([A-Z][$\\w]*)\\s*+(\\.)([_$a-zA-Z][$\\w]*)",
+          "match": "\\b([A-Z][$\\w]*)\\s*(\\.)([_$a-zA-Z][$\\w]*)",
           "captures": {
             "1": {
               "name": "variable.other.class.js"
@@ -2866,7 +2170,7 @@
         },
         {
           "name": "variable.other.object.js",
-          "match": "\\s*+(?\u003c!\\.)[_$a-zA-Z][$\\w]*\\s*+(?=[\\[\\.])",
+          "match": "(?\u003c!\\.)([_$a-zA-Z][$\\w]*)\\s*(?=[\\[\\.])",
           "captures": {
             "1": {
               "name": "variable.other.object.js"
@@ -2875,26 +2179,48 @@
         },
         {
           "name": "meta.property.object.js",
-          "match": "\\s*+(?\u003c=\\.)\\s*+[_$a-zA-Z][$\\w]*",
+          "match": "(?\u003c=\\.)\\s*([_$a-zA-Z][$\\w]*)",
           "captures": {
-            "0": {
+            "1": {
               "name": "variable.other.property.js"
             }
           }
         },
         {
           "name": "variable.other.readwrite.js",
-          "match": "\\s*+[_$a-zA-Z][$\\w]*"
+          "match": "[_$a-zA-Z][$\\w]*"
         }
       ]
     },
-    "miscellaneous": {
+    "merge-conflits": {
       "patterns": [
         {
-          "match": "\\s*(=\u003e)",
+          "match": "^([\u003c]{7})\\s(.+)$",
           "captures": {
             "1": {
-              "name": "storage.type.function.arrow.js"
+              "name": "invalid.illegal.conflict-marker.merge-into.js"
+            },
+            "2": {
+              "name": "invalid.illegal.string.js"
+            }
+          }
+        },
+        {
+          "match": "^([=|]{7})$",
+          "captures": {
+            "1": {
+              "name": "invalid.illegal.conflict-marker.separator.js"
+            }
+          }
+        },
+        {
+          "match": "^([\u003e]{7})\\s(.+)$",
+          "captures": {
+            "1": {
+              "name": "invalid.illegal.conflict-marker.other-commit.js"
+            },
+            "2": {
+              "name": "invalid.illegal.string.js"
             }
           }
         }
@@ -2903,30 +2229,33 @@
     "round-brackets": {
       "patterns": [
         {
-          "begin": "(^|:|;|=|(?\u003c=:|;|=))\\s*+(\\((?=((?P\u003cquote\u003e\"|').*?(?\u003c=[^\\\\])(?P=quote)|[^?:])*(:|\\?\\s*+:)))",
-          "end": "\\s*\\)",
+          "name": "meta.group.braces.round.js",
+          "begin": "\\(",
+          "end": "\\)",
           "patterns": [
-            {
-              "include": "#flowtype-typecast"
-            },
             {
               "include": "#expression"
             }
           ],
           "beginCaptures": {
-            "2": {
-              "name": "meta.brace.round.js"
+            "0": {
+              "name": "meta.brace.round.begin.js"
             }
           },
           "endCaptures": {
             "0": {
-              "name": "meta.brace.round.js"
+              "name": "meta.brace.round.end.js"
             }
           }
-        },
+        }
+      ]
+    },
+    "square-brackets": {
+      "patterns": [
         {
-          "begin": "\\s*+\\(",
-          "end": "\\s*\\)",
+          "name": "meta.group.braces.square.js",
+          "begin": "\\[",
+          "end": "\\]",
           "patterns": [
             {
               "include": "#expression"
@@ -2934,141 +2263,175 @@
           ],
           "beginCaptures": {
             "0": {
-              "name": "meta.brace.round.js"
+              "name": "meta.brace.square.begin.js"
             }
           },
           "endCaptures": {
             "0": {
-              "name": "meta.brace.round.js"
+              "name": "meta.brace.square.end.js"
             }
           }
         }
       ]
     },
-    "special-comments-conditional-compilation": {
+    "string-content": {
+      "patterns": [
+        {
+          "name": "constant.character.escape.newline.js",
+          "match": "\\\\\\s*\\n"
+        },
+        {
+          "name": "constant.character.escape.js",
+          "match": "\\\\([1-7][0-7]{0,2}|[0-7]{2,3}|[bfnrtv0'\"\\\\]|x[[:xdigit:]]{2}|u\\{[[:xdigit:]]+\\}|u[[:xdigit:]]{4})"
+        }
+      ]
+    },
+    "styled-components": {
       "patterns": [
         {
-          "name": "comment.block.conditional.js",
-          "begin": "\\s*+/\\*(?=@)",
-          "end": "\\s*\\*/",
+          "name": "meta.styled-components.js",
+          "contentName": "source.css.embedded.js",
+          "begin": "(?\u003c!\\.)\\b(injectGlobal|keyframes)\\s*(`)",
+          "end": "`",
           "patterns": [
             {
-              "name": "punctuation.definition.comment.js",
-              "match": "\\s*+/\\*"
-            },
-            {
-              "include": "$self"
+              "include": "source.js.css"
             }
           ],
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.comment.js"
-            }
-          },
-          "endCaptures": {
+          "beginCaptures": {
             "1": {
-              "name": "keyword.control.conditional.js"
+              "name": "variable.function.tagged-template.js"
             },
             "2": {
-              "name": "punctuation.definition.keyword.js"
+              "name": "punctuation.definition.string.template.begin.js"
             }
-          }
-        },
-        {
-          "name": "keyword.control.conditional.js",
-          "match": "\\s*+(?!@)(@)(if|elif|else|end|ifdef|endif|cc_on|set)\\b",
-          "captures": {
-            "1": {
-              "name": "punctuation.definition.keyword.js"
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.template.end.js"
             }
           }
         },
         {
-          "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+)",
-          "captures": {
-            "1": {
-              "name": "punctuation.definition.variable.js"
-            }
-          }
-        }
-      ]
-    },
-    "square-brackets": {
-      "patterns": [
-        {
-          "begin": "\\s*+\\[",
-          "end": "\\s*\\]",
+          "name": "meta.styled-components.js",
+          "contentName": "source.css.embedded.js",
+          "begin": "(?\u003c!\\.)\\b(styled)(\\.)([_$a-zA-Z][$\\w]*)\\s*(`)",
+          "end": "`",
           "patterns": [
             {
-              "include": "#expression"
+              "include": "source.js.css"
             }
           ],
           "beginCaptures": {
-            "0": {
-              "name": "meta.brace.square.js"
+            "1": {
+              "name": "variable.other.object.js"
+            },
+            "2": {
+              "name": "punctuation.accessor.js"
+            },
+            "3": {
+              "name": "variable.function.tagged-template.js"
+            },
+            "4": {
+              "name": "punctuation.definition.string.template.begin.js"
             }
           },
           "endCaptures": {
             "0": {
-              "name": "meta.brace.square.js"
+              "name": "punctuation.definition.string.template.end.js"
+            }
+          }
+        },
+        {
+          "name": "meta.styled-components.js",
+          "begin": "(?\u003c!\\.)\\b(styled)\\s*(?=(\\((?\u003e(?\u003e[^()]+)|\\g\u003c-1\u003e)*\\))\\s*`)",
+          "end": "(?\u003c=`)",
+          "patterns": [
+            {
+              "name": "meta.function-call.with-arguments.js meta.group.js",
+              "begin": "\\(",
+              "end": "\\)",
+              "patterns": [
+                {
+                  "include": "#expression"
+                }
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.definition.group.begin.js"
+                }
+              },
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.group.end.js"
+                }
+              }
+            },
+            {
+              "contentName": "source.css.embedded.js",
+              "begin": "`",
+              "end": "`",
+              "patterns": [
+                {
+                  "include": "source.js.css"
+                }
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.definition.string.template.begin.js"
+                }
+              },
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.string.template.end.js"
+                }
+              }
+            }
+          ],
+          "captures": {
+            "1": {
+              "name": "meta.function-call.with-arguments.js entity.name.function.js"
             }
           }
         }
       ]
     },
-    "string-content": {
+    "support-class": {
       "patterns": [
         {
-          "name": "constant.character.escape.newline.js",
-          "match": "\\\\\n"
-        },
-        {
-          "name": "constant.character.escape",
-          "match": "\\\\['|\"|\\\\|n|r|t|b|f|v|0]"
+          "name": "support.class.builtin.js",
+          "match": "(?\u003c!\\.)\\b(Array|ArrayBuffer|Boolean|DataView|Date|Float32Array|Float64Array|Function|Infinity|Int16Array|Int32Array|Int8Array|JSON|Map|Math|NaN|Number|Object|Promise|Proxy|Reflect|RegExp|Set|String|Symbol|System|TypeError|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|WeakMap|WeakSet)\\b"
         },
         {
-          "name": "constant.character.escape",
-          "match": "\\\\u((\\{[0-9a-fA-F]+\\})|[0-9a-fA-F]{4})"
+          "name": "support.class.error.js",
+          "match": "(?\u003c!\\.)\\b((?\u003eEval|Range|Reference|Syntax|Type|URI)?Error)\\b"
         },
         {
-          "name": "constant.character.escape",
-          "match": "\\\\x[0-9a-fA-F]{2}"
+          "name": "support.class.node.js",
+          "match": "\\b(?\u003eBuffer)\\b"
         }
       ]
     },
-    "support": {
+    "support-other": {
       "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"
-        },
-        {
-          "name": "support.function.js",
-          "match": "\\s*+(?\u003c!\\.)\\b(decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|escape|eval|isFinite|isNaN|parseFloat|parseInt|unescape)\\b"
-        },
-        {
-          "name": "support.function.mutator.js",
-          "match": "(?\u003c=\\.)(shift|sort|splice|unshift|pop|push|reverse)\\b"
-        },
-        {
-          "name": "support.class.error.js",
-          "match": "\\s*+(?\u003c!\\.)\\b((Eval|Range|Reference|Syntax|Type|URI)?Error)\\b"
+          "name": "support.function.builtin.js",
+          "match": "(?\u003c!\\.)\\b(constructor|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|escape|eval|hasOwnProperty|isFinite|isNaN|isPrototypeOf|parseFloat|parseInt|propertyIsEnumerable|toLocaleString|toString|unescape|valueOf)\\b"
         },
         {
-          "name": "keyword.other.js",
-          "match": "\\s*+(?\u003c!\\.)\\b(debugger)\\b"
+          "name": "support.function.node.js",
+          "match": "(?\u003c!\\.)\\b(clearImmediate|clearInterval|clearTimeout|require|setImmediate|setInterval|setTimeout)\\b"
         },
         {
           "name": "support.type.object.dom.js",
-          "match": "\\s*+(?\u003c!\\.)\\b(document|window)\\b"
+          "match": "(?\u003c!\\.)\\b(?\u003edocument|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"
+          "name": "support.type.object.node.js",
+          "match": "(?\u003c!\\.)\\b(?\u003eglobal|GLOBAL|root|__dirname|__filename)\\b"
         },
         {
-          "match": "\\s*+(?\u003c!\\.)\\b(console)(?:(\\.)(warn|info|log|error|time|timeEnd|assert))?\\b",
+          "match": "(?\u003c!\\.)\\b(console)(?:(\\.)(assert|count|dir|error|group|groupCollapsed|groupEnd|info|log|profile|profileEnd|table|time|timeEnd|trace|warn))?\\b",
           "captures": {
             "1": {
               "name": "support.type.object.console.js"
@@ -3082,7 +2445,7 @@
           }
         },
         {
-          "match": "\\s*+(?\u003c!\\.)\\b(process)(?:(\\.)(stdout|stderr|stdin|argv|execPath|execArgv|env|exitCode|version|versions|config|pid|title|arch|platform|mainModule))?\\b",
+          "match": "(?\u003c!\\.)\\b(process)(?:(\\.)(?:(arch|argv|config|env|execArgv|execPath|exitCode|mainModule|pid|platform|stderr|stdin|stdout|title|version|versions)|(abort|chdir|cwd|exit|getgid|getgroups|getuid|hrtime|initgroups|kill|memoryUsage|nextTick|setgid|setgroups|setuid|umask|uptime)))?\\b",
           "captures": {
             "1": {
               "name": "support.type.object.process.js"
@@ -3092,25 +2455,14 @@
             },
             "3": {
               "name": "support.type.object.process.js"
-            }
-          }
-        },
-        {
-          "match": "\\s*+(?\u003c!\\.)\\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"
-            },
-            "2": {
-              "name": "keyword.operator.accessor.js"
             },
-            "3": {
+            "4": {
               "name": "support.function.process.js"
             }
           }
         },
         {
-          "match": "\\s*+\\b(((?\u003c!\\.)module\\.((?\u003c!\\,)exports|id|require|parent|filename|loaded|children)|exports))\\b",
+          "match": "(?\u003c!\\.)\\b(exports|module)(?:(\\.)(children|exports|filename|id|loaded|parent))?\\b",
           "captures": {
             "1": {
               "name": "support.type.object.module.js"
@@ -3123,18 +2475,10 @@
             }
           }
         },
-        {
-          "name": "support.type.object.node.js",
-          "match": "\\s*+(?\u003c!\\.)\\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"
-        },
         {
           "name": "meta.tag.mustache.js",
-          "begin": "\\s*+{{",
-          "end": "\\s*}}"
+          "begin": "{{",
+          "end": "}}"
         }
       ]
     }