github-linguist 5.3.3 → 6.0.0

data/grammars/source.jq.json

@@ -1,12 +1,6 @@
 {
-  "scopeName": "source.jq",
-  "fileTypes": [
-    "jq"
-  ],
-  "firstLineMatch": "^\\bjsoniq\\s+version\\b.*",
-  "foldingStartMarker": "^\\s*(<[^!?%/](?!.+?(/>|</.+?>))|<[!%]--(?!.+?--%?>)|<%[!]?(?!.+?%>))|(declare|.*\\{\\s*(//.*)?$)",
-  "foldingStopMarker": "^\\s*(</[^>]+>|[/%]>|-->)\\s*$|(.*\\}\\s*;?\\s*|.*;)",
   "name": "JSONiq",
+  "scopeName": "source.jq",
   "patterns": [
     {
       "begin": "^(?=xquery\\s+version\\s+)",
@@ -18,14 +12,14 @@
       ]
     },
     {
+      "name": "constant.jsoniq",
       "begin": "\\(#",
-      "end": "#\\)",
-      "name": "constant.jsoniq"
+      "end": "#\\)"
     },
     {
+      "name": "comment.doc.jsoniq",
       "begin": "\\(:~",
       "end": ":\\)",
-      "name": "comment.doc.jsoniq",
       "patterns": [
         {
           "name": "constant.language.jsoniq",
@@ -46,70 +40,69 @@
       "include": "#CharRef"
     },
     {
-      "begin": "<\\?",
-      "end": "\\?>",
-      "name": "comment.jsoniq"
+      "name": "comment.jsoniq",
+      "begin": "\u003c\\?",
+      "end": "\\?\u003e"
     },
     {
+      "name": "comment.jsoniq",
       "begin": "\\(:",
-      "end": ":\\)",
-      "name": "comment.jsoniq"
+      "end": ":\\)"
     },
     {
+      "name": "string.jsoniq",
       "begin": "\"",
       "end": "\"",
-      "name": "string.jsoniq",
       "patterns": [
         {
-          "match": "(?x:                # turn on extended mode\n                     \\\\                # a literal backslash\n                     (?:               # ...followed by...\n                       [\"\\\\/bfnrt]     # one of these characters\n                       |               # ...or...\n                       u               # a u\n                       [0-9a-fA-F]{4}  # and four hex digits\n                     )\n                   )",
-          "name": "constant.character.escape.jsoniq"
+          "name": "constant.character.escape.jsoniq",
+          "match": "(?x:                # turn on extended mode\n                     \\\\                # a literal backslash\n                     (?:               # ...followed by...\n                       [\"\\\\/bfnrt]     # one of these characters\n                       |               # ...or...\n                       u               # a u\n                       [0-9a-fA-F]{4}  # and four hex digits\n                     )\n                   )"
         },
         {
-          "match": "\\\\.",
-          "name": "invalid.illegal.unrecognized-string-escape.jsoniq"
+          "name": "invalid.illegal.unrecognized-string-escape.jsoniq",
+          "match": "\\\\."
         }
       ]
     },
     {
-      "match": "%([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*:)?([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*)",
-      "name": "meta.declaration.annotation.jsoniq"
+      "name": "meta.declaration.annotation.jsoniq",
+      "match": "%([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*:)?([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*)"
     },
     {
-      "match": "@(\\* | ([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*:)?([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*))",
-      "name": "support.type.jsoniq"
+      "name": "support.type.jsoniq",
+      "match": "@(\\* | ([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*:)?([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*))"
     },
     {
-      "match": "\\$([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*:)?([\\-_a-zA-Z0-9][\\-_a-zA-Z0-9]*)",
-      "name": "meta.definition.variable.name.jsoniq"
+      "name": "meta.definition.variable.name.jsoniq",
+      "match": "\\$([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*:)?([\\-_a-zA-Z0-9][\\-_a-zA-Z0-9]*)"
     },
     {
-      "match": "\\b(\\.[0-9]+|[0-9]+(\\.[0-9]*)?)[Ee][+#x002D]?[0-9]+\\b",
-      "name": "constant.numeric.jsoniq"
+      "name": "constant.numeric.jsoniq",
+      "match": "\\b(\\.[0-9]+|[0-9]+(\\.[0-9]*)?)[Ee][+#x002D]?[0-9]+\\b"
     },
     {
-      "match": "\\b(\\.[0-9]+|[0-9]+\\.[0-9]*)\\b",
-      "name": "constant.numeric.jsoniq"
+      "name": "constant.numeric.jsoniq",
+      "match": "\\b(\\.[0-9]+|[0-9]+\\.[0-9]*)\\b"
     },
     {
-      "match": "\\b[0-9]+\\b",
-      "name": "constant.numeric.jsoniq"
+      "name": "constant.numeric.jsoniq",
+      "match": "\\b[0-9]+\\b"
     },
     {
-      "match": "\\b(NaN|after|allowing|ancestor|ancestor-or-self|and|append|array|as|ascending|at|attribute|base-uri|before|boundary-space|break|by|case|cast|castable|catch|child|collation|comment|constraint|construction|contains|context|continue|copy|copy-namespaces|count|decimal-format|decimal-separator|declare|default|delete|descendant|descendant-or-self|descending|digit|div|document|document-node|element|else|empty|empty-sequence|encoding|end|eq|every|except|exit|external|false|first|following|following-sibling|for|from|ft-option|function|ge|greatest|group|grouping-separator|gt|idiv|if|import|in|index|infinity|insert|instance|integrity|intersect|into|is|item|json|json-item|jsoniq|last|lax|le|least|let|loop|lt|minus-sign|mod|modify|module|namespace|namespace-node|ne|next|node|nodes|not|null|object|of|only|option|or|order|ordered|ordering|paragraphs|parent|pattern-separator|per-mille|percent|preceding|preceding-sibling|previous|processing-instruction|rename|replace|return|returning|revalidation|satisfies|schema|schema-attribute|schema-element|score|select|self|sentences|sliding|some|stable|start|strict|switch|text|then|times|to|treat|true|try|tumbling|type|typeswitch|union|unordered|updating|validate|value|variable|version|when|where|while|window|with|words|xquery|zero-digit)(?!(:|\\-))\\b",
-      "name": "keyword.jsoniq"
+      "name": "keyword.jsoniq",
+      "match": "\\b(NaN|after|allowing|ancestor|ancestor-or-self|and|append|array|as|ascending|at|attribute|base-uri|before|boundary-space|break|by|case|cast|castable|catch|child|collation|comment|constraint|construction|contains|context|continue|copy|copy-namespaces|count|decimal-format|decimal-separator|declare|default|delete|descendant|descendant-or-self|descending|digit|div|document|document-node|element|else|empty|empty-sequence|encoding|end|eq|every|except|exit|external|false|first|following|following-sibling|for|from|ft-option|function|ge|greatest|group|grouping-separator|gt|idiv|if|import|in|index|infinity|insert|instance|integrity|intersect|into|is|item|json|json-item|jsoniq|last|lax|le|least|let|loop|lt|minus-sign|mod|modify|module|namespace|namespace-node|ne|next|node|nodes|not|null|object|of|only|option|or|order|ordered|ordering|paragraphs|parent|pattern-separator|per-mille|percent|preceding|preceding-sibling|previous|processing-instruction|rename|replace|return|returning|revalidation|satisfies|schema|schema-attribute|schema-element|score|select|self|sentences|sliding|some|stable|start|strict|switch|text|then|times|to|treat|true|try|tumbling|type|typeswitch|union|unordered|updating|validate|value|variable|version|when|where|while|window|with|words|xquery|zero-digit)(?!(:|\\-))\\b"
     },
     {
-      "comment": "EQName",
-      "match": "([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*:)?([\\-_a-zA-Z0-9][\\-_a-zA-Z0-9]*)(?=\\s*\\()",
-      "name": "support.function.jsoniq"
+      "name": "support.function.jsoniq",
+      "match": "([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*:)?([\\-_a-zA-Z0-9][\\-_a-zA-Z0-9]*)(?=\\s*\\()"
     },
     {
-      "match": "\\(",
-      "name": "lparen.jsoniq"
+      "name": "lparen.jsoniq",
+      "match": "\\("
     },
     {
-      "match": "\\)",
-      "name": "rparent.jsoniq"
+      "name": "rparent.jsoniq",
+      "match": "\\)"
     },
     {
       "include": "#OpenTag"
@@ -119,27 +112,50 @@
     }
   ],
   "repository": {
+    "CDATA": {
+      "name": "constant.language.jsoniq",
+      "begin": "\u003c!\\[CDATA\\[",
+      "end": "\\]\\]\u003e"
+    },
+    "CharRef": {
+      "name": "constant.language.escape.jsoniq",
+      "match": "\u0026#([0-9]+|x[0-9A-Fa-f]+);"
+    },
+    "CloseTag": {
+      "name": "punctuation.definition.tag.jsoniq",
+      "match": "\u003c\\/([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*:)?([\\-_a-zA-Z0-9][\\-_a-zA-Z0-9]*)\\s*\u003e"
+    },
+    "EnclosedExpr": {
+      "name": "source.jq",
+      "begin": "{",
+      "end": "}",
+      "patterns": [
+        {
+          "include": "$self"
+        }
+      ]
+    },
     "OpenTag": {
-      "begin": "<([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*:)?([\\-_a-zA-Z0-9][\\-_a-zA-Z0-9]*)",
-      "end": "(\\/>|>)",
       "name": "punctuation.definition.tag.jsoniq",
+      "begin": "\u003c([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*:)?([\\-_a-zA-Z0-9][\\-_a-zA-Z0-9]*)",
+      "end": "(\\/\u003e|\u003e)",
       "patterns": [
         {
-          "match": "([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*:)?([\\-_a-zA-Z0-9][\\-_a-zA-Z0-9]*)",
-          "name": "entity.other.attribute-name.jsoniq"
+          "name": "entity.other.attribute-name.jsoniq",
+          "match": "([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*:)?([\\-_a-zA-Z0-9][\\-_a-zA-Z0-9]*)"
         },
         {
-          "match": "=",
-          "name": "source.jq"
+          "name": "source.jq",
+          "match": "="
         },
         {
+          "name": "string.jsoniq",
           "begin": "'",
           "end": "'(?!')",
-          "name": "string.jsoniq",
           "patterns": [
             {
-              "match": "''",
-              "name": "constant.jsoniq"
+              "name": "constant.jsoniq",
+              "match": "''"
             },
             {
               "include": "#PredefinedEntityRef"
@@ -148,8 +164,8 @@
               "include": "#CharRef"
             },
             {
-              "match": "({{|}})",
-              "name": "constant.jsoniq"
+              "name": "constant.jsoniq",
+              "match": "({{|}})"
             },
             {
               "include": "#EnclosedExpr"
@@ -157,13 +173,13 @@
           ]
         },
         {
+          "name": "string.jsoniq",
           "begin": "\"",
           "end": "\"(?!\")",
-          "name": "string.jsoniq",
           "patterns": [
             {
-              "match": "\"\"",
-              "name": "constant.jsoniq"
+              "name": "constant.jsoniq",
+              "match": "\"\""
             },
             {
               "include": "#PredefinedEntityRef"
@@ -172,8 +188,8 @@
               "include": "#CharRef"
             },
             {
-              "match": "({{|}})",
-              "name": "string.jsoniq"
+              "name": "string.jsoniq",
+              "match": "({{|}})"
             },
             {
               "include": "#EnclosedExpr"
@@ -182,37 +198,14 @@
         }
       ]
     },
-    "CloseTag": {
-      "match": "<\\/([\\-_a-zA-Z0-9][\\-\\._a-zA-Z0-9]*:)?([\\-_a-zA-Z0-9][\\-_a-zA-Z0-9]*)\\s*>",
-      "name": "punctuation.definition.tag.jsoniq"
-    },
-    "XMLComment": {
-      "begin": "<!--",
-      "end": "-->",
-      "name": "comment.jsoniq"
-    },
-    "CDATA": {
-      "begin": "<!\\[CDATA\\[",
-      "end": "\\]\\]>",
-      "name": "constant.language.jsoniq"
-    },
     "PredefinedEntityRef": {
-      "match": "&(lt|gt|amp|quot|apos);",
-      "name": "constant.language.escape.jsoniq"
+      "name": "constant.language.escape.jsoniq",
+      "match": "\u0026(lt|gt|amp|quot|apos);"
     },
-    "CharRef": {
-      "match": "&#([0-9]+|x[0-9A-Fa-f]+);",
-      "name": "constant.language.escape.jsoniq"
-    },
-    "EnclosedExpr": {
-      "begin": "{",
-      "end": "}",
-      "name": "source.jq",
-      "patterns": [
-        {
-          "include": "$self"
-        }
-      ]
+    "XMLComment": {
+      "name": "comment.jsoniq",
+      "begin": "\u003c!--",
+      "end": "--\u003e"
     }
   }
-}
+}

data/grammars/source.js.json

@@ -1,50 +1,15 @@
 {
-  "scopeName": "source.js",
-  "fileTypes": [
-    "js",
-    "_js",
-    "es",
-    "es6",
-    "gs",
-    "htc",
-    "jscad",
-    "jslib",
-    "jsm",
-    "json5",
-    "jspre",
-    "mjs",
-    "pac",
-    "pjs",
-    "sjs",
-    "xsjs",
-    "xsjslib"
-  ],
-  "firstLineMatch": "(?x)\n# Hashbang\n^\\#!.*(?:\\s|\\/|(?<=!)\\b)\n  (?:node|iojs|JavaScript)\n(?:$|\\s)\n|\n# Modeline\n(?i:\n  # Emacs\n  -\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)\n    (?:js|javascript)\n  (?=[\\s;]|(?<![-*])-\\*-).*?-\\*-\n  |\n  # Vim\n  (?:(?:\\s|^)vi(?:m[<=>]?\\d+|m)?|\\sex)(?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s*set?\\s))(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:](?:filetype|ft|syntax)\\s*=\n    javascript\n  (?=\\s|:|$)\n)",
   "name": "JavaScript",
+  "scopeName": "source.js",
   "patterns": [
     {
-      "begin": "(?<!\\.)\\b(import)(?!\\s*[:(])\\b",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.control.js"
-        }
-      },
-      "end": "(?=;|$)",
       "name": "meta.import.js",
+      "begin": "(?\u003c!\\.)\\b(import)(?!\\s*[:(])\\b",
+      "end": "(?=;|$)",
       "patterns": [
         {
           "begin": "{",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.modules.begin.js"
-            }
-          },
           "end": "}",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.modules.end.js"
-            }
-          },
           "patterns": [
             {
               "match": "(?x)\n(?: \\b(default)\\b | \\b([a-zA-Z_$][\\w$]*)\\b)\n\\s*\n(\\b as \\b)\n\\s*\n(?: (\\b default \\b | \\*) | \\b([a-zA-Z_$][\\w$]*)\\b)",
@@ -67,17 +32,27 @@
               }
             },
             {
-              "match": ",",
-              "name": "meta.delimiter.object.comma.js"
+              "name": "meta.delimiter.object.comma.js",
+              "match": ","
             },
             {
               "include": "#comments"
             },
             {
-              "match": "\\b([a-zA-Z_$][\\w$]*)\\b",
-              "name": "variable.other.module.js"
+              "name": "variable.other.module.js",
+              "match": "\\b([a-zA-Z_$][\\w$]*)\\b"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.modules.begin.js"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.modules.end.js"
+            }
+          }
         },
         {
           "match": "(?x)\n(?: \\b(default)\\b | (\\*) | \\b([a-zA-Z_$][\\w$]*)\\b)\n\\s*\n(\\b as \\b)\n\\s*\n(?: (\\b default \\b | \\*) | \\b([a-zA-Z_$][\\w$]*)\\b)",
@@ -103,12 +78,12 @@
           }
         },
         {
-          "match": "\\*",
-          "name": "variable.language.import-all.js"
+          "name": "variable.language.import-all.js",
+          "match": "\\*"
         },
         {
-          "match": "\\b(default)\\b",
-          "name": "variable.language.default.js"
+          "name": "variable.language.default.js",
+          "match": "\\b(default)\\b"
         },
         {
           "include": "#strings"
@@ -117,18 +92,23 @@
           "include": "#comments"
         },
         {
-          "match": "\\b(from)\\b",
-          "name": "keyword.control.js"
+          "name": "keyword.control.js",
+          "match": "\\b(from)\\b"
         },
         {
-          "match": "\\b([a-zA-Z_$][\\w$]*)\\b(?=.*\\bfrom\\b)",
-          "name": "variable.other.module.js"
+          "name": "variable.other.module.js",
+          "match": "\\b([a-zA-Z_$][\\w$]*)\\b(?=.*\\bfrom\\b)"
         },
         {
-          "match": ",",
-          "name": "meta.delimiter.object.comma.js"
+          "name": "meta.delimiter.object.comma.js",
+          "match": ","
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.js"
+        }
+      }
     },
     {
       "match": "(?x)\n\\b(export)\\b\\s*\n\\b(default)\\b\\s*\n\\b((?!\\b(?:function|class|let|var|const)\\b)[a-zA-Z_$][\\w$]*)?\\b",
@@ -148,31 +128,16 @@
       }
     },
     {
-      "begin": "(?<!\\.)\\b(export)(?!\\s*[:(])\\b",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.control.js"
-        }
-      },
-      "end": "(?=;|\\bfunction\\b|\\bclass\\b|\\blet\\b|\\bvar\\b|\\bconst\\b|$)",
       "name": "meta.export.js",
