github-linguist 4.8.8 → 4.8.9

data/grammars/source.hsc2hs.json

@@ -0,0 +1,12 @@
+{
+  "fileTypes": [
+    "hsc"
+  ],
+  "name": "Hsc2Hs",
+  "scopeName": "source.hsc2hs",
+  "patterns": [
+    {
+      "include": "source.haskell"
+    }
+  ]
+}

data/grammars/source.ideal.json

@@ -0,0 +1,356 @@
+{
+  "scopeName": "source.ideal",
+  "patterns": [
+    {
+      "include": "#external"
+    },
+    {
+      "include": "#main"
+    }
+  ],
+  "repository": {
+    "external": {
+      "patterns": [
+        {
+          "include": "source.pic#tags"
+        },
+        {
+          "begin": "^(?=[.'][ \t]*(?:\\w|\\\\))",
+          "end": "(?<!\\\\)$|(\\\\\".*)$",
+          "patterns": [
+            {
+              "include": "text.roff"
+            }
+          ],
+          "endCaptures": {
+            "1": {
+              "patterns": [
+                {
+                  "include": "text.roff"
+                }
+              ]
+            }
+          }
+        }
+      ]
+    },
+    "tags": {
+      "begin": "^([.'])[ \t]*(IS)\\b\\s*(\\\\[\"#].*$)?",
+      "end": "^([.'])[ \t]*(IE)\\b",
+      "contentName": "source.embedded.ideal",
+      "patterns": [
+        {
+          "include": "$self"
+        }
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "meta.function.begin.ideal.section.macro.roff"
+        },
+        "1": {
+          "name": "punctuation.definition.macro.roff"
+        },
+        "2": {
+          "name": "entity.function.name.roff"
+        },
+        "3": {
+          "patterns": [
+            {
+              "include": "text.roff#escapes"
+            }
+          ]
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "meta.function.end.ideal.section.macro.roff"
+        },
+        "1": {
+          "name": "punctuation.definition.macro.roff"
+        },
+        "2": {
+          "name": "entity.function.name.roff"
+        }
+      }
+    },
+    "main": {
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#strings"
+        },
+        {
+          "include": "#number"
+        },
+        {
+          "include": "#libfile"
+        },
+        {
+          "include": "#variables"
+        },
+        {
+          "include": "#box"
+        },
+        {
+          "include": "#function-call"
+        },
+        {
+          "include": "#keywords"
+        },
+        {
+          "include": "#operators"
+        },
+        {
+          "include": "#punctuation"
+        }
+      ]
+    },
+    "box": {
+      "begin": "(\\w+)[ \t]*(\\{)",
+      "end": "\\}",
+      "beginCaptures": {
+        "0": {
+          "name": "meta.box.definition.ideal"
+        },
+        "1": {
+          "name": "entity.function.box.name.ideal"
+        },
+        "2": {
+          "name": "punctuation.definition.bracket.curly.ideal"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.bracket.curly.ideal"
+        }
+      },
+      "patterns": [
+        {
+          "include": "$self"
+        }
+      ]
+    },
+    "comment": {
+      "name": "comment.block.ideal",
+      "begin": "/\\*",
+      "end": "\\*/"
+    },
+    "function-call": {
+      "name": "meta.function-call.ideal",
+      "begin": "(\\w+)(\\()",
+      "end": "(?=\\))",
+      "beginCaptures": {
+        "1": {
+          "name": "entity.function.name.ideal"
+        },
+        "2": {
+          "name": "punctuation.definition.bracket.round.ideal"
+        }
+      },
+      "patterns": [
+        {
+          "include": "$self"
+        }
+      ]
+    },
+    "libfile": {
+      "name": "meta.libfile.include.ideal",
+      "match": "((\\.{3})libfile)\\b",
+      "captures": {
+        "1": {
+          "name": "keyword.control.directive.include.ideal"
+        },
+        "2": {
+          "name": "punctuation.definition.directive.include.ideal"
+        }
+      }
+    },
+    "keywords": {
+      "patterns": [
+        {
+          "name": "keyword.operator.$1.ideal",
+          "match": "\\b(at|box|conn|construct|to|put|using|opaque(?:\\s+exterior)?)\\b(?:\\s+(?:\\w+)\\s*(:)\\s*?)?",
+          "captures": {
+            "2": {
+              "name": "punctuation.separator.dictionary.key-value.ideal"
+            }
+          }
+        },
+        {
+          "name": "entity.function.box.name.ideal",
+          "match": "\\b(left|right|spline)\\b"
+        }
+      ]
+    },
+    "number": {
+      "name": "constant.numeric.ideal",
+      "match": "(?<![A-Za-z])\\d+(?:\\.\\d+)?"
+    },
+    "operators": {
+      "patterns": [
+        {
+          "name": "keyword.operator.assignment.ideal",
+          "match": "="
+        },
+        {
+          "name": "keyword.operator.arithmetic.ideal",
+          "match": "[-+*/~]"
+        }
+      ]
+    },
+    "punctuation": {
+      "patterns": [
+        {
+          "name": "punctuation.delimiter.full-stop.period.ideal",
+          "match": "\\."
+        },
+        {
+          "name": "punctuation.delimiter.object.comma.ideal",
+          "match": ","
+        },
+        {
+          "name": "punctuation.terminator.statement.ideal",
+          "match": ";"
+        },
+        {
+          "name": "punctuation.definition.bracket.round.ideal",
+          "match": "\\)"
+        },
+        {
+          "name": "punctuation.definition.bracket.square.ideal",
+          "match": "\\]"
+        },
+        {
+          "name": "punctuation.definition.bracket.curly.ideal",
+          "match": "\\}"
+        },
+        {
+          "begin": "\\(",
+          "end": "\\)",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.bracket.round.ideal"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.bracket.round.ideal"
+            }
+          },
+          "patterns": [
+            {
+              "include": "$self"
+            }
+          ]
+        },
+        {
+          "begin": "\\[",
+          "end": "\\]",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.bracket.square.ideal"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.bracket.square.ideal"
+            }
+          },
+          "patterns": [
+            {
+              "include": "$self"
+            }
+          ]
+        },
+        {
+          "begin": "\\{",
+          "end": "\\}",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.bracket.curly.ideal"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.bracket.curly.ideal"
+            }
+          },
+          "patterns": [
+            {
+              "include": "$self"
+            }
+          ]
+        },
+        {
+          "begin": "<",
+          "end": ">",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.bracket.angle.ideal"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.bracket.angle.ideal"
+            }
+          }
+        }
+      ]
+    },
+    "strings": {
+      "patterns": [
+        {
+          "name": "string.quoted.single.ideal",
+          "begin": "'",
+          "end": "'",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.ideal"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.end.ideal"
+            }
+          }
+        },
+        {
+          "name": "string.quoted.double.ideal",
+          "begin": "\"",
+          "end": "\"",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.ideal"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.end.ideal"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#escapes"
+            }
+          ]
+        }
+      ]
+    },
+    "variables": {
+      "begin": "\\b(var)\\b",
+      "end": "(?=;)",
+      "patterns": [
+        {
+          "include": "#punctuation"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "storage.type.var.ideal"
+        }
+      }
+    }
+  }
+}