+      "begin": "(?\u003c!\\.)\\b(export)(?!\\s*[:(])\\b",
+      "end": "(?=;|\\bfunction\\b|\\bclass\\b|\\blet\\b|\\bvar\\b|\\bconst\\b|$)",
       "patterns": [
         {
           "include": "#numbers"
         },
         {
           "begin": "{(?=.*\\bfrom\\b)",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.modules.begin.js"
-            }
-          },
           "end": "}",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.modules.end.js"
-            }
-          },
           "patterns": [
             {
               "match": "(?x)\n(?: \\b(default)\\b | \\b([a-zA-Z_$][\\w$]*)\\b)\n\\s*\n(\\b as \\b)\n\\s*\n(?: \\b(default)\\b | (\\*) | \\b([a-zA-Z_$][\\w$]*)\\b)",
@@ -198,33 +163,34 @@
               }
             },
             {
-              "match": ",",
-              "name": "meta.delimiter.object.comma.js"
+              "name": "meta.delimiter.object.comma.js",
+              "match": ","
             },
             {
               "include": "#comments"
             },
             {
-              "match": "\\b([a-zA-Z_$][\\w$]*)\\b",
-              "name": "variable.other.module.js"
+              "name": "variable.other.module.js",
+              "match": "\\b([a-zA-Z_$][\\w$]*)\\b"
             }
-          ]
-        },
-        {
-          "begin": "(?![a-zA-Z_$0-9]){",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.modules.begin.js"
             }
           },
-          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.modules.end.js"
             }
-          },
+          }
+        },
+        {
+          "begin": "(?![a-zA-Z_$0-9]){",
+          "end": "}",
           "patterns": [
             {
+              "match": "(?x)\n(?: \\b(default)\\b | \\b([a-zA-Z_$][\\w$]*)\\b)\n\\s*\n(\\b as \\b)\n\\s*\n(?: \\b(default)\\b | (\\*) | \\b([a-zA-Z_$][\\w$]*)\\b)",
               "captures": {
                 "1": {
                   "name": "invalid.illegal.js"
@@ -244,29 +210,38 @@
                 "6": {
                   "name": "variable.other.module-alias.js"
                 }
-              },
-              "match": "(?x)\n(?: \\b(default)\\b | \\b([a-zA-Z_$][\\w$]*)\\b)\n\\s*\n(\\b as \\b)\n\\s*\n(?: \\b(default)\\b | (\\*) | \\b([a-zA-Z_$][\\w$]*)\\b)"
+              }
             },
             {
               "include": "#comments"
             },
             {
-              "match": ",",
-              "name": "meta.delimiter.object.comma.js"
+              "name": "meta.delimiter.object.comma.js",
+              "match": ","
             },
             {
-              "match": "\\b([a-zA-Z_$][\\w$]*)\\b",
-              "name": "variable.other.module.js"
+              "name": "variable.other.module.js",
+              "match": "\\b([a-zA-Z_$][\\w$]*)\\b"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.modules.begin.js"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.modules.end.js"
+            }
+          }
         },
         {
-          "match": "\\*(?=.*\\bfrom\\b)",
-          "name": "variable.language.import-all.js"
+          "name": "variable.language.import-all.js",
+          "match": "\\*(?=.*\\bfrom\\b)"
         },
         {
-          "match": "\\b(default)\\b",
-          "name": "variable.language.default.js"
+          "name": "variable.language.default.js",
+          "match": "\\b(default)\\b"
         },
         {
           "include": "#strings"
@@ -275,29 +250,34 @@
           "include": "#comments"
         },
         {
-          "match": "\\b(from)\\b",
-          "name": "keyword.control.js"
+          "name": "keyword.control.js",
+          "match": "\\b(from)\\b"
         },
         {
-          "match": "\\b([a-zA-Z_$][\\w$]*)\\b",
-          "name": "variable.other.module.js"
+          "name": "variable.other.module.js",
+          "match": "\\b([a-zA-Z_$][\\w$]*)\\b"
         },
         {
-          "match": ",",
-          "name": "meta.delimiter.object.comma.js"
+          "name": "meta.delimiter.object.comma.js",
+          "match": ","
         },
         {
           "include": "#operators"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.js"
+        }
+      }
     },
     {
-      "match": "(?:(?<=\\.{3})|(?<!\\.)\\b)(?<!\\$)(super|this|arguments)(?!\\s*:|\\$)\\b",
-      "name": "variable.language.js"
+      "name": "variable.language.js",
+      "match": "(?:(?\u003c=\\.{3})|(?\u003c!\\.)\\b)(?\u003c!\\$)(super|this|arguments)(?!\\s*:|\\$)\\b"
     },
     {
       "begin": "(?=(\\basync\\b\\s*)?\\bfunction\\b(?!\\s*:))",
-      "end": "(?<=})",
+      "end": "(?\u003c=})",
       "patterns": [
         {
           "include": "#comments"
@@ -306,9 +286,9 @@
           "include": "#function_body"
         },
         {
-          "begin": "\\G",
-          "end": "(?<=\\))",
           "name": "meta.function.js",
+          "begin": "\\G",
+          "end": "(?\u003c=\\))",
           "patterns": [
             {
               "include": "#function_innards"
@@ -319,7 +299,7 @@
     },
     {
       "begin": "(?=(\\.)?[a-zA-Z_$][\\w$]*\\s*=\\s*(\\basync\\b\\s*)?\\bfunction\\b)",
-      "end": "(?<=})",
+      "end": "(?\u003c=})",
       "patterns": [
         {
           "include": "#comments"
@@ -328,9 +308,9 @@
           "include": "#function_body"
         },
         {
-          "begin": "\\G",
-          "end": "(?!\\G)(?<=\\))",
           "name": "meta.function.js",
+          "begin": "\\G",
+          "end": "(?!\\G)(?\u003c=\\))",
           "patterns": [
             {
               "match": "(\\.)?([a-zA-Z_$][\\w$]*)\\s*(=)\\s*",
@@ -355,7 +335,7 @@
     },
     {
       "begin": "(?=\\b[a-zA-Z_$][\\w$]*\\s*:\\s*(\\basync\\b\\s*)?\\bfunction\\b)",
-      "end": "(?<=})",
+      "end": "(?\u003c=})",
       "patterns": [
         {
           "include": "#comments"
@@ -364,9 +344,9 @@
           "include": "#function_body"
         },
         {
-          "begin": "\\G",
-          "end": "(?<=\\))",
           "name": "meta.function.json.js",
+          "begin": "\\G",
+          "end": "(?\u003c=\\))",
           "patterns": [
             {
               "match": "\\b([a-zA-Z_$][\\w$]*)\\s*(:)\\s*",
@@ -388,7 +368,7 @@
     },
     {
       "begin": "(?=(('[^']*?')|(\"[^\"]*?\"))\\s*:\\s*(\\basync\\b\\s*)?\\bfunction\\b)",
-      "end": "(?<=})",
+      "end": "(?\u003c=})",
       "patterns": [
         {
           "include": "#comments"
@@ -397,9 +377,9 @@
           "include": "#function_body"
         },
         {
-          "begin": "\\G",
-          "end": "(?<=\\))",
           "name": "meta.function.json.js",
+          "begin": "\\G",
+          "end": "(?\u003c=\\))",
           "patterns": [
             {
               "match": "(?:((')([^']*?)('))|((\")([^\"]*?)(\")))\\s*(:)",
@@ -442,7 +422,7 @@
     },
     {
       "begin": "(?=\\bconstructor\\b\\s*)",
-      "end": "(?<=})",
+      "end": "(?\u003c=})",
       "patterns": [
         {
           "include": "#comments"
@@ -451,13 +431,13 @@
           "include": "#function_body"
         },
         {
-          "begin": "\\G",
-          "end": "(?<=\\))",
           "name": "meta.function.js",
+          "begin": "\\G",
+          "end": "(?\u003c=\\))",
           "patterns": [
             {
-              "match": "\\b(constructor)\\s*",
-              "name": "entity.name.function.constructor.js"
+              "name": "entity.name.function.constructor.js",
+              "match": "\\b(constructor)\\s*"
             },
             {
               "include": "#function_innards"
@@ -468,7 +448,7 @@
     },
     {
       "begin": "(?x)\n(?=\n  (?!\n    (break|case|catch|continue|do|else|finally|for|function|if|\n    return|switch|throw|try|while|with)\n    [\\s\\(]\n  )\n  (\n    \\b(get|set)            # Property getter/setter: get foo(){}\n    (?:\\s+|(?=\\[))        # Followed by whitespace or square bracket\n  )?+\n  (                         # Method name\n    \\b[a-zA-Z_$][\\w$]*    # Fixed name\n    |\n    \\[                     # Computed property key\n      [^\\[\\]]++           # Contains at least one non-brace character\n    \\]\n  )\n  \\s*\\(\\s*               # Start of arguments list\n    (\n      \"[^\"]*\"  |            # Double-quoted string\n      '[^']*'  |            # Single-quoted string\n       [^\"()']              # Any non-bracket or non-quote\n    )*\n  \\)\\s*                   # End of arguments\n  {                         # Beginning of body\n)",
-      "end": "(?<=})",
+      "end": "(?\u003c=})",
       "patterns": [
         {
           "include": "#comments"
@@ -477,11 +457,12 @@
           "include": "#function_body"
         },
         {
-          "begin": "\\G",
-          "end": "(?<=\\))",
           "name": "meta.function.method.definition.js",
+          "begin": "\\G",
+          "end": "(?\u003c=\\))",
           "patterns": [
             {
+              "name": "meta.computed-key.js",
               "match": "(\\[)(.+)(\\])(?=\\s*\\()",
               "captures": {
                 "1": {
@@ -493,24 +474,23 @@
                       "include": "$self"
                     },
                     {
-                      "match": "[a-zA-Z_$][\\w$]*",
-                      "name": "variable.parameter.property.js"
+                      "name": "variable.parameter.property.js",
+                      "match": "[a-zA-Z_$][\\w$]*"
                     }
                   ]
                 },
                 "3": {
                   "name": "punctuation.definition.computed-key.end.bracket.square.js"
                 }
-              },
-              "name": "meta.computed-key.js"
+              }
             },
             {
-              "match": "\\b(get|set)(?=\\s*\\[.+\\]\\s*\\(|\\s+[^\\s\\[(]+\\s*\\()",
-              "name": "keyword.operator.$1ter.js"
+              "name": "keyword.operator.$1ter.js",
+              "match": "\\b(get|set)(?=\\s*\\[.+\\]\\s*\\(|\\s+[^\\s\\[(]+\\s*\\()"
             },
             {
-              "match": "\\b([a-zA-Z_$][\\w$]*)",
-              "name": "entity.name.function.js"
+              "name": "entity.name.function.js",
+              "match": "\\b([a-zA-Z_$][\\w$]*)"
             },
             {
               "include": "#function_params"
@@ -520,8 +500,8 @@
       ]
     },
     {
-      "begin": "(?x)\n(?=\n  (?<![A-Za-z0-9])\n  ((\\(([^\\(\\)]*)?\\))|[\\w$]+)\n  \\s*=>\n)",
-      "end": "(?x)\n(?<=})|\n((?!\n  \\s*{|\n  \\G\\(|\n  \\G[\\w$]+|\n  \\s*/\\*|\\s*//\n)(?=\\s*\\S))",
+      "begin": "(?x)\n(?=\n  (?\u003c![A-Za-z0-9])\n  ((\\(([^\\(\\)]*)?\\))|[\\w$]+)\n  \\s*=\u003e\n)",
+      "end": "(?x)\n(?\u003c=})|\n((?!\n  \\s*{|\n  \\G\\(|\n  \\G[\\w$]+|\n  \\s*/\\*|\\s*//\n)(?=\\s*\\S))",
       "patterns": [
         {
           "include": "#comments"
@@ -530,9 +510,9 @@
           "include": "#function_body"
         },
         {
-          "begin": "\\G",
-          "end": "(?<=(=>))",
           "name": "meta.function.arrow.js",
+          "begin": "\\G",
+          "end": "(?\u003c=(=\u003e))",
           "patterns": [
             {
               "include": "#arrow_function_innards"
@@ -542,8 +522,8 @@
       ]
     },
     {
-      "begin": "(?x)\n(?=\n  (\\.)?[a-zA-Z_$][\\w$]*\n  \\s*(=)\\s*\n  ((\\(([^\\(\\)]*)?\\))|[\\w$]+)\n  \\s*=>\n)",
-      "end": "(?x)\n(?<=})|\n((?!\n  \\s*{|\n  \\G(\\.)?[a-zA-Z_$][\\w$]*\\s*(=)\\s*\\(|\n  \\G(\\.)?[a-zA-Z_$][\\w$]*\\s*(=)\\s*[\\w$]+|\n  \\s*/\\*|\\s*//\n)(?=\\s*\\S))",
+      "begin": "(?x)\n(?=\n  (\\.)?[a-zA-Z_$][\\w$]*\n  \\s*(=)\\s*\n  ((\\(([^\\(\\)]*)?\\))|[\\w$]+)\n  \\s*=\u003e\n)",
+      "end": "(?x)\n(?\u003c=})|\n((?!\n  \\s*{|\n  \\G(\\.)?[a-zA-Z_$][\\w$]*\\s*(=)\\s*\\(|\n  \\G(\\.)?[a-zA-Z_$][\\w$]*\\s*(=)\\s*[\\w$]+|\n  \\s*/\\*|\\s*//\n)(?=\\s*\\S))",
       "patterns": [
         {
           "include": "#comments"
@@ -552,9 +532,9 @@
           "include": "#function_body"
         },
         {
-          "begin": "\\G",
-          "end": "(?<=(=>))",
           "name": "meta.function.arrow.js",
+          "begin": "\\G",
+          "end": "(?\u003c=(=\u003e))",
           "patterns": [
             {
               "match": "\\G(\\.)?([a-zA-Z_$][\\w$]*)\\s*(=)",
@@ -578,8 +558,8 @@
       ]
     },
     {
-      "begin": "(?x)\n(?=\n  \\b[a-zA-Z_$][\\w$]*\n  \\s*:\\s*\n  ((\\(([^\\(\\)]*)?\\))|[\\w$]+)\n  \\s*=>\n)",
-      "end": "(?x)\n(?<=})|\n((?!\n  \\s*{|\n  \\G[\\w$]+\\s*:|\n  \\s*/\\*|\\s*//\n)(?=\\s*\\S))",
+      "begin": "(?x)\n(?=\n  \\b[a-zA-Z_$][\\w$]*\n  \\s*:\\s*\n  ((\\(([^\\(\\)]*)?\\))|[\\w$]+)\n  \\s*=\u003e\n)",
+      "end": "(?x)\n(?\u003c=})|\n((?!\n  \\s*{|\n  \\G[\\w$]+\\s*:|\n  \\s*/\\*|\\s*//\n)(?=\\s*\\S))",
       "patterns": [
         {
           "include": "#comments"
@@ -588,9 +568,9 @@
           "include": "#function_body"
         },
         {
-          "begin": "\\G",
-          "end": "(?<=(=>))",
           "name": "meta.function.arrow.json.js",
+          "begin": "\\G",
+          "end": "(?\u003c=(=\u003e))",
           "patterns": [
             {
               "match": "\\b([a-zA-Z_$][\\w$]*)\\s*(:)\\s*",
@@ -611,8 +591,8 @@
       ]
     },
     {
-      "begin": "(?x)\n(?=\n  (('[^']*?')|(\"[^\"]*?\"))\n  \\s*:\\s*\n  ((\\(([^\\(\\)]*)?\\))|[\\w$]+)\n  \\s*=>\n)",
-      "end": "(?x)\n(?<=})|\n((?!\n  \\G(('[^']*?')|(\"[^\"]*?\"))|\n  \\s*{|\n  \\s*/\\*|\\s*//\n)(?=\\s*\\S))",
+      "begin": "(?x)\n(?=\n  (('[^']*?')|(\"[^\"]*?\"))\n  \\s*:\\s*\n  ((\\(([^\\(\\)]*)?\\))|[\\w$]+)\n  \\s*=\u003e\n)",
+      "end": "(?x)\n(?\u003c=})|\n((?!\n  \\G(('[^']*?')|(\"[^\"]*?\"))|\n  \\s*{|\n  \\s*/\\*|\\s*//\n)(?=\\s*\\S))",
       "patterns": [
         {
           "include": "#comments"
@@ -621,9 +601,9 @@
           "include": "#function_body"
         },
         {
-          "begin": "\\G",
-          "end": "(?<=(=>))",
           "name": "meta.function.arrow.json.js",
+          "begin": "\\G",
+          "end": "(?\u003c=(=\u003e))",
           "patterns": [
             {
               "match": "(?:((')([^']*?)('))|((\")([^\"]*?)(\")))\\s*(:)",
@@ -665,7 +645,7 @@
       ]
     },
     {
-      "match": "(=>)",
+      "match": "(=\u003e)",
       "captures": {
         "0": {
           "name": "meta.function.arrow.js"
@@ -676,6 +656,7 @@
       }
     },
     {
+      "name": "meta.class.js",
       "match": "(?x)\n\\b(class)\n(?:\n  (?:\\s+(extends)\\s+([a-zA-Z_$][\\w$]*))\n  |\n  (?:\n    (?:\\s+([a-zA-Z_$][\\w$]*))\n    (?:\\s+(extends)\\s+([a-zA-Z_$][\\w$]*))?\n  )\n)",
       "captures": {
         "1": {
@@ -696,12 +677,11 @@
         "6": {
           "name": "entity.other.inherited-class.js"
         }
-      },
-      "name": "meta.class.js"
+      }
     },
     {
-      "match": "(new)\\s+([\\w$]+[\\w.$]*)",
       "name": "meta.class.instance.constructor.js",
+      "match": "(new)\\s+([\\w$]+[\\w.$]*)",
       "captures": {
         "1": {
           "name": "keyword.operator.new.js"
@@ -710,27 +690,29 @@
           "name": "entity.name.type.instance.js",
           "patterns": [
             {
-              "match": "\\.",
-              "name": "meta.delimiter.property.period.js"
+              "name": "meta.delimiter.property.period.js",
+              "match": "\\."
             }
           ]
         }
       }
     },
     {
-      "begin": "(?<![\\w$])console(?![\\w$]|\\s*:)",
-      "beginCaptures": {
-        "0": {
-          "name": "entity.name.type.object.console.js"
-        }
-      },
-      "end": "(?x)\n(?<=\\)) | (?=\n  (?! (\\s*//)|(\\s*/\\*)|(\\s*(\\.)\\s*\n    (assert|clear|debug|error|info|log|profile|profileEnd|time|timeEnd|warn)\n    \\s*\\(\n  )) \\s*\\S\n)",
+      "begin": "(?\u003c![\\w$])console(?![\\w$]|\\s*:)",
+      "end": "(?x)\n(?\u003c=\\)) | (?=\n  (?! (\\s*//)|(\\s*/\\*)|(\\s*(\\.)\\s*\n    (assert|clear|debug|error|info|log|profile|profileEnd|time|timeEnd|warn)\n    \\s*\\(\n  )) \\s*\\S\n)",
       "patterns": [
         {
           "include": "#comments"
         },
         {
+          "name": "meta.method-call.js",
           "begin": "\\s*(\\.)\\s*(\\w+)\\s*(?=\\()",
+          "end": "(?\u003c=\\))",
+          "patterns": [
+            {
+              "include": "#arguments"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "meta.delimiter.method.period.js"
@@ -738,31 +720,31 @@
             "2": {
               "name": "support.function.console.js"
             }
-          },
-          "end": "(?<=\\))",
-          "name": "meta.method-call.js",
-          "patterns": [
-            {
-              "include": "#arguments"
-            }
-          ]
+          }
         }
-      ]
-    },
-    {
-      "begin": "(?<![\\w$])Math(?![\\w$]|\\s*:)",
+      ],
       "beginCaptures": {
         "0": {
-          "name": "support.class.math.js"
+          "name": "entity.name.type.object.console.js"
         }
-      },
-      "end": "(?x)\n(?<=E|LN10|LN2|LOG10E|LOG2E|PI|SQRT1_2|SQRT2|\\)\n) | (?=\n  (?! (\\s*//)|(\\s*/\\*)|(\\s*\\.\\s* (\n    ((abs|acos|acosh|asin|asinh|atan|atan2|atanh|cbrt|ceil|clz32|cos|cosh|exp|\n    expm1|floor|fround|hypot|imul|log|log10|log1p|log2|max|min|pow|random|\n    round|sign|sin|sinh|sqrt|tan|tanh|trunc)\\s*\\(\n    ) | (E|LN10|LN2|LOG10E|LOG2E|PI|SQRT1_2|SQRT2)(?!\\s*[\\w$(]))\n  )) \\s*\\S\n)",
+      }
+    },
+    {
+      "begin": "(?\u003c![\\w$])Math(?![\\w$]|\\s*:)",
+      "end": "(?x)\n(?\u003c=E|LN10|LN2|LOG10E|LOG2E|PI|SQRT1_2|SQRT2|\\)\n) | (?=\n  (?! (\\s*//)|(\\s*/\\*)|(\\s*\\.\\s* (\n    ((abs|acos|acosh|asin|asinh|atan|atan2|atanh|cbrt|ceil|clz32|cos|cosh|exp|\n    expm1|floor|fround|hypot|imul|log|log10|log1p|log2|max|min|pow|random|\n    round|sign|sin|sinh|sqrt|tan|tanh|trunc)\\s*\\(\n    ) | (E|LN10|LN2|LOG10E|LOG2E|PI|SQRT1_2|SQRT2)(?!\\s*[\\w$(]))\n  )) \\s*\\S\n)",
       "patterns": [
         {
           "include": "#comments"
         },
         {
+          "name": "meta.method-call.js",
           "begin": "\\s*(\\.)\\s*(\\w+)\\s*(?=\\()",
+          "end": "(?\u003c=\\))",
+          "patterns": [
+            {
+              "include": "#arguments"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "meta.delimiter.method.period.js"
@@ -770,14 +752,7 @@
             "2": {
               "name": "support.function.math.js"
             }
-          },
-          "end": "(?<=\\))",
-          "name": "meta.method-call.js",
-          "patterns": [
-            {
-              "include": "#arguments"
-            }
-          ]
+          }
         },
         {
           "match": "\\s*(\\.)\\s*(\\w+)\\b",
@@ -790,7 +765,12 @@
             }
           }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "support.class.math.js"
+        }
+      }
     },
     {
       "include": "#strings"
@@ -799,7 +779,8 @@
       "include": "#comments"
     },
     {
-      "match": "(<!--|-->)",
+      "name": "comment.block.html.js",
+      "match": "(\u003c!--|--\u003e)",
       "captures": {
         "0": {
           "name": "punctuation.definition.comment.html.js"
@@ -807,40 +788,23 @@
         "2": {
           "name": "punctuation.definition.comment.html.js"
         }
-      },
-      "name": "comment.block.html.js"
+      }
     },
     {
-      "match": "(?<!\\.)\\b(class|enum|function|interface)(?!\\s*:)\\b",
-      "name": "storage.type.js"
+      "name": "storage.type.js",
+      "match": "(?\u003c!\\.)\\b(class|enum|function|interface)(?!\\s*:)\\b"
     },
     {
-      "match": "(?<!\\.)\\b(async|export|extends|implements|private|protected|public|static)(?!\\s*:)\\b",
-      "name": "storage.modifier.js"
+      "name": "storage.modifier.js",
+      "match": "(?\u003c!\\.)\\b(async|export|extends|implements|private|protected|public|static)(?!\\s*:)\\b"
     },
     {
-      "match": "(?<!\\.)\\b(let|var)(?!\\s*:)\\b",
-      "name": "storage.type.var.js"
+      "name": "storage.type.var.js",
+      "match": "(?\u003c!\\.)\\b(let|var)(?!\\s*:)\\b"
     },
     {
-      "begin": "(?<!\\.)\\b(const)(?!\\s*:)\\b",
-      "beginCaptures": {
-        "1": {
-          "name": "storage.type.const.js"
-        }
-      },
-      "end": "(\\bof\\b|\\bin\\b)|(;)|(=)|(?<![,{])\\n",
-      "endCaptures": {
-        "1": {
-          "name": "keyword.operator.$1.js"
-        },
-        "2": {
-          "name": "punctuation.terminator.statement.js"
-        },
-        "3": {
-          "name": "keyword.operator.assignment.js"
-        }
-      },
+      "begin": "(?\u003c!\\.)\\b(const)(?!\\s*:)\\b",
+      "end": "(\\bof\\b|\\bin\\b)|(;)|(=)|(?\u003c![,{])\\n",
       "patterns": [
         {
           "match": "([$_a-zA-Z][$_a-zA-Z0-9]*)\\s*(:)\\s*([$_a-zA-Z][$_a-zA-Z0-9]*)?",
@@ -862,32 +826,49 @@
           }
         },
         {
-          "match": "\\.\\.\\.",
-          "name": "keyword.operator.spread.js"
+          "name": "keyword.operator.spread.js",
+          "match": "\\.\\.\\."
         },
         {
-          "match": ",",
-          "name": "meta.delimiter.object.comma.js"
+          "name": "meta.delimiter.object.comma.js",
+          "match": ","
         },
         {
-          "match": "\\(|\\)",
-          "name": "meta.brace.round.js"
+          "name": "meta.brace.round.js",
+          "match": "\\(|\\)"
         },
         {
-          "match": "{|}",
-          "name": "meta.brace.curly.js"
+          "name": "meta.brace.curly.js",
+          "match": "{|}"
         },
         {
-          "match": "\\[|\\]",
-          "name": "meta.brace.square.js"
+          "name": "meta.brace.square.js",
+          "match": "\\[|\\]"
         },
         {
           "include": "#comments"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "storage.type.const.js"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "keyword.operator.$1.js"
+        },
+        "2": {
+          "name": "punctuation.terminator.statement.js"
+        },
+        "3": {
+          "name": "keyword.operator.assignment.js"
+        }
+      }
     },
     {
-      "match": "(?<!\\.)\\b(yield)(?!\\s*:)\\b(?:\\s*(\\*))?",
+      "name": "meta.control.yield.js",
+      "match": "(?\u003c!\\.)\\b(yield)(?!\\s*:)\\b(?:\\s*(\\*))?",
       "captures": {
         "1": {
           "name": "keyword.control.js"
@@ -895,43 +876,42 @@
         "2": {
           "name": "storage.modifier.js"
         }
-      },
-      "name": "meta.control.yield.js"
+      }
     },
     {
-      "match": "(?:(?<=\\.{3})|(?<!\\.))\\b(await)(?!\\s*:)\\b",
-      "name": "keyword.control.js"
+      "name": "keyword.control.js",
+      "match": "(?:(?\u003c=\\.{3})|(?\u003c!\\.))\\b(await)(?!\\s*:)\\b"
     },
     {
-      "match": "(?<!\\.)\\b(break|catch|continue|do|else|finally|for|if|import|package|return|throw|try|while|with)(?!\\s*:)\\b",
-      "name": "keyword.control.js"
+      "name": "keyword.control.js",
+      "match": "(?\u003c!\\.)\\b(break|catch|continue|do|else|finally|for|if|import|package|return|throw|try|while|with)(?!\\s*:)\\b"
     },
     {
       "include": "#switch_statement"
     },
     {
-      "match": "(?<!\\.)\\b(delete|in|of|instanceof|new|typeof|void)(?!\\s*:)\\b",
-      "name": "keyword.operator.$1.js"
+      "name": "keyword.operator.$1.js",
+      "match": "(?\u003c!\\.)\\b(delete|in|of|instanceof|new|typeof|void)(?!\\s*:)\\b"
     },
     {
-      "match": "\\.\\.\\.",
-      "name": "keyword.operator.spread.js"
+      "name": "keyword.operator.spread.js",
+      "match": "\\.\\.\\."
     },
     {
-      "match": "(?<!\\.)\\b(true|false)(?!\\s*:)\\b",
-      "name": "constant.language.boolean.$1.js"
+      "name": "constant.language.boolean.$1.js",
+      "match": "(?\u003c!\\.)\\b(true|false)(?!\\s*:)\\b"
     },
     {
-      "match": "(?<!\\.)\\b(null)(?!\\s*:)\\b",
-      "name": "constant.language.null.js"
+      "name": "constant.language.null.js",
+      "match": "(?\u003c!\\.)\\b(null)(?!\\s*:)\\b"
     },
     {
-      "match": "(?<!\\.)\\b(debugger)(?!\\s*:)\\b",
-      "name": "keyword.other.debugger.js"
+      "name": "keyword.other.debugger.js",
+      "match": "(?\u003c!\\.)\\b(debugger)(?!\\s*:)\\b"
     },
     {
-      "match": "(?x) (?<!\\$) \\b\n(Array|ArrayBuffer|Atomics|Boolean|DataView|Date|Error|EvalError|Float32Array|Float64Array|Function|Generator\n|GeneratorFunction|Int16Array|Int32Array|Int8Array|InternalError|Intl|JSON|Map|Number|Object|Promise|Proxy\n|RangeError|ReferenceError|Reflect|RegExp|Set|SharedArrayBuffer|SIMD|String|Symbol|SyntaxError|TypeError\n|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|URIError|WeakMap|WeakSet)\n\\b",
-      "name": "support.class.js"
+      "name": "support.class.js",
+      "match": "(?x) (?\u003c!\\$) \\b\n(Array|ArrayBuffer|Atomics|Boolean|DataView|Date|Error|EvalError|Float32Array|Float64Array|Function|Generator\n|GeneratorFunction|Int16Array|Int32Array|Int8Array|InternalError|Intl|JSON|Map|Number|Object|Promise|Proxy\n|RangeError|ReferenceError|Reflect|RegExp|Set|SharedArrayBuffer|SIMD|String|Symbol|SyntaxError|TypeError\n|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|URIError|WeakMap|WeakSet)\n\\b"
     },
     {
       "match": "(?x) (\\.) \\s* (?:\n  (constructor|length|prototype) |\n  (EPSILON|MAX_SAFE_INTEGER|MAX_VALUE|MIN_SAFE_INTEGER|MIN_VALUE|NEGATIVE_INFINITY|POSITIVE_INFINITY)\n)\\b",
@@ -948,7 +928,7 @@
       }
     },
     {
-      "match": "(?x) (?<!\\$) \\b (?:\n  (document|event|navigator|performance|screen|window)\n  |\n  (AnalyserNode|ArrayBufferView|Attr|AudioBuffer|AudioBufferSourceNode|AudioContext|AudioDestinationNode|AudioListener\n  |AudioNode|AudioParam|BatteryManager|BeforeUnloadEvent|BiquadFilterNode|Blob|BufferSource|ByteString|CSS|CSSConditionRule\n  |CSSCounterStyleRule|CSSGroupingRule|CSSMatrix|CSSMediaRule|CSSPageRule|CSSPrimitiveValue|CSSRule|CSSRuleList|CSSStyleDeclaration\n  |CSSStyleRule|CSSStyleSheet|CSSSupportsRule|CSSValue|CSSValueList|CanvasGradient|CanvasImageSource|CanvasPattern\n  |CanvasRenderingContext2D|ChannelMergerNode|ChannelSplitterNode|CharacterData|ChromeWorker|CloseEvent|Comment|CompositionEvent\n  |Console|ConvolverNode|Coordinates|Credential|CredentialsContainer|Crypto|CryptoKey|CustomEvent|DOMError|DOMException\n  |DOMHighResTimeStamp|DOMImplementation|DOMString|DOMStringList|DOMStringMap|DOMTimeStamp|DOMTokenList|DataTransfer\n  |DataTransferItem|DataTransferItemList|DedicatedWorkerGlobalScope|DelayNode|DeviceProximityEvent|DirectoryEntry\n  |DirectoryEntrySync|DirectoryReader|DirectoryReaderSync|Document|DocumentFragment|DocumentTouch|DocumentType|DragEvent\n  |DynamicsCompressorNode|Element|Entry|EntrySync|ErrorEvent|Event|EventListener|EventSource|EventTarget|FederatedCredential\n  |FetchEvent|File|FileEntry|FileEntrySync|FileException|FileList|FileReader|FileReaderSync|FileSystem|FileSystemSync\n  |FontFace|FormData|GainNode|Gamepad|GamepadButton|GamepadEvent|Geolocation|GlobalEventHandlers|HTMLAnchorElement\n  |HTMLAreaElement|HTMLAudioElement|HTMLBRElement|HTMLBaseElement|HTMLBodyElement|HTMLButtonElement|HTMLCanvasElement\n  |HTMLCollection|HTMLContentElement|HTMLDListElement|HTMLDataElement|HTMLDataListElement|HTMLDialogElement|HTMLDivElement\n  |HTMLDocument|HTMLElement|HTMLEmbedElement|HTMLFieldSetElement|HTMLFontElement|HTMLFormControlsCollection|HTMLFormElement\n  |HTMLHRElement|HTMLHeadElement|HTMLHeadingElement|HTMLHtmlElement|HTMLIFrameElement|HTMLImageElement|HTMLInputElement\n  |HTMLKeygenElement|HTMLLIElement|HTMLLabelElement|HTMLLegendElement|HTMLLinkElement|HTMLMapElement|HTMLMediaElement\n  |HTMLMetaElement|HTMLMeterElement|HTMLModElement|HTMLOListElement|HTMLObjectElement|HTMLOptGroupElement|HTMLOptionElement\n  |HTMLOptionsCollection|HTMLOutputElement|HTMLParagraphElement|HTMLParamElement|HTMLPreElement|HTMLProgressElement\n  |HTMLQuoteElement|HTMLScriptElement|HTMLSelectElement|HTMLShadowElement|HTMLSourceElement|HTMLSpanElement|HTMLStyleElement\n  |HTMLTableCaptionElement|HTMLTableCellElement|HTMLTableColElement|HTMLTableDataCellElement|HTMLTableElement|HTMLTableHeaderCellElement\n  |HTMLTableRowElement|HTMLTableSectionElement|HTMLTextAreaElement|HTMLTimeElement|HTMLTitleElement|HTMLTrackElement\n  |HTMLUListElement|HTMLUnknownElement|HTMLVideoElement|HashChangeEvent|History|IDBCursor|IDBCursorWithValue|IDBDatabase\n  |IDBEnvironment|IDBFactory|IDBIndex|IDBKeyRange|IDBMutableFile|IDBObjectStore|IDBOpenDBRequest|IDBRequest|IDBTransaction\n  |IDBVersionChangeEvent|IIRFilterNode|IdentityManager|ImageBitmap|ImageBitmapFactories|ImageData|Index|InputDeviceCapabilities\n  |InputEvent|InstallEvent|InstallTrigger|KeyboardEvent|LinkStyle|LocalFileSystem|LocalFileSystemSync|Location|MIDIAccess\n  |MIDIConnectionEvent|MIDIInput|MIDIInputMap|MIDIOutputMap|MediaElementAudioSourceNode|MediaError|MediaKeyMessageEvent\n  |MediaKeySession|MediaKeyStatusMap|MediaKeySystemAccess|MediaKeySystemConfiguration|MediaKeys|MediaRecorder|MediaStream\n  |MediaStreamAudioDestinationNode|MediaStreamAudioSourceNode|MessageChannel|MessageEvent|MessagePort|MouseEvent\n  |MutationObserver|MutationRecord|NamedNodeMap|Navigator|NavigatorConcurrentHardware|NavigatorGeolocation|NavigatorID\n  |NavigatorLanguage|NavigatorOnLine|Node|NodeFilter|NodeIterator|NodeList|NonDocumentTypeChildNode|Notification\n  |OfflineAudioCompletionEvent|OfflineAudioContext|OscillatorNode|PageTransitionEvent|PannerNode|ParentNode|PasswordCredential\n  |Path2D|PaymentAddress|PaymentRequest|PaymentResponse|Performance|PerformanceEntry|PerformanceFrameTiming|PerformanceMark\n  |PerformanceMeasure|PerformanceNavigation|PerformanceNavigationTiming|PerformanceObserver|PerformanceObserverEntryList\n  |PerformanceResourceTiming|PerformanceTiming|PeriodicSyncEvent|PeriodicWave|Plugin|Point|PointerEvent|PopStateEvent\n  |PortCollection|Position|PositionError|PositionOptions|PresentationConnectionClosedEvent|PresentationConnectionList\n  |PresentationReceiver|ProcessingInstruction|ProgressEvent|PromiseRejectionEvent|PushEvent|PushRegistrationManager\n  |RTCCertificate|RTCConfiguration|RTCPeerConnection|RTCSessionDescriptionCallback|RTCStatsReport|RadioNodeList|RandomSource\n  |Range|ReadableByteStream|RenderingContext|SVGAElement|SVGAngle|SVGAnimateColorElement|SVGAnimateElement|SVGAnimateMotionElement\n  |SVGAnimateTransformElement|SVGAnimatedAngle|SVGAnimatedBoolean|SVGAnimatedEnumeration|SVGAnimatedInteger|SVGAnimatedLength\n  |SVGAnimatedLengthList|SVGAnimatedNumber|SVGAnimatedNumberList|SVGAnimatedPoints|SVGAnimatedPreserveAspectRatio\n  |SVGAnimatedRect|SVGAnimatedString|SVGAnimatedTransformList|SVGAnimationElement|SVGCircleElement|SVGClipPathElement\n  |SVGCursorElement|SVGDefsElement|SVGDescElement|SVGElement|SVGEllipseElement|SVGEvent|SVGFilterElement|SVGFontElement\n  |SVGFontFaceElement|SVGFontFaceFormatElement|SVGFontFaceNameElement|SVGFontFaceSrcElement|SVGFontFaceUriElement\n  |SVGForeignObjectElement|SVGGElement|SVGGlyphElement|SVGGradientElement|SVGHKernElement|SVGImageElement|SVGLength\n  |SVGLengthList|SVGLineElement|SVGLinearGradientElement|SVGMPathElement|SVGMaskElement|SVGMatrix|SVGMissingGlyphElement\n  |SVGNumber|SVGNumberList|SVGPathElement|SVGPatternElement|SVGPoint|SVGPolygonElement|SVGPolylineElement|SVGPreserveAspectRatio\n  |SVGRadialGradientElement|SVGRect|SVGRectElement|SVGSVGElement|SVGScriptElement|SVGSetElement|SVGStopElement|SVGStringList\n  |SVGStylable|SVGStyleElement|SVGSwitchElement|SVGSymbolElement|SVGTRefElement|SVGTSpanElement|SVGTests|SVGTextElement\n  |SVGTextPositioningElement|SVGTitleElement|SVGTransform|SVGTransformList|SVGTransformable|SVGUseElement|SVGVKernElement\n  |SVGViewElement|ServiceWorker|ServiceWorkerContainer|ServiceWorkerGlobalScope|ServiceWorkerRegistration|ServiceWorkerState\n  |ShadowRoot|SharedWorker|SharedWorkerGlobalScope|SourceBufferList|StereoPannerNode|Storage|StorageEvent|StyleSheet\n  |StyleSheetList|SubtleCrypto|SyncEvent|Text|TextMetrics|TimeEvent|TimeRanges|Touch|TouchEvent|TouchList|Transferable\n  |TreeWalker|UIEvent|USVString|VRDisplayCapabilities|ValidityState|WaveShaperNode|WebGL|WebGLActiveInfo|WebGLBuffer\n  |WebGLContextEvent|WebGLFramebuffer|WebGLProgram|WebGLRenderbuffer|WebGLRenderingContext|WebGLShader|WebGLShaderPrecisionFormat\n  |WebGLTexture|WebGLTimerQueryEXT|WebGLTransformFeedback|WebGLUniformLocation|WebGLVertexArrayObject|WebGLVertexArrayObjectOES\n  |WebSocket|WebSockets|WebVTT|WheelEvent|Window|WindowBase64|WindowEventHandlers|WindowTimers|Worker|WorkerGlobalScope\n  |WorkerLocation|WorkerNavigator|XMLHttpRequest|XMLHttpRequestEventTarget|XMLSerializer|XPathExpression|XPathResult\n  |XSLTProcessor)\n)\\b",
+      "match": "(?x) (?\u003c!\\$) \\b (?:\n  (document|event|navigator|performance|screen|window)\n  |\n  (AnalyserNode|ArrayBufferView|Attr|AudioBuffer|AudioBufferSourceNode|AudioContext|AudioDestinationNode|AudioListener\n  |AudioNode|AudioParam|BatteryManager|BeforeUnloadEvent|BiquadFilterNode|Blob|BufferSource|ByteString|CSS|CSSConditionRule\n  |CSSCounterStyleRule|CSSGroupingRule|CSSMatrix|CSSMediaRule|CSSPageRule|CSSPrimitiveValue|CSSRule|CSSRuleList|CSSStyleDeclaration\n  |CSSStyleRule|CSSStyleSheet|CSSSupportsRule|CSSValue|CSSValueList|CanvasGradient|CanvasImageSource|CanvasPattern\n  |CanvasRenderingContext2D|ChannelMergerNode|ChannelSplitterNode|CharacterData|ChromeWorker|CloseEvent|Comment|CompositionEvent\n  |Console|ConvolverNode|Coordinates|Credential|CredentialsContainer|Crypto|CryptoKey|CustomEvent|DOMError|DOMException\n  |DOMHighResTimeStamp|DOMImplementation|DOMString|DOMStringList|DOMStringMap|DOMTimeStamp|DOMTokenList|DataTransfer\n  |DataTransferItem|DataTransferItemList|DedicatedWorkerGlobalScope|DelayNode|DeviceProximityEvent|DirectoryEntry\n  |DirectoryEntrySync|DirectoryReader|DirectoryReaderSync|Document|DocumentFragment|DocumentTouch|DocumentType|DragEvent\n  |DynamicsCompressorNode|Element|Entry|EntrySync|ErrorEvent|Event|EventListener|EventSource|EventTarget|FederatedCredential\n  |FetchEvent|File|FileEntry|FileEntrySync|FileException|FileList|FileReader|FileReaderSync|FileSystem|FileSystemSync\n  |FontFace|FormData|GainNode|Gamepad|GamepadButton|GamepadEvent|Geolocation|GlobalEventHandlers|HTMLAnchorElement\n  |HTMLAreaElement|HTMLAudioElement|HTMLBRElement|HTMLBaseElement|HTMLBodyElement|HTMLButtonElement|HTMLCanvasElement\n  |HTMLCollection|HTMLContentElement|HTMLDListElement|HTMLDataElement|HTMLDataListElement|HTMLDialogElement|HTMLDivElement\n  |HTMLDocument|HTMLElement|HTMLEmbedElement|HTMLFieldSetElement|HTMLFontElement|HTMLFormControlsCollection|HTMLFormElement\n  |HTMLHRElement|HTMLHeadElement|HTMLHeadingElement|HTMLHtmlElement|HTMLIFrameElement|HTMLImageElement|HTMLInputElement\n  |HTMLKeygenElement|HTMLLIElement|HTMLLabelElement|HTMLLegendElement|HTMLLinkElement|HTMLMapElement|HTMLMediaElement\n  |HTMLMetaElement|HTMLMeterElement|HTMLModElement|HTMLOListElement|HTMLObjectElement|HTMLOptGroupElement|HTMLOptionElement\n  |HTMLOptionsCollection|HTMLOutputElement|HTMLParagraphElement|HTMLParamElement|HTMLPreElement|HTMLProgressElement\n  |HTMLQuoteElement|HTMLScriptElement|HTMLSelectElement|HTMLShadowElement|HTMLSourceElement|HTMLSpanElement|HTMLStyleElement\n  |HTMLTableCaptionElement|HTMLTableCellElement|HTMLTableColElement|HTMLTableDataCellElement|HTMLTableElement|HTMLTableHeaderCellElement\n  |HTMLTableRowElement|HTMLTableSectionElement|HTMLTextAreaElement|HTMLTimeElement|HTMLTitleElement|HTMLTrackElement\n  |HTMLUListElement|HTMLUnknownElement|HTMLVideoElement|HashChangeEvent|History|IDBCursor|IDBCursorWithValue|IDBDatabase\n  |IDBEnvironment|IDBFactory|IDBIndex|IDBKeyRange|IDBMutableFile|IDBObjectStore|IDBOpenDBRequest|IDBRequest|IDBTransaction\n  |IDBVersionChangeEvent|IIRFilterNode|IdentityManager|ImageBitmap|ImageBitmapFactories|ImageData|Index|InputDeviceCapabilities\n  |InputEvent|InstallEvent|InstallTrigger|KeyboardEvent|LinkStyle|LocalFileSystem|LocalFileSystemSync|Location|MIDIAccess\n  |MIDIConnectionEvent|MIDIInput|MIDIInputMap|MIDIOutputMap|MediaElementAudioSourceNode|MediaError|MediaKeyMessageEvent\n  |MediaKeySession|MediaKeyStatusMap|MediaKeySystemAccess|MediaKeySystemConfiguration|MediaKeys|MediaRecorder|MediaStream\n  |MediaStreamAudioDestinationNode|MediaStreamAudioSourceNode|MessageChannel|MessageEvent|MessagePort|MouseEvent\n  |MutationObserver|MutationRecord|NamedNodeMap|Navigator|NavigatorConcurrentHardware|NavigatorGeolocation|NavigatorID\n  |NavigatorLanguage|NavigatorOnLine|Node|NodeFilter|NodeIterator|NodeList|NonDocumentTypeChildNode|Notification\n  |OfflineAudioCompletionEvent|OfflineAudioContext|OscillatorNode|PageTransitionEvent|PannerNode|ParentNode|PasswordCredential\n  |Path2D|PaymentAddress|PaymentRequest|PaymentResponse|Performance|PerformanceEntry|PerformanceFrameTiming|PerformanceMark\n  |PerformanceMeasure|PerformanceNavigation|PerformanceNavigationTiming|PerformanceObserver|PerformanceObserverEntryList\n  |PerformanceResourceTiming|PerformanceTiming|PeriodicSyncEvent|PeriodicWave|Plugin|Point|PointerEvent|PopStateEvent\n  |PortCollection|Position|PositionError|PositionOptions|PresentationConnectionClosedEvent|PresentationConnectionList\n  |PresentationReceiver|ProcessingInstruction|ProgressEvent|PromiseRejectionEvent|PushEvent|PushRegistrationManager\n  |RTCCertificate|RTCConfiguration|RTCPeerConnection|RTCSessionDescriptionCallback|RTCStatsReport|RadioNodeList|RandomSource\n  |Range|ReadableByteStream|RenderingContext|SVGAElement|SVGAngle|SVGAnimateColorElement|SVGAnimateElement|SVGAnimateMotionElement\n  |SVGAnimateTransformElement|SVGAnimatedAngle|SVGAnimatedBoolean|SVGAnimatedEnumeration|SVGAnimatedInteger|SVGAnimatedLength\n  |SVGAnimatedLengthList|SVGAnimatedNumber|SVGAnimatedNumberList|SVGAnimatedPoints|SVGAnimatedPreserveAspectRatio\n  |SVGAnimatedRect|SVGAnimatedString|SVGAnimatedTransformList|SVGAnimationElement|SVGCircleElement|SVGClipPathElement\n  |SVGCursorElement|SVGDefsElement|SVGDescElement|SVGElement|SVGEllipseElement|SVGEvent|SVGFilterElement|SVGFontElement\n  |SVGFontFaceElement|SVGFontFaceFormatElement|SVGFontFaceNameElement|SVGFontFaceSrcElement|SVGFontFaceUriElement\n  |SVGForeignObjectElement|SVGGElement|SVGGlyphElement|SVGGradientElement|SVGHKernElement|SVGImageElement|SVGLength\n  |SVGLengthList|SVGLineElement|SVGLinearGradientElement|SVGMPathElement|SVGMaskElement|SVGMatrix|SVGMissingGlyphElement\n  |SVGNumber|SVGNumberList|SVGPathElement|SVGPatternElement|SVGPoint|SVGPolygonElement|SVGPolylineElement|SVGPreserveAspectRatio\n  |SVGRadialGradientElement|SVGRect|SVGRectElement|SVGSVGElement|SVGScriptElement|SVGSetElement|SVGStopElement|SVGStringList\n  |SVGStylable|SVGStyleElement|SVGSwitchElement|SVGSymbolElement|SVGTRefElement|SVGTSpanElement|SVGTests|SVGTextElement\n  |SVGTextPositioningElement|SVGTitleElement|SVGTransform|SVGTransformList|SVGTransformable|SVGUseElement|SVGVKernElement\n  |SVGViewElement|ServiceWorker|ServiceWorkerContainer|ServiceWorkerGlobalScope|ServiceWorkerRegistration|ServiceWorkerState\n  |ShadowRoot|SharedWorker|SharedWorkerGlobalScope|SourceBufferList|StereoPannerNode|Storage|StorageEvent|StyleSheet\n  |StyleSheetList|SubtleCrypto|SyncEvent|Text|TextMetrics|TimeEvent|TimeRanges|Touch|TouchEvent|TouchList|Transferable\n  |TreeWalker|UIEvent|USVString|VRDisplayCapabilities|ValidityState|WaveShaperNode|WebGL|WebGLActiveInfo|WebGLBuffer\n  |WebGLContextEvent|WebGLFramebuffer|WebGLProgram|WebGLRenderbuffer|WebGLRenderingContext|WebGLShader|WebGLShaderPrecisionFormat\n  |WebGLTexture|WebGLTimerQueryEXT|WebGLTransformFeedback|WebGLUniformLocation|WebGLVertexArrayObject|WebGLVertexArrayObjectOES\n  |WebSocket|WebSockets|WebVTT|WheelEvent|Window|WindowBase64|WindowEventHandlers|WindowTimers|Worker|WorkerGlobalScope\n  |WorkerLocation|WorkerNavigator|XMLHttpRequest|XMLHttpRequestEventTarget|XMLSerializer|XPathExpression|XPathResult\n  |XSLTProcessor)\n)\\b",
       "captures": {
         "1": {
           "name": "support.variable.dom.js"
@@ -973,54 +953,54 @@
       }
     },
     {
-      "match": "(?<!\\.)\\b(module|exports|__filename|__dirname|global|process)(?!\\s*:)\\b",
-      "name": "support.variable.js"
+      "name": "support.variable.js",
+      "match": "(?\u003c!\\.)\\b(module|exports|__filename|__dirname|global|process)(?!\\s*:)\\b"
     },
     {
-      "match": "\\b(Infinity|NaN|undefined)\\b",
-      "name": "constant.language.js"
+      "name": "constant.language.js",
+      "match": "\\b(Infinity|NaN|undefined)\\b"
     },
     {
-      "begin": "(?<=[\\[=(?:+,!]|^|return|=>|&&|\\|\\|)\\s*(/)(?![/*+?])(?=.*/)",
+      "name": "string.regexp.js",
+      "begin": "(?\u003c=[\\[=(?:+,!]|^|return|=\u003e|\u0026\u0026|\\|\\|)\\s*(/)(?![/*+?])(?=.*/)",
+      "end": "(/)[gimuy]*",
+      "patterns": [
+        {
+          "include": "source.js.regexp"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.string.begin.js"
         }
       },
-      "end": "(/)[gimuy]*",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.js"
         }
-      },
-      "name": "string.regexp.js",
-      "patterns": [
-        {
-          "include": "source.js.regexp"
-        }
-      ]
+      }
     },
     {
       "begin": "\\?",
+      "end": ":",
+      "patterns": [
+        {
+          "include": "#prevent_object_keys_matching"
+        },
+        {
+          "include": "$self"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "keyword.operator.ternary.js"
         }
       },
-      "end": ":",
       "endCaptures": {
         "0": {
           "name": "keyword.operator.ternary.js"
         }
-      },
-      "patterns": [
-        {
-          "include": "#prevent_object_keys_matching"
-        },
-        {
-          "include": "$self"
-        }
-      ]
+      }
     },
     {
       "include": "#operators"
@@ -1041,24 +1021,24 @@
       "include": "#properties"
     },
     {
-      "match": "((?<!\\.|[\\w$])(?![_\\$]+[^A-Z0-9_$])\\$*\\b(?:[A-Z_$][A-Z0-9_$]*)\\b\\$*)",
-      "name": "constant.other.js"
+      "name": "constant.other.js",
+      "match": "((?\u003c!\\.|[\\w$])(?![_\\$]+[^A-Z0-9_$])\\$*\\b(?:[A-Z_$][A-Z0-9_$]*)\\b\\$*)"
     },
     {
-      "match": "(?<!\\$)\\b[0-9]+[\\w$]*",
-      "name": "invalid.illegal.identifier.js"
+      "name": "invalid.illegal.identifier.js",
+      "match": "(?\u003c!\\$)\\b[0-9]+[\\w$]*"
     },
     {
-      "match": "\\;",
-      "name": "punctuation.terminator.statement.js"
+      "name": "punctuation.terminator.statement.js",
+      "match": "\\;"
     },
     {
-      "match": ",",
-      "name": "meta.delimiter.object.comma.js"
+      "name": "meta.delimiter.object.comma.js",
+      "match": ","
     },
     {
-      "match": "\\.",
-      "name": "meta.delimiter.method.period.js"
+      "name": "meta.delimiter.method.period.js",
+      "match": "\\."
     },
     {
       "match": "({)(})",
@@ -1073,410 +1053,167 @@
     },
     {
       "begin": "{",
+      "end": "}",
+      "patterns": [
+        {
+          "include": "$self"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "meta.brace.curly.js"
         }
       },
-      "end": "}",
       "endCaptures": {
         "0": {
           "name": "meta.brace.curly.js"
         }
-      },
+      }
+    },
+    {
+      "begin": "\\(",
+      "end": "\\)",
       "patterns": [
         {
           "include": "$self"
         }
-      ]
-    },
-    {
-      "begin": "\\(",
+      ],
       "beginCaptures": {
         "0": {
           "name": "meta.brace.round.js"
         }
       },
-      "end": "\\)",
       "endCaptures": {
         "0": {
           "name": "meta.brace.round.js"
         }
-      },
-      "patterns": [
-        {
-          "include": "$self"
-        }
-      ]
+      }
     },
     {
-      "match": "\\[|\\]",
-      "name": "meta.brace.square.js"
+      "name": "meta.brace.square.js",
+      "match": "\\[|\\]"
     },
     {
-      "match": "\\A#!.*$",
-      "name": "comment.line.shebang.js"
+      "name": "comment.line.shebang.js",
+      "match": "\\A#!.*$"
     }
   ],
   "repository": {
-    "numbers": {
+    "arguments": {
       "patterns": [
         {
-          "match": "\\b(?<!\\$)0(x|X)[0-9a-fA-F]+\\b(?!\\$)",
-          "name": "constant.numeric.hex.js"
-        },
-        {
-          "match": "\\b(?<!\\$)0(b|B)[01]+\\b(?!\\$)",
-          "name": "constant.numeric.binary.js"
-        },
-        {
-          "match": "\\b(?<!\\$)0(o|O)?[0-7]+\\b(?!\\$)",
-          "name": "constant.numeric.octal.js"
-        },
-        {
-          "match": "(?x)\n(?<!\\$)(?:\n  (?:\\b[0-9]+(\\.)[0-9]+[eE][+-]?[0-9]+\\b)| # 1.1E+3\n  (?:\\b[0-9]+(\\.)[eE][+-]?[0-9]+\\b)|       # 1.E+3\n  (?:\\B(\\.)[0-9]+[eE][+-]?[0-9]+\\b)|       # .1E+3\n  (?:\\b[0-9]+[eE][+-]?[0-9]+\\b)|            # 1E+3\n  (?:\\b[0-9]+(\\.)[0-9]+\\b)|                # 1.1\n  (?:\\b[0-9]+(\\.)\\B)|                      # 1.\n  (?:\\B(\\.)[0-9]+\\b)|                      # .1\n  (?:\\b[0-9]+\\b(?!\\.))                     # 1\n)(?!\\$)",
-          "captures": {
+          "name": "meta.arguments.js",
+          "begin": "\\(",
+          "end": "\\)",
+          "patterns": [
+            {
+              "include": "$self"
+            }
+          ],
+          "beginCaptures": {
             "0": {
-              "name": "constant.numeric.decimal.js"
-            },
-            "1": {
-              "name": "meta.delimiter.decimal.period.js"
-            },
-            "2": {
-              "name": "meta.delimiter.decimal.period.js"
-            },
-            "3": {
-              "name": "meta.delimiter.decimal.period.js"
-            },
-            "4": {
-              "name": "meta.delimiter.decimal.period.js"
-            },
-            "5": {
-              "name": "meta.delimiter.decimal.period.js"
-            },
-            "6": {
-              "name": "meta.delimiter.decimal.period.js"
+              "name": "punctuation.definition.arguments.begin.bracket.round.js"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.arguments.end.bracket.round.js"
             }
           }
         }
       ]
     },
-    "operators": {
+    "arrow_function_innards": {
       "patterns": [
         {
-          "match": "%=|\\+=|-=|\\*=|(?<!\\()/=",
-          "name": "keyword.operator.assignment.compound.js"
-        },
-        {
-          "match": "&=|\\^=|<<=|>>=|>>>=|\\|=",
-          "name": "keyword.operator.assignment.compound.bitwise.js"
-        },
-        {
-          "match": "<<|>>>|>>",
-          "name": "keyword.operator.bitwise.shift.js"
-        },
-        {
-          "match": "!==|!=|<=|>=|===|==|<|>",
-          "name": "keyword.operator.comparison.js"
-        },
-        {
-          "match": "&&|!!|!|\\|\\|",
-          "name": "keyword.operator.logical.js"
-        },
-        {
-          "match": "&|\\||\\^|~",
-          "name": "keyword.operator.bitwise.js"
+          "name": "storage.type.function.arrow.js",
+          "match": "=\u003e"
         },
         {
-          "match": "=|:",
-          "name": "keyword.operator.assignment.js"
-        },
-        {
-          "match": "--",
-          "name": "keyword.operator.decrement.js"
-        },
-        {
-          "match": "\\+\\+",
-          "name": "keyword.operator.increment.js"
+          "include": "#function_params"
         },
         {
-          "match": "%|\\*|/|-|\\+",
-          "name": "keyword.operator.js"
-        }
-      ]
-    },
-    "strings": {
-      "patterns": [
-        {
-          "begin": "'",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.begin.js"
-            }
-          },
-          "end": "'",
-          "endCaptures": {
+          "match": "([a-zA-Z_$][\\w$]*)(?=\\s*=\u003e)",
+          "captures": {
             "0": {
-              "name": "punctuation.definition.string.end.js"
-            }
-          },
-          "name": "string.quoted.single.js",
-          "patterns": [
-            {
-              "include": "#string_escapes"
+              "name": "meta.parameters.js"
             },
-            {
-              "match": "[^']*[^\\n\\r'\\\\]$",
-              "name": "invalid.illegal.string.js"
+            "1": {
+              "name": "variable.parameter.function.js"
             }
-          ]
+          }
         },
         {
-          "begin": "\"",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.begin.js"
-            }
-          },
-          "end": "\"",
-          "endCaptures": {
+          "match": "(\\d[\\w$]*)",
+          "captures": {
             "0": {
-              "name": "punctuation.definition.string.end.js"
-            }
-          },
-          "name": "string.quoted.double.js",
-          "patterns": [
-            {
-              "include": "#string_escapes"
+              "name": "meta.parameters.js"
             },
-            {
-              "match": "[^\"]*[^\\n\\r\"\\\\]$",
-              "name": "invalid.illegal.string.js"
+            "1": {
+              "name": "invalid.illegal.identifier.js"
             }
-          ]
-        },
+          }
+        }
+      ]
+    },
+    "comments": {
+      "patterns": [
         {
-          "begin": "((\\w+)?(html|HTML|Html))\\s*(`)",
-          "beginCaptures": {
+          "name": "comment.block.empty.js",
+          "match": "(/\\*)(\\*/)",
+          "captures": {
             "1": {
-              "name": "entity.name.function.js"
-            },
-            "4": {
-              "name": "punctuation.definition.string.begin.js"
-            }
-          },
-          "end": "`",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.end.js"
-            }
-          },
-          "name": "string.quoted.template.html.js",
-          "patterns": [
-            {
-              "include": "#string_escapes"
-            },
-            {
-              "include": "#interpolated_js"
+              "name": "punctuation.definition.comment.begin.js"
             },
-            {
-              "include": "text.html.basic"
+            "2": {
+              "name": "punctuation.definition.comment.end.js"
             }
-          ]
+          }
         },
         {
-          "begin": "(?<=innerHTML)\\s*(\\+?=)\\s*(?=`)",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.operator.assignment.js"
-            }
-          },
-          "end": "(?<=`)",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.end.js"
-            }
-          },
-          "contentName": "string.quoted.template.html.js",
+          "name": "comment.block.documentation.js",
+          "begin": "/\\*\\*",
+          "end": "\\*/",
           "patterns": [
             {
-              "begin": "`",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.definition.string.begin.js"
-                }
-              },
-              "end": "`",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.definition.string.end.js"
-                }
-              },
-              "patterns": [
-                {
-                  "include": "#string_escapes"
-                },
-                {
-                  "include": "#interpolated_js"
-                },
-                {
-                  "include": "text.html.basic"
-                }
-              ]
+              "include": "source.jsdoc"
             }
-          ]
-        },
-        {
-          "begin": "(Relay\\.QL)\\s*(`)",
+          ],
           "beginCaptures": {
-            "1": {
-              "name": "entity.name.function.js"
-            },
-            "2": {
-              "name": "punctuation.definition.string.begin.js"
-            }
-          },
-          "end": "`",
-          "endCaptures": {
             "0": {
-              "name": "punctuation.definition.string.end.js"
-            }
-          },
-          "name": "string.quoted.template.graphql.js",
-          "patterns": [
-            {
-              "include": "#string_escapes"
-            },
-            {
-              "include": "#interpolated_js"
-            },
-            {
-              "include": "source.graphql"
-            }
-          ]
-        },
-        {
-          "begin": "(sql|SQL|Sql)\\s*(`)",
-          "beginCaptures": {
-            "1": {
-              "name": "entity.name.function.js"
-            },
-            "2": {
-              "name": "punctuation.definition.string.begin.js"
+              "name": "punctuation.definition.comment.begin.js"
             }
           },
-          "end": "`",
           "endCaptures": {
             "0": {
-              "name": "punctuation.definition.string.end.js"
-            }
-          },
-          "name": "string.quoted.template.sql.js",
-          "patterns": [
-            {
-              "include": "#string_escapes"
-            },
-            {
-              "include": "#interpolated_js"
-            },
-            {
-              "include": "source.sql"
+              "name": "punctuation.definition.comment.end.js"
             }
-          ]
+          }
         },
         {
-          "begin": "`",
+          "name": "comment.block.js",
+          "begin": "/\\*",
+          "end": "\\*/",
           "beginCaptures": {
             "0": {
-              "name": "punctuation.definition.string.begin.js"
+              "name": "punctuation.definition.comment.begin.js"
             }
           },
-          "end": "`",
           "endCaptures": {
             "0": {
-              "name": "punctuation.definition.string.end.js"
-            }
-          },
-          "name": "string.quoted.template.js",
-          "patterns": [
-            {
-              "include": "#string_escapes"
-            },
-            {
-              "include": "#interpolated_js"
-            }
-          ]
-        }
-      ]
-    },
-    "string_escapes": {
-      "patterns": [
-        {
-          "match": "\\\\u(?![A-Fa-f0-9]{4}|{[A-Fa-f0-9]+})[^'\"]*",
-          "name": "invalid.illegal.unicode-escape.js"
-        },
-        {
-          "match": "\\\\u(?:[A-Fa-f0-9]{4}|({)([A-Fa-f0-9]+)(}))",
-          "name": "constant.character.escape.js",
-          "captures": {
-            "1": {
-              "name": "punctuation.definition.unicode-escape.begin.bracket.curly.js"
-            },
-            "2": {
-              "patterns": [
-                {
-                  "match": "[A-Fa-f\\d]{7,}|(?!10)[A-Fa-f\\d]{6}",
-                  "name": "invalid.illegal.unicode-escape.js"
-                }
-              ]
-            },
-            "3": {
-              "name": "punctuation.definition.unicode-escape.end.bracket.curly.js"
+              "name": "punctuation.definition.comment.end.js"
             }
           }
         },
         {
-          "match": "\\\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)",
-          "name": "constant.character.escape.js"
-        }
-      ]
-    },
-    "function_params": {
-      "patterns": [
-        {
-          "begin": "\\(",
+          "name": "comment.line.double-slash.js",
+          "begin": "//",
+          "end": "$",
           "beginCaptures": {
             "0": {
-              "name": "punctuation.definition.parameters.begin.bracket.round.js"
-            }
-          },
-          "end": "\\)",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.parameters.end.bracket.round.js"
-            }
-          },
-          "name": "meta.parameters.js",
-          "patterns": [
-            {
-              "match": "(\\.\\.\\.)([a-zA-Z_$][\\w$]*)",
-              "captures": {
-                "1": {
-                  "name": "keyword.operator.spread.js"
-                },
-                "2": {
-                  "name": "variable.parameter.rest.function.js"
-                }
-              }
-            },
-            {
-              "include": "$self"
-            },
-            {
-              "match": "[a-zA-Z_$][\\w$]*",
-              "name": "variable.parameter.function.js"
+              "name": "punctuation.definition.comment.js"
             }
-          ]
+          }
         }
       ]
     },
@@ -1484,22 +1221,54 @@
       "patterns": [
         {
           "begin": "{",
+          "end": "}",
+          "patterns": [
+            {
+              "include": "$self"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.function.body.begin.bracket.curly.js"
             }
           },
-          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.function.body.end.bracket.curly.js"
             }
-          },
+          }
+        }
+      ]
+    },
+    "function_calls": {
+      "patterns": [
+        {
+          "name": "meta.function-call.js",
+          "begin": "([\\w$]+)\\s*(?=\\()",
+          "end": "(?\u003c=\\))",
           "patterns": [
             {
-              "include": "$self"
+              "include": "#arguments"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "patterns": [
+                {
+                  "name": "support.function.js",
+                  "match": "(?x)\n\\b(isNaN|isFinite|eval|uneval|parseInt|parseFloat|decodeURI|\ndecodeURIComponent|encodeURI|encodeURIComponent|escape|unescape|\nrequire|set(Interval|Timeout)|clear(Interval|Timeout))\\b"
+                },
+                {
+                  "name": "entity.name.function.js",
+                  "match": "[a-zA-Z_$][\\w$]*"
+                },
+                {
+                  "name": "invalid.illegal.identifier.js",
+                  "match": "\\d[\\w$]*"
+                }
+              ]
+            }
+          }
         }
       ]
     },
@@ -1520,78 +1289,105 @@
           }
         },
         {
-          "match": "[a-zA-Z_$][\\w$]*(?=\\s*\\()",
-          "name": "entity.name.function.js"
-        },
-        {
-          "include": "#function_params"
+          "name": "entity.name.function.js",
+          "match": "[a-zA-Z_$][\\w$]*(?=\\s*\\()"
         },
         {
-          "include": "#comments"
-        }
-      ]
-    },
-    "arrow_function_innards": {
-      "patterns": [
-        {
-          "match": "=>",
-          "name": "storage.type.function.arrow.js"
-        },
-        {
-          "include": "#function_params"
-        },
-        {
-          "match": "([a-zA-Z_$][\\w$]*)(?=\\s*=>)",
-          "captures": {
-            "0": {
-              "name": "meta.parameters.js"
-            },
-            "1": {
-              "name": "variable.parameter.function.js"
-            }
-          }
-        },
-        {
-          "match": "(\\d[\\w$]*)",
-          "captures": {
-            "0": {
-              "name": "meta.parameters.js"
-            },
-            "1": {
-              "name": "invalid.illegal.identifier.js"
-            }
-          }
+          "include": "#function_params"
+        },
+        {
+          "include": "#comments"
         }
       ]
     },