data/grammars/source.java.json

@@ -423,6 +423,9 @@
         {
           "include": "#anonymous-classes-and-new"
         },
+        {
+          "include": "#annotations"
+        },
         {
           "include": "#keywords"
         },

data/grammars/source.js.json

@@ -21,16 +21,16 @@
   "name": "JavaScript",
   "patterns": [
     {
-      "comment": "ES6 import",
       "begin": "(?<!\\.)\\b(import)(?!\\s*:)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.js"
         }
       },
+      "end": "(?=;|$)",
+      "name": "meta.import.js",
       "patterns": [
         {
-          "comment": "{ member1 , member2 as alias2 , [...] }",
           "begin": "\\{",
           "beginCaptures": {
             "0": {
@@ -45,7 +45,7 @@
           },
           "patterns": [
             {
-              "comment": "(default|name) as alias",
+              "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": "variable.language.default.js"
@@ -62,8 +62,7 @@
                 "5": {
                   "name": "variable.other.module-alias.js"
                 }
-              },
-              "match": "(?x) (?: \\b(default)\\b | \\b([a-zA-Z_$][a-zA-Z_$0-9]*)\\b) \\s* (\\b as \\b) \\s* (?: (\\b default \\b | \\*) | \\b([a-zA-Z_$][a-zA-Z_$0-9]*)\\b)"
+              }
             },
             {
               "match": ",",
@@ -73,13 +72,13 @@
               "include": "#comments"
             },
             {
-              "match": "\\b([a-zA-Z_$][a-zA-Z_$0-9]*)\\b",
+              "match": "\\b([a-zA-Z_$][\\w$]*)\\b",
               "name": "variable.other.module.js"
             }
           ]
         },
         {
-          "comment": "(default|*|name) as alias",
+          "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": "variable.language.default.js"
@@ -99,8 +98,7 @@
             "6": {
               "name": "variable.other.module-alias.js"
             }
-          },
-          "match": "(?x) (?: \\b(default)\\b | (\\*) | \\b([a-zA-Z_$][a-zA-Z_$0-9]*)\\b) \\s* (\\b as \\b) \\s* (?: (\\b default \\b | \\*) | \\b([a-zA-Z_$][a-zA-Z_$0-9]*)\\b)"
+          }
         },
         {
           "match": "\\*",
@@ -121,20 +119,17 @@
           "name": "keyword.control.js"
         },
         {
-          "match": "\\b([a-zA-Z_$][a-zA-Z_$0-9]*)\\b(?=.*\\bfrom\\b)",
+          "match": "\\b([a-zA-Z_$][\\w$]*)\\b(?=.*\\bfrom\\b)",
           "name": "variable.other.module.js"
         },
         {
           "match": ",",
           "name": "meta.delimiter.object.comma.js"
         }