-    "arguments": {
+    "function_params": {
       "patterns": [
         {
+          "name": "meta.parameters.js",
           "begin": "\\(",
+          "end": "\\)",
+          "patterns": [
+            {
+              "match": "(\\.\\.\\.)([a-zA-Z_$][\\w$]*)",
+              "captures": {
+                "1": {
+                  "name": "keyword.operator.spread.js"
+                },
+                "2": {
+                  "name": "variable.parameter.rest.function.js"
+                }
+              }
+            },
+            {
+              "include": "$self"
+            },
+            {
+              "name": "variable.parameter.function.js",
+              "match": "[a-zA-Z_$][\\w$]*"
+            }
+          ],
           "beginCaptures": {
             "0": {
-              "name": "punctuation.definition.arguments.begin.bracket.round.js"
+              "name": "punctuation.definition.parameters.begin.bracket.round.js"
             }
           },
-          "end": "\\)",
           "endCaptures": {
             "0": {
-              "name": "punctuation.definition.arguments.end.bracket.round.js"
+              "name": "punctuation.definition.parameters.end.bracket.round.js"
             }
-          },
-          "name": "meta.arguments.js",
+          }
+        }
+      ]
+    },
+    "interpolated_js": {
+      "patterns": [
+        {
+          "name": "source.js.embedded.source",
+          "begin": "\\${",
+          "end": "}",
           "patterns": [
+            {
+              "begin": "{",
+              "end": "}",
+              "patterns": [
+                {
+                  "include": "$self"
+                }
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "meta.brace.curly.js"
+                }
+              },
+              "endCaptures": {
+                "0": {
+                  "name": "meta.brace.curly.js"
+                }
+              }
+            },
             {
               "include": "$self"
             }
-          ]
+          ],
+          "captures": {
+            "0": {
+              "name": "punctuation.section.embedded.js"
+            }
+          }
         }
       ]
     },
     "method_calls": {
       "patterns": [
         {
+          "name": "meta.method-call.js",
           "begin": "(\\.)\\s*([\\w$]+)\\s*(?=\\()",
+          "end": "(?\u003c=\\))",
+          "patterns": [
+            {
+              "include": "#arguments"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "meta.delimiter.method.period.js"
@@ -1599,79 +1395,142 @@
             "2": {
               "patterns": [
                 {
-                  "match": "(?x)\n\\bon(Rowsinserted|Rowsdelete|Rowenter|Rowexit|Resize|Resizestart|Resizeend|Reset|\nReadystatechange|Mouseout|Mouseover|Mousedown|Mouseup|Mousemove|\nBefore(cut|deactivate|unload|update|paste|print|editfocus|activate)|\nBlur|Scrolltop|Submit|Select|Selectstart|Selectionchange|Hover|Help|\nChange|Contextmenu|Controlselect|Cut|Cellchange|Clock|Close|Deactivate|\nDatasetchanged|Datasetcomplete|Dataavailable|Drop|Drag|Dragstart|Dragover|\nDragdrop|Dragenter|Dragend|Dragleave|Dblclick|Unload|Paste|Propertychange|Error|\nErrorupdate|Keydown|Keyup|Keypress|Focus|Load|Activate|Afterupdate|Afterprint|Abort)\\b",
-                  "name": "support.function.event-handler.js"
+                  "name": "support.function.event-handler.js",
+                  "match": "(?x)\n\\bon(Rowsinserted|Rowsdelete|Rowenter|Rowexit|Resize|Resizestart|Resizeend|Reset|\nReadystatechange|Mouseout|Mouseover|Mousedown|Mouseup|Mousemove|\nBefore(cut|deactivate|unload|update|paste|print|editfocus|activate)|\nBlur|Scrolltop|Submit|Select|Selectstart|Selectionchange|Hover|Help|\nChange|Contextmenu|Controlselect|Cut|Cellchange|Clock|Close|Deactivate|\nDatasetchanged|Datasetcomplete|Dataavailable|Drop|Drag|Dragstart|Dragover|\nDragdrop|Dragenter|Dragend|Dragleave|Dblclick|Unload|Paste|Propertychange|Error|\nErrorupdate|Keydown|Keyup|Keypress|Focus|Load|Activate|Afterupdate|Afterprint|Abort)\\b"
                 },
                 {
-                  "match": "(?x)\n\\b(shift|showModelessDialog|showModalDialog|showHelp|scroll|scrollX|scrollByPages|\nscrollByLines|scrollY|scrollTo|stop|strike|sizeToContent|sidebar|signText|sort|\nsup|sub|substr|substring|splice|split|send|set(Milliseconds|Seconds|Minutes|Hours|\nMonth|Year|FullYear|Date|UTC(Milliseconds|Seconds|Minutes|Hours|Month|FullYear|Date)|\nTime|Hotkeys|Cursor|ZOptions|Active|Resizable|RequestHeader)|search|slice|\nsavePreferences|small|home|handleEvent|navigate|char|charCodeAt|charAt|concat|\ncontextual|confirm|compile|clear|captureEvents|call|createStyleSheet|createPopup|\ncreateEventObject|to(GMTString|UTCString|String|Source|UpperCase|LowerCase|LocaleString)|\ntest|taint|taintEnabled|indexOf|italics|disableExternalCapture|dump|detachEvent|unshift|\nuntaint|unwatch|updateCommands|join|javaEnabled|pop|push|plugins.refresh|paddings|parse|stringify|\nprint|prompt|preference|enableExternalCapture|exec|execScript|valueOf|UTC|find|file|\nfileModifiedDate|fileSize|fileCreatedDate|fileUpdatedDate|fixed|fontsize|fontcolor|\nforward|fromCharCode|watch|link|load|lastIndexOf|anchor|attachEvent|atob|apply|alert|\nabort|routeEvents|resize|resizeBy|resizeTo|recalc|returnValue|replace|reverse|reload|\nreleaseCapture|releaseEvents|go|get(Milliseconds|Seconds|Minutes|Hours|Month|Day|Year|FullYear|\nTime|Date|TimezoneOffset|UTC(Milliseconds|Seconds|Minutes|Hours|Day|Month|FullYear|Date)|\nAttention|Selection|ResponseHeader|AllResponseHeaders)|moveBy|moveBelow|moveTo|\nmoveToAbsolute|moveAbove|mergeAttributes|match|margins|btoa|big|bold|borderWidths|blink|back)\\b",
-                  "name": "support.function.js"
+                  "name": "support.function.js",
+                  "match": "(?x)\n\\b(shift|showModelessDialog|showModalDialog|showHelp|scroll|scrollX|scrollByPages|\nscrollByLines|scrollY|scrollTo|stop|strike|sizeToContent|sidebar|signText|sort|\nsup|sub|substr|substring|splice|split|send|set(Milliseconds|Seconds|Minutes|Hours|\nMonth|Year|FullYear|Date|UTC(Milliseconds|Seconds|Minutes|Hours|Month|FullYear|Date)|\nTime|Hotkeys|Cursor|ZOptions|Active|Resizable|RequestHeader)|search|slice|\nsavePreferences|small|home|handleEvent|navigate|char|charCodeAt|charAt|concat|\ncontextual|confirm|compile|clear|captureEvents|call|createStyleSheet|createPopup|\ncreateEventObject|to(GMTString|UTCString|String|Source|UpperCase|LowerCase|LocaleString)|\ntest|taint|taintEnabled|indexOf|italics|disableExternalCapture|dump|detachEvent|unshift|\nuntaint|unwatch|updateCommands|join|javaEnabled|pop|push|plugins.refresh|paddings|parse|stringify|\nprint|prompt|preference|enableExternalCapture|exec|execScript|valueOf|UTC|find|file|\nfileModifiedDate|fileSize|fileCreatedDate|fileUpdatedDate|fixed|fontsize|fontcolor|\nforward|fromCharCode|watch|link|load|lastIndexOf|anchor|attachEvent|atob|apply|alert|\nabort|routeEvents|resize|resizeBy|resizeTo|recalc|returnValue|replace|reverse|reload|\nreleaseCapture|releaseEvents|go|get(Milliseconds|Seconds|Minutes|Hours|Month|Day|Year|FullYear|\nTime|Date|TimezoneOffset|UTC(Milliseconds|Seconds|Minutes|Hours|Day|Month|FullYear|Date)|\nAttention|Selection|ResponseHeader|AllResponseHeaders)|moveBy|moveBelow|moveTo|\nmoveToAbsolute|moveAbove|mergeAttributes|match|margins|btoa|big|bold|borderWidths|blink|back)\\b"
                 },
                 {
-                  "match": "(?x)\n\\b(acceptNode|add|addEventListener|addTextTrack|adoptNode|after|animate|append|\nappendChild|appendData|before|blur|canPlayType|captureStream|\ncaretPositionFromPoint|caretRangeFromPoint|checkValidity|clear|click|\ncloneContents|cloneNode|cloneRange|close|closest|collapse|\ncompareBoundaryPoints|compareDocumentPosition|comparePoint|contains|\nconvertPointFromNode|convertQuadFromNode|convertRectFromNode|createAttribute|\ncreateAttributeNS|createCaption|createCDATASection|createComment|\ncreateContextualFragment|createDocument|createDocumentFragment|\ncreateDocumentType|createElement|createElementNS|createEntityReference|\ncreateEvent|createExpression|createHTMLDocument|createNodeIterator|\ncreateNSResolver|createProcessingInstruction|createRange|createShadowRoot|\ncreateTBody|createTextNode|createTFoot|createTHead|createTreeWalker|delete|\ndeleteCaption|deleteCell|deleteContents|deleteData|deleteRow|deleteTFoot|\ndeleteTHead|detach|disconnect|dispatchEvent|elementFromPoint|elementsFromPoint|\nenableStyleSheetsForSet|entries|evaluate|execCommand|exitFullscreen|\nexitPointerLock|expand|extractContents|fastSeek|firstChild|focus|forEach|get|\ngetAll|getAnimations|getAttribute|getAttributeNames|getAttributeNode|\ngetAttributeNodeNS|getAttributeNS|getBoundingClientRect|getBoxQuads|\ngetClientRects|getContext|getDestinationInsertionPoints|getElementById|\ngetElementsByClassName|getElementsByName|getElementsByTagName|\ngetElementsByTagNameNS|getItem|getNamedItem|getSelection|getStartDate|\ngetVideoPlaybackQuality|has|hasAttribute|hasAttributeNS|hasAttributes|\nhasChildNodes|hasFeature|hasFocus|importNode|initEvent|insertAdjacentElement|\ninsertAdjacentHTML|insertAdjacentText|insertBefore|insertCell|insertData|\ninsertNode|insertRow|intersectsNode|isDefaultNamespace|isEqualNode|\nisPointInRange|isSameNode|item|key|keys|lastChild|load|lookupNamespaceURI|\nlookupPrefix|matches|move|moveAttribute|moveAttributeNode|moveChild|\nmoveNamedItem|namedItem|nextNode|nextSibling|normalize|observe|open|\nparentNode|pause|play|postMessage|prepend|preventDefault|previousNode|\npreviousSibling|probablySupportsContext|queryCommandEnabled|\nqueryCommandIndeterm|queryCommandState|queryCommandSupported|queryCommandValue|\nquerySelector|querySelectorAll|registerContentHandler|registerElement|\nregisterProtocolHandler|releaseCapture|releaseEvents|remove|removeAttribute|\nremoveAttributeNode|removeAttributeNS|removeChild|removeEventListener|\nremoveItem|replace|replaceChild|replaceData|replaceWith|reportValidity|\nrequestFullscreen|requestPointerLock|reset|scroll|scrollBy|scrollIntoView|\nscrollTo|seekToNextFrame|select|selectNode|selectNodeContents|set|setAttribute|\nsetAttributeNode|setAttributeNodeNS|setAttributeNS|setCapture|\nsetCustomValidity|setEnd|setEndAfter|setEndBefore|setItem|setNamedItem|\nsetRangeText|setSelectionRange|setSinkId|setStart|setStartAfter|setStartBefore|\nslice|splitText|stepDown|stepUp|stopImmediatePropagation|stopPropagation|\nsubmit|substringData|supports|surroundContents|takeRecords|terminate|toBlob|\ntoDataURL|toggle|toString|values|write|writeln)\\b",
-                  "name": "support.function.dom.js"
+                  "name": "support.function.dom.js",
+                  "match": "(?x)\n\\b(acceptNode|add|addEventListener|addTextTrack|adoptNode|after|animate|append|\nappendChild|appendData|before|blur|canPlayType|captureStream|\ncaretPositionFromPoint|caretRangeFromPoint|checkValidity|clear|click|\ncloneContents|cloneNode|cloneRange|close|closest|collapse|\ncompareBoundaryPoints|compareDocumentPosition|comparePoint|contains|\nconvertPointFromNode|convertQuadFromNode|convertRectFromNode|createAttribute|\ncreateAttributeNS|createCaption|createCDATASection|createComment|\ncreateContextualFragment|createDocument|createDocumentFragment|\ncreateDocumentType|createElement|createElementNS|createEntityReference|\ncreateEvent|createExpression|createHTMLDocument|createNodeIterator|\ncreateNSResolver|createProcessingInstruction|createRange|createShadowRoot|\ncreateTBody|createTextNode|createTFoot|createTHead|createTreeWalker|delete|\ndeleteCaption|deleteCell|deleteContents|deleteData|deleteRow|deleteTFoot|\ndeleteTHead|detach|disconnect|dispatchEvent|elementFromPoint|elementsFromPoint|\nenableStyleSheetsForSet|entries|evaluate|execCommand|exitFullscreen|\nexitPointerLock|expand|extractContents|fastSeek|firstChild|focus|forEach|get|\ngetAll|getAnimations|getAttribute|getAttributeNames|getAttributeNode|\ngetAttributeNodeNS|getAttributeNS|getBoundingClientRect|getBoxQuads|\ngetClientRects|getContext|getDestinationInsertionPoints|getElementById|\ngetElementsByClassName|getElementsByName|getElementsByTagName|\ngetElementsByTagNameNS|getItem|getNamedItem|getSelection|getStartDate|\ngetVideoPlaybackQuality|has|hasAttribute|hasAttributeNS|hasAttributes|\nhasChildNodes|hasFeature|hasFocus|importNode|initEvent|insertAdjacentElement|\ninsertAdjacentHTML|insertAdjacentText|insertBefore|insertCell|insertData|\ninsertNode|insertRow|intersectsNode|isDefaultNamespace|isEqualNode|\nisPointInRange|isSameNode|item|key|keys|lastChild|load|lookupNamespaceURI|\nlookupPrefix|matches|move|moveAttribute|moveAttributeNode|moveChild|\nmoveNamedItem|namedItem|nextNode|nextSibling|normalize|observe|open|\nparentNode|pause|play|postMessage|prepend|preventDefault|previousNode|\npreviousSibling|probablySupportsContext|queryCommandEnabled|\nqueryCommandIndeterm|queryCommandState|queryCommandSupported|queryCommandValue|\nquerySelector|querySelectorAll|registerContentHandler|registerElement|\nregisterProtocolHandler|releaseCapture|releaseEvents|remove|removeAttribute|\nremoveAttributeNode|removeAttributeNS|removeChild|removeEventListener|\nremoveItem|replace|replaceChild|replaceData|replaceWith|reportValidity|\nrequestFullscreen|requestPointerLock|reset|scroll|scrollBy|scrollIntoView|\nscrollTo|seekToNextFrame|select|selectNode|selectNodeContents|set|setAttribute|\nsetAttributeNode|setAttributeNodeNS|setAttributeNS|setCapture|\nsetCustomValidity|setEnd|setEndAfter|setEndBefore|setItem|setNamedItem|\nsetRangeText|setSelectionRange|setSinkId|setStart|setStartAfter|setStartBefore|\nslice|splitText|stepDown|stepUp|stopImmediatePropagation|stopPropagation|\nsubmit|substringData|supports|surroundContents|takeRecords|terminate|toBlob|\ntoDataURL|toggle|toString|values|write|writeln)\\b"
                 },
                 {
-                  "match": "[a-zA-Z_$][\\w$]*",
-                  "name": "entity.name.function.js"
+                  "name": "entity.name.function.js",
+                  "match": "[a-zA-Z_$][\\w$]*"
                 },
                 {
-                  "match": "\\d[\\w$]*",
-                  "name": "invalid.illegal.identifier.js"
+                  "name": "invalid.illegal.identifier.js",
+                  "match": "\\d[\\w$]*"
                 }
               ]
             }
-          },
-          "end": "(?<=\\))",
-          "name": "meta.method-call.js",
-          "patterns": [
-            {
-              "include": "#arguments"
-            }
-          ]
+          }
         }
       ]
     },
-    "function_calls": {
+    "numbers": {
       "patterns": [
         {
-          "begin": "([\\w$]+)\\s*(?=\\()",
-          "beginCaptures": {
+          "name": "constant.numeric.hex.js",
+          "match": "\\b(?\u003c!\\$)0(x|X)[0-9a-fA-F]+\\b(?!\\$)"
+        },
+        {
+          "name": "constant.numeric.binary.js",
+          "match": "\\b(?\u003c!\\$)0(b|B)[01]+\\b(?!\\$)"
+        },
+        {
+          "name": "constant.numeric.octal.js",
+          "match": "\\b(?\u003c!\\$)0(o|O)?[0-7]+\\b(?!\\$)"
+        },
+        {
+          "match": "(?x)\n(?\u003c!\\$)(?:\n  (?:\\b[0-9]+(\\.)[0-9]+[eE][+-]?[0-9]+\\b)| # 1.1E+3\n  (?:\\b[0-9]+(\\.)[eE][+-]?[0-9]+\\b)|       # 1.E+3\n  (?:\\B(\\.)[0-9]+[eE][+-]?[0-9]+\\b)|       # .1E+3\n  (?:\\b[0-9]+[eE][+-]?[0-9]+\\b)|            # 1E+3\n  (?:\\b[0-9]+(\\.)[0-9]+\\b)|                # 1.1\n  (?:\\b[0-9]+(\\.)\\B)|                      # 1.\n  (?:\\B(\\.)[0-9]+\\b)|                      # .1\n  (?:\\b[0-9]+\\b(?!\\.))                     # 1\n)(?!\\$)",
+          "captures": {
+            "0": {
+              "name": "constant.numeric.decimal.js"
+            },
             "1": {
-              "patterns": [
-                {
-                  "match": "(?x)\n\\b(isNaN|isFinite|eval|uneval|parseInt|parseFloat|decodeURI|\ndecodeURIComponent|encodeURI|encodeURIComponent|escape|unescape|\nrequire|set(Interval|Timeout)|clear(Interval|Timeout))\\b",
-                  "name": "support.function.js"
-                },
-                {
-                  "match": "[a-zA-Z_$][\\w$]*",
-                  "name": "entity.name.function.js"
-                },
-                {
-                  "match": "\\d[\\w$]*",
-                  "name": "invalid.illegal.identifier.js"
-                }
-              ]
-            }
-          },
-          "end": "(?<=\\))",
-          "name": "meta.function-call.js",
-          "patterns": [
-            {
-              "include": "#arguments"
+              "name": "meta.delimiter.decimal.period.js"
+            },
+            "2": {
+              "name": "meta.delimiter.decimal.period.js"
+            },
+            "3": {
+              "name": "meta.delimiter.decimal.period.js"
+            },
+            "4": {
+              "name": "meta.delimiter.decimal.period.js"
+            },
+            "5": {
+              "name": "meta.delimiter.decimal.period.js"
+            },
+            "6": {
+              "name": "meta.delimiter.decimal.period.js"
             }
-          ]
+          }
         }
       ]
     },
     "objects": {
       "patterns": [
         {
-          "match": "[A-Z][A-Z0-9_$]*(?=\\s*\\.\\s*[a-zA-Z_$]\\w*)",
-          "name": "constant.other.object.js"
+          "name": "constant.other.object.js",
+          "match": "[A-Z][A-Z0-9_$]*(?=\\s*\\.\\s*[a-zA-Z_$]\\w*)"
+        },
+        {
+          "name": "variable.other.object.js",
+          "match": "[a-zA-Z_$][\\w$]*(?=\\s*\\.\\s*[a-zA-Z_$]\\w*)"
+        }
+      ]
+    },
+    "operators": {
+      "patterns": [
+        {
+          "name": "keyword.operator.assignment.compound.js",
+          "match": "%=|\\+=|-=|\\*=|(?\u003c!\\()/="
+        },
+        {
+          "name": "keyword.operator.assignment.compound.bitwise.js",
+          "match": "\u0026=|\\^=|\u003c\u003c=|\u003e\u003e=|\u003e\u003e\u003e=|\\|="
+        },
+        {
+          "name": "keyword.operator.bitwise.shift.js",
+          "match": "\u003c\u003c|\u003e\u003e\u003e|\u003e\u003e"
+        },
+        {
+          "name": "keyword.operator.comparison.js",
+          "match": "!==|!=|\u003c=|\u003e=|===|==|\u003c|\u003e"
+        },
+        {
+          "name": "keyword.operator.logical.js",
+          "match": "\u0026\u0026|!!|!|\\|\\|"
+        },
+        {
+          "name": "keyword.operator.bitwise.js",
+          "match": "\u0026|\\||\\^|~"
+        },
+        {
+          "name": "keyword.operator.assignment.js",
+          "match": "=|:"
+        },
+        {
+          "name": "keyword.operator.decrement.js",
+          "match": "--"
+        },
+        {
+          "name": "keyword.operator.increment.js",
+          "match": "\\+\\+"
         },
         {
-          "match": "[a-zA-Z_$][\\w$]*(?=\\s*\\.\\s*[a-zA-Z_$]\\w*)",
-          "name": "variable.other.object.js"
+          "name": "keyword.operator.js",
+          "match": "%|\\*|/|-|\\+"
+        }
+      ]
+    },
+    "prevent_object_keys_matching": {
+      "patterns": [
+        {
+          "match": "(\\w+)(?=\\s*:)",
+          "captures": {
+            "1": {
+              "patterns": [
+                {
+                  "include": "$self"
+                }
+              ]
+            }
+          }
         }
       ]
     },
@@ -1711,194 +1570,316 @@
           }
         },
         {
-          "match": "(\\.)\\s*(\\$*[a-zA-Z_$][\\w$]*)",
-          "captures": {
-            "1": {
-              "name": "meta.delimiter.property.period.js"
+          "match": "(\\.)\\s*(\\$*[a-zA-Z_$][\\w$]*)",
+          "captures": {
+            "1": {
+              "name": "meta.delimiter.property.period.js"
+            },
+            "2": {
+              "name": "variable.other.property.js"
+            }
+          }
+        },
+        {
+          "match": "(\\.)\\s*([0-9][\\w$]*)",
+          "captures": {
+            "1": {
+              "name": "meta.delimiter.property.period.js"
+            },
+            "2": {
+              "name": "invalid.illegal.identifier.js"
+            }
+          }
+        }
+      ]
+    },
+    "string_escapes": {
+      "patterns": [
+        {
+          "name": "invalid.illegal.unicode-escape.js",
+          "match": "\\\\u(?![A-Fa-f0-9]{4}|{[A-Fa-f0-9]+})[^'\"]*"
+        },
+        {
+          "name": "constant.character.escape.js",
+          "match": "\\\\u(?:[A-Fa-f0-9]{4}|({)([A-Fa-f0-9]+)(}))",
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.unicode-escape.begin.bracket.curly.js"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "name": "invalid.illegal.unicode-escape.js",
+                  "match": "[A-Fa-f\\d]{7,}|(?!10)[A-Fa-f\\d]{6}"
+                }
+              ]
+            },
+            "3": {
+              "name": "punctuation.definition.unicode-escape.end.bracket.curly.js"
+            }
+          }
+        },
+        {
+          "name": "constant.character.escape.js",
+          "match": "\\\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)"
+        }
+      ]
+    },
+    "strings": {
+      "patterns": [
+        {
+          "name": "string.quoted.single.js",
+          "begin": "'",
+          "end": "'",
+          "patterns": [
+            {
+              "include": "#string_escapes"
+            },
+            {
+              "name": "invalid.illegal.string.js",
+              "match": "[^']*[^\\n\\r'\\\\]$"
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.js"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.end.js"
+            }
+          }
+        },
+        {
+          "name": "string.quoted.double.js",
+          "begin": "\"",
+          "end": "\"",
+          "patterns": [
+            {
+              "include": "#string_escapes"
+            },
+            {
+              "name": "invalid.illegal.string.js",
+              "match": "[^\"]*[^\\n\\r\"\\\\]$"
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.js"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.end.js"
+            }
+          }
+        },
+        {
+          "name": "string.quoted.template.html.js",
+          "begin": "((\\w+)?(html|HTML|Html))\\s*(`)",
+          "end": "`",
+          "patterns": [
+            {
+              "include": "#string_escapes"
             },
-            "2": {
-              "name": "variable.other.property.js"
+            {
+              "include": "#interpolated_js"
+            },
+            {
+              "include": "text.html.basic"
             }
-          }
-        },
-        {
-          "match": "(\\.)\\s*([0-9][\\w$]*)",
-          "captures": {
+          ],
+          "beginCaptures": {
             "1": {
-              "name": "meta.delimiter.property.period.js"
+              "name": "entity.name.function.js"
             },
-            "2": {
-              "name": "invalid.illegal.identifier.js"
+            "4": {
+              "name": "punctuation.definition.string.begin.js"
             }
-          }
-        }
-      ]
-    },
-    "interpolated_js": {
-      "patterns": [
-        {
-          "begin": "\\${",
-          "captures": {
+          },
+          "endCaptures": {
             "0": {
-              "name": "punctuation.section.embedded.js"
+              "name": "punctuation.definition.string.end.js"
             }
-          },
-          "end": "}",
-          "name": "source.js.embedded.source",
+          }
+        },
+        {
+          "contentName": "string.quoted.template.html.js",
+          "begin": "(?\u003c=innerHTML)\\s*(\\+?=)\\s*(?=`)",
+          "end": "(?\u003c=`)",
           "patterns": [
             {
-              "begin": "{",
+              "begin": "`",
+              "end": "`",
+              "patterns": [
+                {
+                  "include": "#string_escapes"
+                },
+                {
+                  "include": "#interpolated_js"
+                },
+                {
+                  "include": "text.html.basic"
+                }
+              ],
               "beginCaptures": {
                 "0": {
-                  "name": "meta.brace.curly.js"
+                  "name": "punctuation.definition.string.begin.js"
                 }
               },
-              "end": "}",
               "endCaptures": {
                 "0": {
-                  "name": "meta.brace.curly.js"
-                }
-              },
-              "patterns": [
-                {
-                  "include": "$self"
+                  "name": "punctuation.definition.string.end.js"
                 }
-              ]
-            },
-            {
-              "include": "$self"
+              }
             }
-          ]
-        }
-      ]
-    },
-    "comments": {
-      "patterns": [
-        {
-          "captures": {
+          ],
+          "beginCaptures": {
             "1": {
-              "name": "punctuation.definition.comment.begin.js"
-            },
-            "2": {
-              "name": "punctuation.definition.comment.end.js"
+              "name": "keyword.operator.assignment.js"
             }
           },
-          "match": "(/\\*)(\\*/)",
-          "name": "comment.block.empty.js"
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.end.js"
+            }
+          }
         },
         {
-          "begin": "/\\*\\*",
+          "name": "string.quoted.template.graphql.js",
+          "begin": "(Relay\\.QL)\\s*(`)",
+          "end": "`",
+          "patterns": [
+            {
+              "include": "#string_escapes"
+            },
+            {
+              "include": "#interpolated_js"
+            },
+            {
+              "include": "source.graphql"
+            }
+          ],
           "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.comment.begin.js"
+            "1": {
+              "name": "entity.name.function.js"
+            },
+            "2": {
+              "name": "punctuation.definition.string.begin.js"
             }
           },