-      ],
-      "end": "(?=;|$)",
-      "name": "meta.import.js"
+      ]
     },
     {
-      "comment": "ES6 export: `export default (variable|class|function, etc.)`",
-      "match": "(?x) \\b(export)\\b \\s* \\b(default)\\b (?:\\s*) \\b((?!\\bfunction\\b|\\bclass\\b|\\blet\\b|\\bvar\\b|\\bconst\\b)[a-zA-Z_$][a-zA-Z_$0-9]*)?\\b",
+      "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",
       "captures": {
         "0": {
           "name": "meta.export.js"
@@ -151,19 +146,19 @@
       }
     },
     {
-      "comment": "ES6 export, re-export: `export {member as alias, [...]} [from ...]`",
       "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",
       "patterns": [
         {
           "include": "#numbers"
         },
         {
-          "comment": "`{ member1 , member2 as alias2 , [...] }` inside re-export",
           "begin": "\\{(?=.*\\bfrom\\b)",
           "beginCaptures": {
             "0": {
@@ -178,7 +173,7 @@
           },
           "patterns": [
             {
-              "comment": "(default|name) as alias",
+              "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": "variable.language.default.js"
@@ -198,8 +193,7 @@
                 "6": {
                   "name": "variable.other.module-alias.js"
                 }
-              },
-              "match": "(?x) (?: \\b(default)\\b | \\b([a-zA-Z_$][a-zA-Z_$0-9]*)\\b) \\s* (\\b as \\b) \\s* (?: \\b(default)\\b | (\\*) | \\b([a-zA-Z_$][a-zA-Z_$0-9]*)\\b)"
+              }
             },
             {
               "match": ",",
@@ -209,13 +203,12 @@
               "include": "#comments"
             },
             {
-              "match": "\\b([a-zA-Z_$][a-zA-Z_$0-9]*)\\b",
+              "match": "\\b([a-zA-Z_$][\\w$]*)\\b",
               "name": "variable.other.module.js"
             }
           ]
         },
         {
-          "comment": "{ member1 , member2 as alias2 , [...] }",
           "begin": "(?![a-zA-Z_$0-9])\\{",
           "beginCaptures": {
             "0": {
@@ -230,7 +223,6 @@
           },
           "patterns": [
             {
-              "comment": "name as (default|alias)",
               "captures": {
                 "1": {
                   "name": "invalid.illegal.js"
@@ -251,7 +243,7 @@
                   "name": "variable.other.module-alias.js"
                 }
               },
-              "match": "(?x) (?: \\b(default)\\b | \\b([a-zA-Z_$][a-zA-Z_$0-9]*)\\b) \\s* (\\b as \\b) \\s* (?: \\b(default)\\b | (\\*) | \\b([a-zA-Z_$][a-zA-Z_$0-9]*)\\b)"
+              "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"
@@ -261,7 +253,7 @@
               "name": "meta.delimiter.object.comma.js"
             },
             {
-              "match": "\\b([a-zA-Z_$][a-zA-Z_$0-9]*)\\b",
+              "match": "\\b([a-zA-Z_$][\\w$]*)\\b",
               "name": "variable.other.module.js"
             }
           ]
@@ -285,7 +277,7 @@
           "name": "keyword.control.js"
         },
         {
-          "match": "\\b([a-zA-Z_$][a-zA-Z_$0-9]*)\\b",
+          "match": "\\b([a-zA-Z_$][\\w$]*)\\b",
           "name": "variable.other.module.js"
         },
         {
@@ -295,23 +287,14 @@
         {
           "include": "#operators"
         }
-      ],
-      "end": "(?=;|\\bfunction\\b|\\bclass\\b|\\blet\\b|\\bvar\\b|\\bconst\\b|$)",
-      "name": "meta.export.js"
+      ]
     },
     {
-      "match": "(?<!\\.)\\b(super|this|arguments)(?!\\s*:)\\b|(?<=\\?)(?:\\s*)(super|this|arguments)(?=\\s*:)",
-      "captures": {
-        "1": {
-          "name": "variable.language.js"
-        },
-        "2": {
-          "name": "variable.language.js"
-        }
-      }
+      "match": "(?<!\\.)\\b(?<!\\$)(super|this|arguments)(?!\\s*:|\\$)\\b",
+      "name": "variable.language.js"
     },
     {
-      "begin": "(?=(\\basync\\b\\s*)?\\bfunction\\b)",
+      "begin": "(?=(\\basync\\b\\s*)?\\bfunction\\b(?!\\s*:))",
       "end": "(?<=})",
       "patterns": [
         {
@@ -456,7 +439,7 @@
       ]
     },
     {
-      "begin": "(?=\\b(constructor)\\s*)",
+      "begin": "(?=\\bconstructor\\b\\s*)",
       "end": "(?<=})",
       "patterns": [
         {
@@ -567,7 +550,7 @@
     },
     {
       "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$]+:|\n  \\s*/\\*|\\s*//\n)(?=\\s*\\S))",
+      "end": "(?x)\n(?<=})|\n((?!\n  \\s*{|\n  \\G[\\w$]+\\s*:|\n  \\s*/\\*|\\s*//\n)(?=\\s*\\S))",
       "patterns": [
         {
           "include": "#comments"
@@ -688,16 +671,22 @@
       "name": "meta.class.js"
     },
     {
+      "match": "(new)\\s+([\\w$]+[\\w.$]*)",
+      "name": "meta.class.instance.constructor.js",
       "captures": {
         "1": {
           "name": "keyword.operator.new.js"
         },
         "2": {
-          "name": "entity.name.type.instance.js"
+          "name": "entity.name.type.instance.js",
+          "patterns": [
+            {
+              "match": "\\.",
+              "name": "meta.delimiter.property.period.js"
+            }
+          ]
         }
-      },
-      "match": "(new)\\s+(\\$?\\w+(?:\\.\\w*)?)",
-      "name": "meta.class.instance.constructor"
+      }
     },
     {
       "begin": "(?<![\\w$])console(?![\\w$]|\\s*:)",
@@ -781,6 +770,7 @@
       "include": "#comments"
     },
     {
+      "match": "(<!--|-->)",
       "captures": {
         "0": {
           "name": "punctuation.definition.comment.html.js"
@@ -789,7 +779,6 @@
           "name": "punctuation.definition.comment.html.js"
         }
       },
-      "match": "(<!--|-->)",
       "name": "comment.block.html.js"
     },
     {
@@ -869,30 +858,23 @@
       ]
     },
     {
-      "match": "(?<!\\.)\\b(yield)(?!\\s*:)\\b(?:\\s*(\\*))?|(?<=\\?)(?:\\s*)(yield)(?=\\s*:)",
+      "match": "(?<!\\.)\\b(yield)(?!\\s*:)\\b(?:\\s*(\\*))?",
       "captures": {
         "1": {
           "name": "keyword.control.js"
         },
         "2": {
           "name": "storage.modifier.js"
-        },
-        "3": {
-          "name": "keyword.control.js"
-        },
-        "4": {
-          "name": "storage.modifier.js"
         }
       },
       "name": "meta.control.yield.js"
     },
     {
-      "match": "(?<!\\.)\\b(await|break|case|catch|continue|do|else|finally|for|if|import|from|package|return|switch|throw|try|while|with)(?!\\s*:)\\b",
+      "match": "(?<!\\.)\\b(await|break|catch|continue|do|else|finally|for|if|import|package|return|throw|try|while|with)(?!\\s*:)\\b",
       "name": "keyword.control.js"
     },
     {
-      "match": "(?<!\\.)\\b(default)\\b",
-      "name": "keyword.control.js"
+      "include": "#switch_statement"
     },
     {
       "match": "(?<!\\.)\\b(delete|in|of|instanceof|new|typeof|void)(?!\\s*:)\\b",
@@ -903,79 +885,64 @@
       "name": "keyword.operator.spread.js"
     },
     {
-      "match": "(?<!\\.)\\b(true|false)(?!\\s*:)\\b|(?<=\\?)(?:\\s*)(true|false)(?=\\s*:)",
-      "captures": {
-        "1": {
-          "name": "constant.language.boolean.$1.js"
-        },
-        "2": {
-          "name": "constant.language.boolean.$2.js"
-        }
-      }
+      "match": "(?<!\\.)\\b(true|false)(?!\\s*:)\\b",
+      "name": "constant.language.boolean.$1.js"
     },
     {
-      "match": "(?<!\\.)\\b(null)(?!\\s*:)\\b|(?<=\\?)(?:\\s*)(null)(?=\\s*:)",
-      "captures": {
-        "1": {
-          "name": "constant.language.null.js"
-        },
-        "2": {
-          "name": "constant.language.null.js"
-        }
-      }
+      "match": "(?<!\\.)\\b(null)(?!\\s*:)\\b",
+      "name": "constant.language.null.js"
     },
     {
-      "match": "(?<!\\.)\\b(debugger)(?!\\s*:)\\b|(?<=\\?)(?:\\s*)(debugger)(?=\\s*:)",
-      "captures": {
-        "1": {
-          "name": "keyword.other.js"
-        },
-        "2": {
-          "name": "keyword.other.js"
-        }
-      }
+      "match": "(?<!\\.)\\b(debugger)(?!\\s*:)\\b",
+      "name": "keyword.other.debugger.js"
     },
     {
-      "match": "(?<!\\$)\\b(Anchor|Applet|Area|Array|Boolean|Button|Checkbox|Date|document|event|FileUpload|Form|Frame|Function|Hidden|History|Image|JavaArray|JavaClass|JavaObject|JavaPackage|java|Layer|Link|Location|Map|MimeType|Number|navigator|netscape|Object|Option|Packages|Password|Plugin|performance|Radio|RegExp|Reset|Select|Set|String|Style|Submit|Symbol|screen|sun|Text|Textarea|WeakMap|WeakSet|window|XMLHttpRequest)\\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"
     },
     {
-      "match": "(\\.)(systemLanguage|scripts|scrollbars|screenX|screenY|screenTop|screenLeft|style|styleSheets|status|statusText|statusbar|siblingBelow|siblingAbove|source|suffixes|security|securityPolicy|selection|self|history|host|hostname|hash|hasFocus|XMLDocument|XSLDocument|next|namespaces|namespaceURI|nameProp|MIN_VALUE|MAX_VALUE|characterSet|constructor|controllers|cookieEnabled|colorDepth|components|complete|current|cpuClass|clip|clipBoardData|clientInformation|closed|classes|callee|caller|crypto|toolbar|top|textTransform|textIndent|textDecoration|textAlign|tags|innerHeight|innerWidth|input|ids|ignoreCase|zIndex|oscpu|onreadystatechange|onLine|outerHeight|outerWidth|opsProfile|opener|offscreenBuffering|NEGATIVE_INFINITY|display|dialogHeight|dialogTop|dialogWidth|dialogLeft|dialogArguments|directories|description|defaultStatus|defaultChecked|defaultCharset|defaultView|userProfile|userLanguage|userAgent|uniqueID|undefined|updateInterval|_content|pixelDepth|port|personalbar|pkcs11|plugins|platform|pathname|paddingRight|paddingBottom|paddingTop|paddingLeft|parent|parentWindow|parentLayer|pageX|pageXOffset|pageY|pageYOffset|protocol|prototype|product|productSub|prompter|previous|prefix|encoding|enabledPlugin|external|expando|embeds|visiblity|vendor|vendorSub|vLinkcolor|URLUnencoded|POSITIVE_INFINITY|filename|fontSize|fontFamily|fontWeight|formName|frames|frameElement|fgColor|whiteSpace|listStyleType|lineHeight|linkColor|location|locationbar|localName|lowsrc|length|left|leftContext|lastModified|lastMatch|lastIndex|lastParen|layers|layerX|language|appMinorVersion|appName|appCodeName|appCore|appVersion|availHeight|availTop|availWidth|availLeft|all|arity|arguments|aLinkcolor|above|right|rightContext|responseXML|responeText|readyState|global|x|y|z|mimeTypes|multiline|menubar|marginRight|marginBottom|marginTop|marginLeft|bottom|border(Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth)|bufferDepth|below|backgroundColor|backgroundImage)\\b",
+      "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",
       "captures": {
         "1": {
           "name": "meta.delimiter.property.period.js"
         },
         "2": {
+          "name": "support.variable.property.js"
+        },
+        "3": {
           "name": "support.constant.js"
         }
       }
     },
     {
-      "match": "(\\.)(shape|systemId|scheme|scope|scrolling|standby|start|size|summary|specified|sectionRowIndex|selected|selectedIndex|hspace|httpEquiv|htmlFor|height|headers|href|hreflang|noResize|notations|notationName|noShade|noHref|nodeName|nodeType|nodeValue|noWrap|nextSibling|name|ch|childNodes|chOff|checked|charset|cite|content|cookie|cords|code|codeBase|codeType|cols|colSpan|color|compact|cells|cellSpacing|cellPadding|clear|className|caption|type|tBodies|title|tHead|text|target|tagName|tFoot|isMap|index|id|implementation|images|options|ownerDocument|object|disabled|dir|doctype|documentElement|docmain|declare|defer|defaultSelected|defaultChecked|defaultValue|dateTime|data|useMap|publicId|parentNode|profile|profileend|prompt|previousDibling|enctype|entities|event|elements|vspace|version|value|valueType|vLink|vAlign|URL|firstChild|form|forms|face|frame|frameBorder|width|link|links|longDesc|lowSrc|lastChild|lang|label|anchors|accessKey|accept|acceptCharset|action|attributes|applets|alt|align|archive|areas|axis|aLink|abbr|rows|rowSpan|rowIndex|rules|rev|referrer|rel|readOnly|multiple|method|media|marginHeight|marginWidth|maxLength|body|border|background|bgColor)\\b",
+      "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",
       "captures": {
         "1": {
-          "name": "meta.delimiter.property.period.js"
+          "name": "support.variable.dom.js"
         },
         "2": {
-          "name": "support.constant.dom.js"
+          "name": "support.class.dom.js"
         }
       }
     },
     {
-      "match": "\\b(ELEMENT_NODE|ATTRIBUTE_NODE|TEXT_NODE|CDATA_SECTION_NODE|ENTITY_REFERENCE_NODE|ENTITY_NODE|PROCESSING_INSTRUCTION_NODE|COMMENT_NODE|DOCUMENT_NODE|DOCUMENT_TYPE_NODE|DOCUMENT_FRAGMENT_NODE|NOTATION_NODE|INDEX_SIZE_ERR|DOMSTRING_SIZE_ERR|HIERARCHY_REQUEST_ERR|WRONG_DOCUMENT_ERR|INVALID_CHARACTER_ERR|NO_DATA_ALLOWED_ERR|NO_MODIFICATION_ALLOWED_ERR|NOT_FOUND_ERR|NOT_SUPPORTED_ERR|INUSE_ATTRIBUTE_ERR)\\b",
-      "name": "support.constant.dom.js"
-    },
-    {
-      "match": "(?<!\\.)\\b(module|exports|__filename|__dirname|global|process)(?!\\s*:)\\b|(?<=\\?)(?:\\s*)(module|exports|__filename|__dirname|global|process)(?=\\s*:)",
+      "match": "(?x) (\\.) \\s*\n(?:\n  (ATTRIBUTE_NODE|CDATA_SECTION_NODE|COMMENT_NODE|DOCUMENT_FRAGMENT_NODE|DOCUMENT_NODE|DOCUMENT_TYPE_NODE\n  |DOMSTRING_SIZE_ERR|ELEMENT_NODE|ENTITY_NODE|ENTITY_REFERENCE_NODE|HIERARCHY_REQUEST_ERR|INDEX_SIZE_ERR\n  |INUSE_ATTRIBUTE_ERR|INVALID_CHARACTER_ERR|NO_DATA_ALLOWED_ERR|NO_MODIFICATION_ALLOWED_ERR|NOT_FOUND_ERR\n  |NOT_SUPPORTED_ERR|NOTATION_NODE|PROCESSING_INSTRUCTION_NODE|TEXT_NODE|WRONG_DOCUMENT_ERR)\n  |\n  (_content|[xyz]|abbr|above|accept|acceptCharset|accessKey|action|align|[av]Link(?:color)?|all|alt|anchors|appCodeName\n  |appCore|applets|appMinorVersion|appName|appVersion|archive|areas|arguments|attributes|availHeight|availLeft|availTop\n  |availWidth|axis|background|backgroundColor|backgroundImage|below|bgColor|body|border|borderBottomWidth|borderColor\n  |borderLeftWidth|borderRightWidth|borderStyle|borderTopWidth|borderWidth|bottom|bufferDepth|callee|caller|caption\n  |cellPadding|cells|cellSpacing|ch|characterSet|charset|checked|childNodes|chOff|cite|classes|className|clear\n  |clientInformation|clip|clipBoardData|closed|code|codeBase|codeType|color|colorDepth|cols|colSpan|compact|complete\n  |components|content|controllers|cookie|cookieEnabled|cords|cpuClass|crypto|current|data|dateTime|declare|defaultCharset\n  |defaultChecked|defaultSelected|defaultStatus|defaultValue|defaultView|defer|description|dialogArguments|dialogHeight\n  |dialogLeft|dialogTop|dialogWidth|dir|directories|disabled|display|docmain|doctype|documentElement|elements|embeds\n  |enabledPlugin|encoding|enctype|entities|event|expando|external|face|fgColor|filename|firstChild|fontFamily|fontSize\n  |fontWeight|form|formName|forms|frame|frameBorder|frameElement|frames|hasFocus|hash|headers|height|history|host\n  |hostname|href|hreflang|hspace|htmlFor|httpEquiv|id|ids|ignoreCase|images|implementation|index|innerHeight|innerWidth\n  |input|isMap|label|lang|language|lastChild|lastIndex|lastMatch|lastModified|lastParen|layer[sXY]|left|leftContext\n  |lineHeight|link|linkColor|links|listStyleType|localName|location|locationbar|longDesc|lowsrc|lowSrc|marginBottom\n  |marginHeight|marginLeft|marginRight|marginTop|marginWidth|maxLength|media|menubar|method|mimeTypes|multiline|multiple\n  |name|nameProp|namespaces|namespaceURI|next|nextSibling|nodeName|nodeType|nodeValue|noHref|noResize|noShade|notationName\n  |notations|noWrap|object|offscreenBuffering|onLine|onreadystatechange|opener|opsProfile|options|oscpu|outerHeight\n  |outerWidth|ownerDocument|paddingBottom|paddingLeft|paddingRight|paddingTop|page[XY]|page[XY]Offset|parent|parentLayer\n  |parentNode|parentWindow|pathname|personalbar|pixelDepth|pkcs11|platform|plugins|port|prefix|previous|previousDibling\n  |product|productSub|profile|profileend|prompt|prompter|protocol|publicId|readOnly|readyState|referrer|rel|responseText\n  |responseXML|rev|right|rightContext|rowIndex|rows|rowSpan|rules|scheme|scope|screen[XY]|screenLeft|screenTop|scripts\n  |scrollbars|scrolling|sectionRowIndex|security|securityPolicy|selected|selectedIndex|selection|self|shape|siblingAbove\n  |siblingBelow|size|source|specified|standby|start|status|statusbar|statusText|style|styleSheets|suffixes|summary\n  |systemId|systemLanguage|tagName|tags|target|tBodies|text|textAlign|textDecoration|textIndent|textTransform|tFoot|tHead\n  |title|toolbar|top|type|undefined|uniqueID|updateInterval|URL|URLUnencoded|useMap|userAgent|userLanguage|userProfile\n  |vAlign|value|valueType|vendor|vendorSub|version|visibility|vspace|whiteSpace|width|X[MS]LDocument|zIndex)\n)\n\\b",
       "captures": {
         "1": {
-          "name": "support.variable.js"
+          "name": "meta.delimiter.property.period.js"
         },
         "2": {
-          "name": "support.variable.js"
+          "name": "support.constant.dom.js"
+        },
+        "3": {
+          "name": "support.variable.property.dom.js"
         }
       }
     },
+    {
+      "match": "(?<!\\.)\\b(module|exports|__filename|__dirname|global|process)(?!\\s*:)\\b",
+      "name": "support.variable.js"
+    },
     {
       "match": "\\b(Infinity|NaN|undefined)\\b",
       "name": "constant.language.js"
@@ -1000,6 +967,28 @@
         }
       ]
     },
+    {
+      "begin": "\\?",
+      "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"
     },
@@ -1019,15 +1008,8 @@
       "include": "#properties"
     },
     {
-      "match": "(?<!\\.)\\b([A-Z][A-Z0-9_]+)(?!\\s*:)\\b|(?<=\\?)(?:\\s*)([A-Z][A-Z0-9_]+)(?=\\s*:)",
-      "captures": {
-        "1": {
-          "name": "constant.other.js"
-        },
-        "2": {
-          "name": "constant.other.js"
-        }
-      }
+      "match": "((?<!\\.|[\\w$])(?![_\\$]+[^A-Z0-9_$])\\$*\\b(?:[A-Z_$][A-Z0-9_$]*)\\b\\$*)(?!\\s*:)",
+      "name": "constant.other.js"
     },
     {
       "match": "(?<!\\$)\\b[0-9]+[\\w$]*",
@@ -1046,6 +1028,7 @@
       "name": "meta.delimiter.method.period.js"
     },
     {
+      "match": "({)(})",
       "captures": {
         "1": {
           "name": "punctuation.section.scope.begin.js"
@@ -1053,9 +1036,7 @@
         "2": {
           "name": "punctuation.section.scope.end.js"
         }
-      },
-      "comment": "Allows the special return snippet to fire.",
-      "match": "({)(})"
+      }
     },
     {
       "begin": "{",
@@ -1170,11 +1151,7 @@
           "name": "keyword.operator.bitwise.js"
         },
         {
-          "match": "\\?|:",
-          "name": "keyword.operator.js"
-        },
-        {
-          "match": "=",
+          "match": "=|:",
           "name": "keyword.operator.assignment.js"
         },
         {
@@ -1209,8 +1186,7 @@
           "name": "string.quoted.single.js",
           "patterns": [
             {
-              "match": "\\\\(x\\h{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)",
-              "name": "constant.character.escape.js"
+              "include": "#string_escapes"
             },
             {
               "match": "[^']*[^\\n\\r'\\\\]$",
@@ -1234,8 +1210,7 @@
           "name": "string.quoted.double.js",
           "patterns": [
             {
-              "match": "\\\\(x\\h{2}|[0-2][0-7]{0,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)",
-              "name": "constant.character.escape.js"
+              "include": "#string_escapes"
             },
             {
               "match": "[^\"]*[^\\n\\r\"\\\\]$",
@@ -1262,8 +1237,7 @@
           "name": "string.quoted.template.html.js",
           "patterns": [
             {
-              "match": "\\\\(x\\h{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)",
-              "name": "constant.character.escape.js"
+              "include": "#string_escapes"
             },
             {
               "include": "#interpolated_js"
@@ -1292,8 +1266,7 @@
           "name": "string.quoted.template.graphql.js",
           "patterns": [
             {
-              "match": "\\\\(x\\h{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)",
-              "name": "constant.character.escape.js"
+              "include": "#string_escapes"
             },
             {
               "include": "#interpolated_js"
@@ -1319,8 +1292,7 @@
           "name": "string.quoted.template.js",
           "patterns": [
             {
-              "match": "\\\\(x\\h{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)",
-              "name": "constant.character.escape.js"
+              "include": "#string_escapes"
             },
             {
               "include": "#interpolated_js"
@@ -1329,6 +1301,38 @@
         }
       ]
     },
+    "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"
+            }
+          }
+        },
+        {
+          "match": "\\\\(x\\h{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": [
         {
@@ -1491,11 +1495,11 @@
                   "name": "support.function.event-handler.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|\nprint|prompt|preference|enableExternalCapture|elementFromPoint|exec|execScript|\nexecCommand|valueOf|UTC|queryCommandState|queryCommandIndeterm|queryCommandEnabled|\nqueryCommandValue|find|file|fileModifiedDate|fileSize|fileCreatedDate|fileUpdatedDate|\nfixed|fontsize|fontcolor|forward|fromCharCode|watch|link|load|lastIndexOf|\nanchor|attachEvent|atob|apply|alert|abort|routeEvents|\nresize|resizeBy|resizeTo|recalc|returnValue|replace|reverse|reload|releaseCapture|\nreleaseEvents|go|get(Milliseconds|Seconds|Minutes|Hours|Month|Day|Year|FullYear|\nTime|Date|TimezoneOffset|UTC(Milliseconds|Seconds|Minutes|Hours|Day|Month|FullYear|Date)|\nAttention|Selection|ResponseHeader|AllResponseHeaders)|moveBy|moveBelow|moveTo|\nmoveToAbsolute|moveAbove|mergeAttributes|match|margins|btoa|big|bold|borderWidths|blink|back)\\b",
+                  "match": "(?x)\n\\b(shift|showModelessDialog|showModalDialog|showHelp|scroll|scrollX|scrollByPages|\nscrollByLines|scrollY|scrollTo|stop|strike|sizeToContent|sidebar|signText|sort|\nsup|sub|substr|substring|splice|split|send|set(Milliseconds|Seconds|Minutes|Hours|\nMonth|Year|FullYear|Date|UTC(Milliseconds|Seconds|Minutes|Hours|Month|FullYear|Date)|\nTime|Hotkeys|Cursor|ZOptions|Active|Resizable|RequestHeader)|search|slice|\nsavePreferences|small|home|handleEvent|navigate|char|charCodeAt|charAt|concat|\ncontextual|confirm|compile|clear|captureEvents|call|createStyleSheet|createPopup|\ncreateEventObject|to(GMTString|UTCString|String|Source|UpperCase|LowerCase|LocaleString)|\ntest|taint|taintEnabled|indexOf|italics|disableExternalCapture|dump|detachEvent|unshift|\nuntaint|unwatch|updateCommands|join|javaEnabled|pop|push|plugins.refresh|paddings|parse|\nprint|prompt|preference|enableExternalCapture|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"
                 },
                 {
-                  "match": "(?x)\n\\b(substringData|submit|splitText|setNamedItem|setAttribute|setAttributeNode|select|\nhasChildNodes|hasFeature|namedItem|click|close|cloneNode|createComment|createCDATASection|\ncreateCaption|createTHead|createTextNode|createTFoot|createDocumentFragment|\ncreateProcessingInstruction|createEntityReference|createElement|createAttribute|\ntabIndex|insertRow|insertBefore|insertCell|insertData|item|open|deleteRow|deleteCell|\ndeleteCaption|deleteTHead|deleteTFoot|deleteData|focus|write|writeln|add|appendChild|\nappendData|reset|replaceChild|replaceData|move|moveNamedItem|moveChild|moveAttribute|\nmoveAttributeNode|getNamedItem|getElementsByName|getElementsByTagName|getElementById|\ngetAttribute|getAttributeNode|blur)\\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"
                 },
                 {
@@ -1663,11 +1667,11 @@
     "docblock": {
       "patterns": [
         {
-          "match": "(?<!\\w)@(abstract|access|alias|augments|author|async|attribute|arg|argument|beta|borrows|bubbes|callback|class|classdesc|config|const|constant|constructs|constructor|copyright|chainable|default|defaultvalue|deprecated|desc|description|enum|emits|event|example|exports|external|extends|extension|extensionfor|extension_for|for|file|fileoverview|fires|final|function|global|host|ignore|implements|inheritdoc|inner|instance|interface|kind|lends|license|listens|main|member|memberof|method|mixex|mixin(?:s|)|module|name|namespace|override|overview|param|private|prop|property|protected|public|readonly|readOnly|requires|required|return|returns|see|since|static|summary|submodule|this|throws|todo|tutorial|type|typedef|var|variation|version|virtual|uses|writeOnce)\\b",
+          "match": "(?x) (?<!\\w)@\n(abstract|access|alias|arg|argument|async|attribute|augments|author|beta|borrows|bubbes|callback|chainable|class\n|classdesc|code|config|const|constant|constructor|constructs|copyright|default|defaultvalue|define|deprecated|desc\n|description|dict|emits|enum|event|example|exports?|extends|extension|extension_for|extensionfor|external|file\n|fileoverview|final|fires|for|function|global|host|ignore|implements|inherit[Dd]oc|inner|instance|interface|kind\n|lends|license|listens|main|member|memberof|method|mixex|mixins?|module|name|namespace|nocollapse|nosideeffects\n|override|overview|package|param|preserve|private|prop|property|protected|public|read[Oo]nly|record|require[ds]\n|returns?|see|since|static|struct|submodule|summary|template|this|throws|todo|tutorial|type|typedef|unrestricted\n|uses|var|variation|version|virtual|writeOnce)\\b",
           "name": "storage.type.class.jsdoc"
         },
         {
-          "match": "({\\b(?:[a-zA-Z_$][a-zA-Z_$0-9]*)\\b})\\s\\b([a-zA-Z_$][a-zA-Z_$0-9]*)\\b\\s*((?:(?!\\*\\/).)*)",
+          "match": "(?x)\n({(?:\\*|(?:\\?|\\!|\\.{3})?(?:\\([a-zA-Z_$][\\w$]*(?:[\\.|][a-zA-Z_$][\\w$]*)*\\)|[a-zA-Z_$][\\w$]*(?:[\\.|][a-zA-Z_$][\\w$]*)*)(?:\\[\\])?=?)})\n\\s+\n(\\[(?:[a-zA-Z_$]+(?:=[\\w][\\s\\w$]*)?)\\]|(?:[a-zA-Z_$][\\w$]*(?:[\\.|][a-zA-Z_$][\\w$]*)*))\n\\s+\n((?:(?!\\*\\/).)*)",
           "captures": {
             "0": {
               "name": "other.meta.jsdoc"
@@ -1682,6 +1686,20 @@
               "name": "other.description.jsdoc"
             }
           }
+        },
+        {
+          "match": "(?x)\n(?:(?<=@returns)|(?<=@return))\n\\s+\n({(?:\\*|(?:\\?|\\!|\\.{3})?(?:\\([a-zA-Z_$][\\w$]*(?:[\\.|][a-zA-Z_$][\\w$]*)*\\)|[a-zA-Z_$][\\w$]*(?:[\\.|][a-zA-Z_$][\\w$]*)*)(?:\\[\\])?=?)})\n\\s+\n((?:(?!\\*\\/).)*)",
+          "captures": {
+            "0": {
+              "name": "other.meta.jsdoc"
+            },
+            "1": {
+              "name": "entity.name.type.instance.jsdoc"
+            },
+            "2": {
+              "name": "other.description.jsdoc"
+            }
+          }
         }
       ]
     },
@@ -1689,27 +1707,37 @@
       "patterns": [
         {
           "begin": "/\\*\\*(?!/)",
-          "captures": {
+          "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.js"
             }
           },
+          "end": "\\*/",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.comment.js"
+            }
+          },
+          "name": "comment.block.documentation.js",
           "patterns": [
             {
               "include": "#docblock"
             }
-          ],
-          "end": "\\*/",
-          "name": "comment.block.documentation.js"
+          ]
         },
         {
           "begin": "/\\*",
-          "captures": {
+          "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.js"
             }
           },
           "end": "\\*/",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.comment.js"
+            }
+          },
           "name": "comment.block.js"
         },
         {
@@ -1734,6 +1762,109 @@
           ]
         }
       ]
+    },
+    "switch_statement": {
+      "patterns": [
+        {
+          "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": "\\(",
+              "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",
+                  "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*(:)",
+                  "captures": {
+                    "1": {
+                      "name": "keyword.control.default.js"
+                    },
+                    "2": {
+                      "name": "punctuation.definition.section.case-statement.js"
+                    }
+                  }
+                },
+                {
+                  "include": "$self"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    "prevent_object_keys_matching": {
+      "patterns": [
+        {
+          "match": "(\\w+)(?=\\s*:)",
+          "captures": {
+            "1": {
+              "patterns": [
+                {
+                  "include": "$self"
+                }
+              ]
+            }
+          }
+        }
+      ]
     }
   }
 }