-          "end": "\\*/",
           "endCaptures": {
             "0": {
-              "name": "punctuation.definition.comment.end.js"
+              "name": "punctuation.definition.string.end.js"
             }
-          },
-          "name": "comment.block.documentation.js",
+          }
+        },
+        {
+          "name": "string.quoted.template.sql.js",
+          "begin": "(sql|SQL|Sql)\\s*(`)",
+          "end": "`",
           "patterns": [
             {
-              "include": "source.jsdoc"
+              "include": "#string_escapes"
+            },
+            {
+              "include": "#interpolated_js"
+            },
+            {
+              "include": "source.sql"
             }
-          ]
-        },
-        {
-          "begin": "/\\*",
+          ],
           "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.comment.begin.js"
+            "1": {
+              "name": "entity.name.function.js"
+            },
+            "2": {
+              "name": "punctuation.definition.string.begin.js"
             }
           },
-          "end": "\\*/",
           "endCaptures": {
             "0": {
-              "name": "punctuation.definition.comment.end.js"
+              "name": "punctuation.definition.string.end.js"
             }
-          },
-          "name": "comment.block.js"
+          }
         },
         {
-          "begin": "//",
+          "name": "string.quoted.template.js",
+          "begin": "`",
+          "end": "`",
+          "patterns": [
+            {
+              "include": "#string_escapes"
+            },
+            {
+              "include": "#interpolated_js"
+            }
+          ],
           "beginCaptures": {
             "0": {
-              "name": "punctuation.definition.comment.js"
+              "name": "punctuation.definition.string.begin.js"
             }
           },
-          "end": "$",
-          "name": "comment.line.double-slash.js"
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.end.js"
+            }
+          }
         }
       ]
     },
     "switch_statement": {
       "patterns": [
         {
+          "name": "meta.switch-statement.js",
           "begin": "\\bswitch\\b",
-          "beginCaptures": {
-            "0": {
-              "name": "keyword.control.switch.js"
-            }
-          },
           "end": "}",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.section.switch-block.end.bracket.curly.js"
-            }
-          },
-          "name": "meta.switch-statement.js",
           "patterns": [
             {
               "begin": "\\(",
+              "end": "\\)",
+              "patterns": [
+                {
+                  "include": "$self"
+                }
+              ],
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.switch-expression.begin.bracket.round.js"
                 }
               },
-              "end": "\\)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.definition.switch-expression.end.bracket.round.js"
                 }
-              },
-              "patterns": [
-                {
-                  "include": "$self"
-                }
-              ]
+              }
             },
             {
               "begin": "{",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.definition.section.switch-block.begin.bracket.curly.js"
-                }
-              },
               "end": "(?=})",
               "patterns": [
                 {
                   "begin": "\\bcase\\b",
+                  "end": ":",
+                  "patterns": [
+                    {
+                      "include": "#prevent_object_keys_matching"
+                    },
+                    {
+                      "include": "$self"
+                    }
+                  ],
                   "beginCaptures": {
                     "0": {
                       "name": "keyword.control.case.js"
                     }
                   },
-                  "end": ":",
                   "endCaptures": {
                     "0": {
                       "name": "punctuation.definition.section.case-statement.js"
                     }
-                  },
-                  "patterns": [
-                    {
-                      "include": "#prevent_object_keys_matching"
-                    },
-                    {
-                      "include": "$self"
-                    }
-                  ]
+                  }
                 },
                 {
                   "match": "(?:^\\s*)?\\b(default)\\b\\s*(:)",
@@ -1914,27 +1895,26 @@
                 {
                   "include": "$self"
                 }
-              ]
-            }
-          ]
-        }
-      ]
-    },
-    "prevent_object_keys_matching": {
-      "patterns": [
-        {
-          "match": "(\\w+)(?=\\s*:)",
-          "captures": {
-            "1": {
-              "patterns": [
-                {
-                  "include": "$self"
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.definition.section.switch-block.begin.bracket.curly.js"
                 }
-              ]
+              }
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.control.switch.js"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.section.switch-block.end.bracket.curly.js"
             }
           }
         }
       ]
     }
   }
-}
+}