github-linguist 5.0.0 → 5.0.2

data/grammars/source.haskell.json

@@ -13,18 +13,18 @@
     "classNameOne": "[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*",
     "functionName": "(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*",
     "className": "[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*",
-    "operatorChar": "[\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]",
-    "operator": "[\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]+",
-    "operatorFun": "(?:\\((?!--+\\))[\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]+\\))",
+    "operatorChar": "(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))",
+    "operator": "(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))+",
+    "operatorFun": "(?:\\((?!--+\\))(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))+\\))",
     "basicChar": "[\\ -\\[\\]-~]",
     "escapeChar": "\\\\(?:NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|[abfnrtv\\\\\\\"'\\&])",
     "octalChar": "(?:\\\\o[0-7]+)",
     "hexChar": "(?:\\\\x[0-9A-Fa-f]+)",
     "controlChar": "(?:\\\\\\^[A-Z@\\[\\]\\\\^_])",
-    "character": "(?:[\\ -\\[\\]-~]|\\\\(?:NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|[abfnrtv\\\\\\\"'\\&])|(?:\\\\o[0-7]+)|(?:\\\\x[0-9A-Fa-f]+)|(?:\\\\\\^[A-Z@\\[\\]\\\\^_])|[\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])",
-    "functionTypeDeclaration": "(?:(?:((?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))[\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]+\\)))(?:(?:\\s*,\\s*)(?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))[\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]+\\))))*))(?:\\s*((?<![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])(?:::|∷)(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]))))",
-    "doubleColonOperator": "(?<![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])(?:::|∷)(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])",
-    "ctorTypeDeclaration": "(?:(?:((?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*|(?:\\((?!--+\\))[\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]+\\)))(?:(?:\\s*,\\s*)(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*|(?:\\((?!--+\\))[\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]+\\))))*))(?:\\s*((?<![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])(?:::|∷)(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]))))",
+    "character": "(?:[\\ -\\[\\]-~]|\\\\(?:NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|[abfnrtv\\\\\\\"'\\&])|(?:\\\\o[0-7]+)|(?:\\\\x[0-9A-Fa-f]+)|(?:\\\\\\^[A-Z@\\[\\]\\\\^_])|(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))",
+    "functionTypeDeclaration": "(?:(?:((?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))+\\)))(?:(?:\\s*,\\s*)(?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))+\\))))*))(?:\\s*((?<!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))))))",
+    "doubleColonOperator": "(?<!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))",
+    "ctorTypeDeclaration": "(?:(?:((?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*|(?:\\((?!--+\\))(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))+\\)))(?:(?:\\s*,\\s*)(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*|(?:\\((?!--+\\))(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))+\\))))*))(?:\\s*((?<!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))))))",
     "ctorArgs": "(?!deriving)(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*|(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:(?!deriving)(?:[\\w()'→⇒\\[\\],]|->|=>)+\\s*)+)",
     "ctor": "(?:(?:(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?<![\\p{Ll}_\\p{Lu}\\p{Lt}']))([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*)\\s*)(?:((?:(?!deriving)(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*|(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:(?!deriving)(?:[\\w()'→⇒\\[\\],]|->|=>)+\\s*)+))(?:(?:\\s+)(?:(?!deriving)(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*|(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:(?!deriving)(?:[\\w()'→⇒\\[\\],]|->|=>)+\\s*)+)))*)?))",
     "typeDeclOne": "(?:(?!(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?<![\\p{Ll}_\\p{Lu}\\p{Lt}']))where(?:(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])))(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*|(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*))",
@@ -89,11 +89,6 @@
         {
           "begin": "(^[ \\t]+)?(?=--+\\s+[|^])",
           "end": "(?!\\G)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.whitespace.comment.leading.haskell"
-            }
-          },
           "patterns": [
             {
               "name": "comment.line.double-dash.haddock.haskell",
@@ -111,13 +106,8 @@
           ]
         },
         {
-          "begin": "(^[ \\t]+)?(?=--+(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]))",
+          "begin": "(^[ \\t]+)?(?=--+(?!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))))",
           "end": "(?!\\G)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.whitespace.comment.leading.haskell"
-            }
-          },
           "patterns": [
             {
               "name": "comment.line.double-dash.haskell",
@@ -160,7 +150,7 @@
       "patterns": [
         {
           "name": "entity.name.function.infix.haskell",
-          "match": "(?:\\((?!--+\\))[\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]+\\))"
+          "match": "(?:\\((?!--+\\))(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))+\\))"
         }
       ]
     },
@@ -170,6 +160,7 @@
           "name": "meta.declaration.exports.haskell",
           "begin": "\\(",
           "end": "\\)",
+          "applyEndPatternLast": 1,
           "patterns": [
             {
               "include": "#comments"
@@ -245,7 +236,7 @@
       "patterns": [
         {
           "name": "meta.function.type-declaration.haskell",
-          "begin": "^([ \\t]*)(?:(?:((?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))[\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]+\\)))(?:(?:\\s*,\\s*)(?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))[\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]+\\))))*))(?:\\s*((?<![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])(?:::|∷)(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]))))",
+          "begin": "^([ \\t]*)(?:(?:((?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))+\\)))(?:(?:\\s*,\\s*)(?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))+\\))))*))(?:\\s*((?<!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))))))",
           "end": "^(?!\\1[ \\t]|[ \\t]*$)",
           "contentName": "meta.type-signature.haskell",
           "beginCaptures": {
@@ -275,7 +266,7 @@
       "patterns": [
         {
           "name": "meta.ctor.type-declaration.haskell",
-          "begin": "^([ \\t]*)(?:(?:((?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*|(?:\\((?!--+\\))[\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]+\\)))(?:(?:\\s*,\\s*)(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*|(?:\\((?!--+\\))[\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]+\\))))*))(?:\\s*((?<![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])(?:::|∷)(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]))))",
+          "begin": "^([ \\t]*)(?:(?:((?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*|(?:\\((?!--+\\))(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))+\\)))(?:(?:\\s*,\\s*)(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*|(?:\\((?!--+\\))(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))+\\))))*))(?:\\s*((?<!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))))))",
           "end": "^(?!\\1[ \\t]|[ \\t]*$)",
           "contentName": "meta.type-signature.haskell",
           "beginCaptures": {
@@ -305,8 +296,8 @@
       "patterns": [
         {
           "name": "meta.record-field.type-declaration.haskell",
-          "begin": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?<![\\p{Ll}_\\p{Lu}\\p{Lt}']))(?:(?:((?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))[\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]+\\)))(?:(?:\\s*,\\s*)(?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))[\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]+\\))))*))(?:\\s*((?<![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])(?:::|∷)(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]))))",
-          "end": "(?=(?:(?:((?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))[\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]+\\)))(?:(?:\\s*,\\s*)(?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))[\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]+\\))))*))(?:\\s*((?<![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])(?:::|∷)(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]))))|})",
+          "begin": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?<![\\p{Ll}_\\p{Lu}\\p{Lt}']))(?:(?:((?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))+\\)))(?:(?:\\s*,\\s*)(?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))+\\))))*))(?:\\s*((?<!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))))))",
+          "end": "(?=(?:(?:((?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))+\\)))(?:(?:\\s*,\\s*)(?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))+\\))))*))(?:\\s*((?<!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))))))|})",
           "contentName": "meta.type-signature.haskell",
           "beginCaptures": {
             "1": {
@@ -354,11 +345,11 @@
         },
         {
           "name": "keyword.other.arrow.haskell",
-          "match": "(?<![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])(->|→)(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])"
+          "match": "(?<!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))(->|→)(?!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))"
         },
         {
           "name": "keyword.other.big-arrow.haskell",
-          "match": "(?<![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])(=>|⇒)(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])"
+          "match": "(?<!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))(=>|⇒)(?!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))"
         },
         {
           "include": "#operator"
@@ -880,7 +871,7 @@
       "patterns": [
         {
           "name": "string.quoted.single.haskell",
-          "match": "(')((?:[\\ -\\[\\]-~]|\\\\(?:NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|[abfnrtv\\\\\\\"'\\&])|(?:\\\\o[0-7]+)|(?:\\\\x[0-9A-Fa-f]+)|(?:\\\\\\^[A-Z@\\[\\]\\\\^_])|[\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]))(')",
+          "match": "(')((?:[\\ -\\[\\]-~]|\\\\(?:NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|[abfnrtv\\\\\\\"'\\&])|(?:\\\\o[0-7]+)|(?:\\\\x[0-9A-Fa-f]+)|(?:\\\\\\^[A-Z@\\[\\]\\\\^_])|(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))))(')",
           "captures": {
             "1": {
               "name": "punctuation.definition.string.begin.haskell"
@@ -902,7 +893,7 @@
     "scoped_type": {
       "patterns": [
         {
-          "match": "\\(((?<paren>(?:[^\\(\\)]|\\(\\g<paren>\\))*)(?<![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])(?:::|∷)(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])(?<paren2>(?:[^\\(\\)]|\\(\\g<paren2>\\))*))\\)",
+          "match": "\\(((?<paren>(?:[^\\(\\)]|\\(\\g<paren>\\))*)(?<!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))(?<paren2>(?:[^\\(\\)]|\\(\\g<paren2>\\))*))\\)",
           "captures": {
             "1": {
               "patterns": [
@@ -914,7 +905,7 @@
           }
         },
         {
-          "match": "((?<![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])(?:::|∷)(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]))(.*?)(?=(?<![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])(<-|=)(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])|$)",
+          "match": "((?<!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))))(.*?)(?=(?<!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))(<-|=)(?!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))|$)",
           "captures": {
             "1": {
               "name": "keyword.other.double-colon.haskell"
@@ -934,7 +925,7 @@
     "scoped_type_override": {
       "patterns": [
         {
-          "match": "^([ \\t]*)(?:(?:((?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))[\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]+\\)))(?:(?:\\s*,\\s*)(?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))[\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]+\\))))*))(?:\\s*((?<![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])(?:::|∷)(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]))))(.*)(?<![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])(<-|=)(?![\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']])",
+          "match": "^([ \\t]*)(?:(?:((?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))+\\)))(?:(?:\\s*,\\s*)(?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))+\\))))*))(?:\\s*((?<!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))))))(.*)(?<!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))(<-|=)(?!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))",
           "captures": {
             "2": {
               "patterns": [
@@ -1000,7 +991,7 @@
       "patterns": [
         {
           "name": "keyword.operator.haskell",
-          "match": "[\\p{S}\\p{P}&&[^(),;\\[\\]`{}_\"']]+"
+          "match": "(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))+"
         }
       ]
     },

data/grammars/source.js.json

@@ -21,13 +21,13 @@
   "name": "JavaScript",
   "patterns": [
     {
-      "begin": "(?<!\\.)\\b(import)(?:\\s*$|(?!\\s*[:(])\\b)",
+      "begin": "(?<!\\.)\\b(import)(?!\\s*[:(])\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.js"
         }
       },
-      "end": "(?=;)",
+      "end": "(?=;|$)",
       "name": "meta.import.js",
       "patterns": [
         {
@@ -45,38 +45,32 @@
           },
           "patterns": [
             {
-              "match": "\\bdefault\\b",
-              "name": "variable.language.default.js"
-            },
-            {
-              "include": "#comments"
-            },
-            {
-              "begin": "\\bas\\b",
-              "beginCaptures": {
-                "0": {
-                  "name": "keyword.control.js"
-                }
-              },
-              "end": "(?=[;}]|/\\*)|(?:(\\bdefault\\b|\\*)|([a-zA-Z_$][\\w$]*))",
-              "endCaptures": {
+              "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"
+                  "name": "variable.language.default.js"
                 },
                 "2": {
+                  "name": "variable.other.module.js"
+                },
+                "3": {
+                  "name": "keyword.control.js"
+                },
+                "4": {
+                  "name": "invalid.illegal.js"
+                },
+                "5": {
                   "name": "variable.other.module-alias.js"
                 }
-              },
-              "patterns": [
-                {
-                  "include": "#comments"
-                }
-              ]
+              }
             },
             {
               "match": ",",
               "name": "meta.delimiter.object.comma.js"
             },
+            {
+              "include": "#comments"
+            },
             {
               "match": "\\b([a-zA-Z_$][\\w$]*)\\b",
               "name": "variable.other.module.js"
@@ -84,30 +78,36 @@
           ]
         },
         {
-          "match": "\\bdefault\\b",
-          "name": "variable.language.default.js"
-        },
-        {
-          "match": "\\*",
-          "name": "variable.language.import-all.js"
-        },
-        {
-          "begin": "\\bas\\b",
-          "beginCaptures": {
-            "0": {
-              "name": "keyword.control.js"
-            }
-          },
-          "end": "(?=[;}]|/\\*)|(?:(\\bdefault\\b|\\*)|([a-zA-Z_$][\\w$]*))",
-          "endCaptures": {
+          "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"
+              "name": "variable.language.default.js"
             },
             "2": {
+              "name": "variable.language.import-all.js"
+            },
+            "3": {
+              "name": "variable.other.module.js"
+            },
+            "4": {
+              "name": "keyword.control.js"
+            },
+            "5": {
+              "name": "invalid.illegal.js"
+            },
+            "6": {
               "name": "variable.other.module-alias.js"
             }
           }
         },
+        {
+          "match": "\\*",
+          "name": "variable.language.import-all.js"
+        },
+        {
+          "match": "\\b(default)\\b",
+          "name": "variable.language.default.js"
+        },
         {
           "include": "#strings"
         },
@@ -119,7 +119,7 @@
           "name": "keyword.control.js"
         },
         {
-          "match": "\\b([a-zA-Z_$][\\w$]*)\\b",
+          "match": "\\b([a-zA-Z_$][\\w$]*)\\b(?=.*\\bfrom\\b)",
           "name": "variable.other.module.js"
         },
         {
@@ -290,7 +290,7 @@
       ]
     },
     {
-      "match": "(?<!\\.)\\b(?<!\\$)(super|this|arguments)(?!\\s*:|\\$)\\b",
+      "match": "(?:(?<=\\.{3})|(?<!\\.)\\b)(?<!\\$)(super|this|arguments)(?!\\s*:|\\$)\\b",
       "name": "variable.language.js"
     },
     {
@@ -824,7 +824,7 @@
       "begin": "(?<!\\.)\\b(const)(?!\\s*:)\\b",
       "beginCaptures": {
         "1": {
-          "name": "storage.modifier.js"
+          "name": "storage.type.const.js"
         }
       },
       "end": "(\\bof\\b|\\bin\\b)|(;)|(=)|(?<![,{])\\n",
@@ -1762,7 +1762,7 @@
           "name": "other.meta.jsdoc"
         },
         {
-          "match": "(?x)\n(?:(?<=@param)|(?<=@arg)|(?<=@argument)|(?<=@type))\n\\s+\n({(?:\n  \\* |                                       # {*} any type\n  \\? |                                       # {?} unknown type\n\n  (?:\n    (?:                                       # Check for a prefix\n      \\? |                                   # {?string} nullable type\n      !   |                                   # {!string} non-nullable type\n      \\.{3}                                  # {...string} variable number of parameters\n    )?\n\n    (?:\n      (?:\n        function                              # {function(string, number)} function type\n        \\s*\n        \\(\n        \\s*\n        (?:\n          [a-zA-Z_$][\\w$]*\n          (?:\n            \\s*,\\s*\n            [a-zA-Z_$][\\w$]*\n          )*\n        )?\n        \\s*\n        \\)\n        (?:                                   # {function(): string} function return type\n          \\s*:\\s*\n          [a-zA-Z_$][\\w$]*\n        )?\n      )?\n      |\n      (?:\n        \\(                                   # Opening bracket of multiple types with parenthesis {(string|number)}\n          [a-zA-Z_$]+\n          (?:\n            (?:\n              [\\w$]*\n              (?:\\[\\])?                     # {(string[]|number)} type application, an array of strings or a number\n            ) |\n            \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>    # {Array<string>} or {Object<string, number>} type application (optional .)\n          )\n          (?:\n            [\\.|~]                           # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback\n            [a-zA-Z_$]+\n            (?:\n              (?:\n                [\\w$]*\n                (?:\\[\\])?                   # {(string|number[])} type application, a string or an array of numbers\n              ) |\n              \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>  # {Array<string>} or {Object<string, number>} type application (optional .)\n            )\n          )*\n        \\) |\n        [a-zA-Z_$]+\n        (?:\n          (?:\n            [\\w$]*\n            (?:\\[\\])?                       # {(string|number[])} type application, a string or an array of numbers\n          ) |\n          \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>      # {Array<string>} or {Object<string, number>} type application (optional .)\n        )\n        (?:\n          [\\.|~]                             # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback\n          [a-zA-Z_$]+\n          (?:\n            [\\w$]* |\n            \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>    # {Array<string>} or {Object<string, number>} type application (optional .)\n          )\n        )*\n      )\n    )\n                                              # Check for suffix\n    (?:\\[\\])?                               # {string[]} type application, an array of strings\n    =?                                        # {string=} optional parameter\n  )\n)})\n\\s+\n(\n  \\[                                         # [foo] optional parameter\n    \\s*\n    (?:\n      [a-zA-Z_$][\\w$]*\n      (?:\n        (?:\\[\\])?                           # Foo[].bar properties within an array\n        \\.                                   # Foo.Bar namespaced parameter\n        [a-zA-Z_$][\\w$]*\n      )*\n      (?:\n        \\s*\n        =                                     # [foo=bar] Default parameter value\n        \\s*\n        (?:\n          [\\w$\\s]* |                        # [foo=bar] Unquoted\n          \"[^\"]*\"    |                        # [foo=\"bar\"] Double-quoted\n          '[^']*'                             # [foo='bar'] Single-quoted\n        )\n      )?\n    )\n    \\s*\n  \\] |\n  (?:\n    [a-zA-Z_$][\\w$]*\n    (?:\n      (?:\\[\\])?                             # Foo[].bar properties within an array\n      \\.                                     # Foo.Bar namespaced parameter\n      [a-zA-Z_$][\\w$]*\n    )*\n  )?\n)\n\\s+\n(?:-\\s+)?                                     # optional hyphen before the description\n((?:(?!\\*\\/).)*)                             # The type description",
+          "match": "(?x)\n(?:(?<=@param)|(?<=@arg)|(?<=@argument)|(?<=@type))\n\\s+\n({(?:\n  \\* |                                       # {*} any type\n  \\? |                                       # {?} unknown type\n\n  (?:\n    (?:                                       # Check for a prefix\n      \\? |                                   # {?string} nullable type\n      !   |                                   # {!string} non-nullable type\n      \\.{3}                                  # {...string} variable number of parameters\n      [*?]?                                   # {...*} Variable number of mixed types\n    )?\n\n    (?:\n      (?:\n        function                              # {function(string, number)} function type\n        \\s*\n        (?:\n          (?:\n            \\(\\s*\n            \\.{3}[a-zA-Z_$][\\w$]+           # {function(...string)} variable number of parameters\n            \\s*\\)\n          )\n          |\n          (?:\n            \\(\\s*\n            (?:\n              (?:\\?|!)?                      # {function(?string)} or function(!string)} nullable/non-nullable type\n              [a-zA-Z_$][\\w$]+\n              (?:\\[\\])?                     # {function(string[])} type application, an array of strings\n              (?:\n                (?:\n                  (?:\n                    \\s*,\\s*\n                    (?:\\?|!)?                # {function(?string)} or function(!string)} nullable/non-nullable type\n                    [a-zA-Z_$][\\w$]+\n                    (?:\\[\\])?               # {function(string[])} type application, an array of strings\n                  )*\n                  (?:\n                    \\s*,\\s*\n                    \\.{3}[a-zA-Z_$][\\w$]+   # {function(string, ...string)} variable number of parameters\n                  )?\n                )\n                |\n                (?:\n                  =?                          # {function(string=)} optional parameter\n                  (?:\n                    (?<!=)                    # {function(string, string, number)} loop non-optional params\n                    \\s*,\\s*\n                    (?:\\?|!)?                # {function(?string)} or function(!string)} nullable/non-nullable type\n                    [a-zA-Z_$][\\w$]+\n                    (?:\\[\\])?               # {function(string[])} type application, an array of strings\n                    =?\n                  )*\n                  (?:\n                    (?<==)                    # {function(string, string=, number=)} loop optional params\n                    \\s*,\\s*\n                    (?:\\?|!)?                # {function(?string)} or function(!string)} nullable/non-nullable type\n                    [a-zA-Z_$][\\w$]+\n                    (?:\\[\\])?               # {function(string[])} type application, an array of strings\n                    =\n                  )*\n                )\n              )\n            )?\n            \\s*\\)\n          )\n        )\n        (?:                                   # {function(): string} function return type\n          \\s*:\\s*\n          [a-zA-Z_$][\\w$]*\n        )?\n      )?\n      |\n      (?:\n        \\(                                   # Opening bracket of multiple types with parenthesis {(string|number)}\n          [a-zA-Z_$]+\n          (?:\n            (?:\n              [\\w$]*\n              (?:\\[\\])?                     # {(string[]|number)} type application, an array of strings or a number\n            ) |\n            \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>    # {Array<string>} or {Object<string, number>} type application (optional .)\n          )\n          (?:\n            [\\.|~]                           # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback\n            [a-zA-Z_$]+\n            (?:\n              (?:\n                [\\w$]*\n                (?:\\[\\])?                   # {(string|number[])} type application, a string or an array of numbers\n              ) |\n              \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>  # {Array<string>} or {Object<string, number>} type application (optional .)\n            )\n          )*\n        \\) |\n        [a-zA-Z_$]+\n        (?:\n          (?:\n            [\\w$]*\n            (?:\\[\\])?                       # {(string|number[])} type application, a string or an array of numbers\n          ) |\n          \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>      # {Array<string>} or {Object<string, number>} type application (optional .)\n        )\n        (?:\n          [\\.|~]                             # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback\n          [a-zA-Z_$]+\n          (?:\n            [\\w$]* |\n            \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>    # {Array<string>} or {Object<string, number>} type application (optional .)\n          )\n        )*\n      )\n    )\n                                              # Check for suffix\n    (?:\\[\\])?                               # {string[]} type application, an array of strings\n    =?                                        # {string=} optional parameter\n  )\n)})\n\\s+\n(\n  \\[                                         # [foo] optional parameter\n    \\s*\n    (?:\n      [a-zA-Z_$][\\w$]*\n      (?:\n        (?:\\[\\])?                           # Foo[].bar properties within an array\n        \\.                                   # Foo.Bar namespaced parameter\n        [a-zA-Z_$][\\w$]*\n      )*\n      (?:\n        \\s*\n        =                                     # [foo=bar] Default parameter value\n        \\s*\n        (?:\n          [\\w$\\s]* |                        # [foo=bar] Unquoted\n          \"[^\"]*\"    |                        # [foo=\"bar\"] Double-quoted\n          '[^']*'    |                        # [foo='bar'] Single-quoted\n          {[^{}]*}   |                        # [foo={a:1}] Object literal\n          \\[ [^\\[\\]]* \\]                  # [foo=[1,2]] Array literal\n        )\n      )?\n    )\n    \\s*\n  \\] |\n  (?:\n    [a-zA-Z_$][\\w$]*\n    (?:\n      (?:\\[\\])?                             # Foo[].bar properties within an array\n      \\.                                     # Foo.Bar namespaced parameter\n      [a-zA-Z_$][\\w$]*\n    )*\n  )?\n)\n\\s+\n(?:-\\s+)?                                     # optional hyphen before the description\n((?:(?!\\*\\/).)*)                             # The type description",
           "captures": {
             "0": {
               "name": "other.meta.jsdoc"
@@ -1784,7 +1784,7 @@
           }
         },
         {
-          "match": "(?x)\n({(?:\n  \\* |                                       # {*} any type\n  \\? |                                       # {?} unknown type\n\n  (?:\n    (?:                                       # Check for a prefix\n      \\? |                                   # {?string} nullable type\n      !   |                                   # {!string} non-nullable type\n      \\.{3}                                  # {...string} variable number of parameters\n    )?\n\n    (?:\n      (?:\n        function                              # {function(string, number)} function type\n        \\s*\n        \\(\n        \\s*\n        (?:\n          [a-zA-Z_$][\\w$]*\n          (?:\n            \\s*,\\s*\n            [a-zA-Z_$][\\w$]*\n          )*\n        )?\n        \\s*\n        \\)\n        (?:                                   # {function(): string} function return type\n          \\s*:\\s*\n          [a-zA-Z_$][\\w$]*\n        )?\n      )?\n      |\n      (?:\n        \\(                                   # Opening bracket of multiple types with parenthesis {(string|number)}\n          [a-zA-Z_$]+\n          (?:\n            [\\w$]* |\n            \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>    # {Array<string>} or {Object<string, number>} type application (optional .)\n          )\n          (?:\n            [\\.|~]                           # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback\n            [a-zA-Z_$]+\n            (?:\n              [\\w$]* |\n              \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>  # {Array<string>} or {Object<string, number>} type application (optional .)\n            )\n          )*\n        \\) |\n        [a-zA-Z_$]+\n        (?:\n          [\\w$]* |\n          \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>      # {Array<string>} or {Object<string, number>} type application (optional .)\n        )\n        (?:\n          [\\.|~]                             # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback\n          [a-zA-Z_$]+\n          (?:\n            [\\w$]* |\n            \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>    # {Array<string>} or {Object<string, number>} type application (optional .)\n          )\n        )*\n      )\n    )\n                                              # Check for suffix\n    (?:\\[\\])?                               # {string[]} type application, an array of strings\n    =?                                        # {string=} optional parameter\n  )\n)})\n\\s+\n(?:-\\s+)?                                    # optional hyphen before the description\n((?:(?!\\*\\/).)*)                            # The type description",
+          "match": "(?x)\n({(?:\n  \\* |                                       # {*} any type\n  \\? |                                       # {?} unknown type\n\n  (?:\n    (?:                                       # Check for a prefix\n      \\? |                                   # {?string} nullable type\n      !   |                                   # {!string} non-nullable type\n      \\.{3}                                  # {...string} variable number of parameters\n      [*?]?                                   # {...*} Variable number of mixed types\n    )?\n\n    (?:\n      (?:\n        function                              # {function(string, number)} function type\n        \\s*\n        (?:\n          (?:\n            \\(\\s*\n            \\.{3}[a-zA-Z_$][\\w$]+           # {function(...string)} variable number of parameters\n            \\s*\\)\n          )\n          |\n          (?:\n            \\(\\s*\n            (?:\n              (?:\\?|!)?                      # {function(?string)} or function(!string)} nullable/non-nullable type\n              [a-zA-Z_$][\\w$]+\n              (?:\\[\\])?                     # {function(string[])} type application, an array of strings\n              (?:\n                (?:\n                  (?:\n                    \\s*,\\s*\n                    (?:\\?|!)?                # {function(?string)} or function(!string)} nullable/non-nullable type\n                    [a-zA-Z_$][\\w$]+\n                    (?:\\[\\])?               # {function(string[])} type application, an array of strings\n                  )*\n                  (?:\n                    \\s*,\\s*\n                    \\.{3}[a-zA-Z_$][\\w$]+   # {function(string, ...string)} variable number of parameters\n                  )?\n                )\n                |\n                (?:\n                  =?                          # {function(string=)} optional parameter\n                  (?:\n                    (?<!=)                    # {function(string, string, number)} loop non-optional params\n                    \\s*,\\s*\n                    (?:\\?|!)?                # {function(?string)} or function(!string)} nullable/non-nullable type\n                    [a-zA-Z_$][\\w$]+\n                    (?:\\[\\])?               # {function(string[])} type application, an array of strings\n                    =?\n                  )*\n                  (?:\n                    (?<==)                    # {function(string, string=, number=)} loop optional params\n                    \\s*,\\s*\n                    (?:\\?|!)?                # {function(?string)} or function(!string)} nullable/non-nullable type\n                    [a-zA-Z_$][\\w$]+\n                    (?:\\[\\])?               # {function(string[])} type application, an array of strings\n                    =\n                  )*\n                )\n              )\n            )?\n            \\s*\\)\n          )\n        )\n        (?:                                   # {function(): string} function return type\n          \\s*:\\s*\n          [a-zA-Z_$][\\w$]*\n        )?\n      )?\n      |\n      (?:\n        \\(                                   # Opening bracket of multiple types with parenthesis {(string|number)}\n          [a-zA-Z_$]+\n          (?:\n            (?:\n              [\\w$]*\n              (?:\\[\\])?                     # {(string[]|number)} type application, an array of strings or a number\n            ) |\n            \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>    # {Array<string>} or {Object<string, number>} type application (optional .)\n          )\n          (?:\n            [\\.|~]                           # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback\n            [a-zA-Z_$]+\n            (?:\n              (?:\n                [\\w$]*\n                (?:\\[\\])?                   # {(string|number[])} type application, a string or an array of numbers\n              ) |\n              \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>  # {Array<string>} or {Object<string, number>} type application (optional .)\n            )\n          )*\n        \\) |\n        [a-zA-Z_$]+\n        (?:\n          (?:\n            [\\w$]*\n            (?:\\[\\])?                       # {(string|number[])} type application, a string or an array of numbers\n          ) |\n          \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>      # {Array<string>} or {Object<string, number>} type application (optional .)\n        )\n        (?:\n          [\\.|~]                             # {Foo.bar} namespaced, {string|number} multiple, {Foo~bar} class-specific callback\n          [a-zA-Z_$]+\n          (?:\n            [\\w$]* |\n            \\.?<[\\w$]+(?:,\\s+[\\w$]+)*>    # {Array<string>} or {Object<string, number>} type application (optional .)\n          )\n        )*\n      )\n    )\n                                              # Check for suffix\n    (?:\\[\\])?                               # {string[]} type application, an array of strings\n    =?                                        # {string=} optional parameter\n  )\n)})\n\\s+\n(?:-\\s+)?                                    # optional hyphen before the description\n((?:(?!\\*\\/).)*)                            # The type description",
           "captures": {
             "0": {
               "name": "other.meta.jsdoc"

data/grammars/source.mask.json

@@ -662,7 +662,7 @@
       "name": "slot.mask",
       "patterns": [
         {
-          "match": "\\b(static|private|public|async)\\b",
+          "match": "\\b(static|private|public|async|self)\\b",
           "name": "keyword"
         },
         {

data/grammars/source.perl6fe.json

@@ -10,9 +10,10 @@
     "pod6",
     "nqp"
   ],
+  "firstLineMatch": "(?x) ^ \\s* (?: use \\s v6 | =begin \\s pod | =comment | \\#!(?: perl6|/.*perl6 (?! \\S)) | my\\s*class )",
   "patterns": [
     {
-      "begin": "^(=)(finish)",
+      "begin": "^\\s*(=)(finish)",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.block.finish.perl6fe"
@@ -32,7 +33,7 @@
       "include": "#comment-block-delimited"
     },
     {
-      "begin": "^(=)(?:(para)|(for)\\s+(\\w+))",
+      "begin": "^\\s*(=)(?:(para)|(for)\\s+(\\w+))",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.block.paragraph.perl6fe"
@@ -44,7 +45,7 @@
           "name": "entity.other.attribute-name.paragraph.perl6fe"
         }
       },
-      "end": "^\\s*$",
+      "end": "(?=^\\s*$|^\\s*=\\w+.*$)",
       "contentName": "comment.block.paragraph.perl6fe",
       "patterns": [
         {
@@ -71,93 +72,349 @@
       "name": "meta.documentation.block.declarator.perl6fe"
     },
     {
-      "begin": "#`\\(\\(",
+      "begin": "\\s*#`\\(\\(\\(",
+      "end": "\\)\\)\\)",
+      "name": "comment.multiline.hash-tick.triple_paren.perl6fe",
+      "patterns": [
+        {
+          "begin": "\\(\\(\\(",
+          "end": "\\)\\)\\)",
+          "name": "comment.internal.triple_paren.perl6fe"
+        }
+      ]
+    },
+    {
+      "begin": "\\s*#`\\[\\[\\[",
+      "end": "\\]\\]\\]",
+      "name": "comment.multiline.hash-tick.triple_bracket.perl6fe",
+      "patterns": [
+        {
+          "begin": "\\[\\[\\[",
+          "end": "\\]\\]\\]",
+          "name": "comment.internal.triple_bracket.perl6fe"
+        }
+      ]
+    },
+    {
+      "begin": "\\s*#`\\{\\{\\{",
+      "end": "\\}\\}\\}",
+      "name": "comment.multiline.hash-tick.triple_brace.perl6fe",
+      "patterns": [
+        {
+          "begin": "\\{\\{\\{",
+          "end": "\\}\\}\\}",
+          "name": "comment.internal.triple_brace.perl6fe"
+        }
+      ]
+    },
+    {
+      "begin": "\\s*#`<<<",
+      "end": ">>>",
+      "name": "comment.multiline.hash-tick.triple_angle.perl6fe",
+      "patterns": [
+        {
+          "begin": "<<<",
+          "end": ">>>",
+          "name": "comment.internal.triple_angle.perl6fe"
+        }
+      ]
+    },
+    {
+      "begin": "\\s*#`<<",
+      "end": ">>",
+      "name": "comment.multiline.hash-tick.double_angle.perl6fe",
+      "patterns": [
+        {
+          "begin": "<<",
+          "end": ">>",
+          "name": "comment.internal.double_angle.perl6fe"
+        }
+      ]
+    },
+    {
+      "begin": "\\s*#`\\(\\(",
       "end": "\\)\\)",
-      "name": "comment.multiline.hash-tick.doubleparens.perl6fe",
+      "name": "comment.multiline.hash-tick.double_paren.perl6fe",
       "patterns": [
         {
           "begin": "\\(\\(",
           "end": "\\)\\)",
-          "name": "comment.internal.doubleparens.perl6fe"
+          "name": "comment.internal.double_paren.perl6fe"
+        }
+      ]
+    },
+    {
+      "begin": "\\s*#`\\[\\[",
+      "end": "\\]\\]",
+      "name": "comment.multiline.hash-tick.double_bracket.perl6fe",
+      "patterns": [
+        {
+          "begin": "\\[\\[",
+          "end": "\\]\\]",
+          "name": "comment.internal.double_bracket.perl6fe"
+        }
+      ]
+    },
+    {
+      "begin": "\\s*#`{{",
+      "end": "}}",
+      "name": "comment.multiline.hash-tick.double_brace.perl6fe",
+      "patterns": [
+        {
+          "begin": "{{",
+          "end": "}}",
+          "name": "comment.internal.double_brace.perl6fe"
+        }
+      ]
+    },
+    {
+      "begin": "\\s*#`{",
+      "end": "}",
+      "name": "comment.multiline.hash-tick.brace.perl6fe",
+      "patterns": [
+        {
+          "begin": "{",
+          "end": "}",
+          "name": "comment.internal.brace.perl6fe"
+        }
+      ]
+    },
+    {
+      "begin": "\\s*#`<",
+      "end": ">",
+      "name": "comment.multiline.hash-tick.angle.perl6fe",
+      "patterns": [
+        {
+          "begin": "<",
+          "end": ">",
+          "name": "comment.internal.angle.perl6fe"
         }
       ]
     },
     {
-      "begin": "#`\\(",
+      "begin": "\\s*#`\\(",
       "end": "\\)",
-      "name": "comment.multiline.hash-tick.parens.perl6fe",
+      "name": "comment.multiline.hash-tick.paren.perl6fe",
       "patterns": [
         {
           "begin": "\\(",
           "end": "\\)",
-          "name": "comment.internal.parens.perl6fe"
+          "name": "comment.internal.paren.perl6fe"
         }
       ]
     },
     {
-      "begin": "#`\\[",
+      "begin": "\\s*#`\\[",
       "end": "\\]",
-      "name": "comment.multiline.hash-tick.brackets.perl6fe",
+      "name": "comment.multiline.hash-tick.bracket.perl6fe",
       "patterns": [
         {
           "begin": "\\[",
           "end": "\\]",
-          "name": "comment.internal.brackets.perl6fe"
+          "name": "comment.internal.bracket.perl6fe"
         }
       ]
     },
     {
-      "begin": "#`\\{\\{",
-      "end": "\\}\\}",
-      "name": "comment.multiline.hash-tick.doublebraces.perl6fe",
+      "begin": "\\s*#`“",
+      "end": "”",
+      "name": "comment.multiline.hash-tick.left_double_right_double.perl6fe",
       "patterns": [
         {
-          "begin": "\\{\\{",
-          "end": "\\}\\}",
-          "name": "comment.internal.doublebraces.perl6fe"
+          "begin": "“",
+          "end": "”",
+          "name": "comment.internal.left_double_right_double.perl6fe"
         }
       ]
     },
     {
-      "begin": "#`\\{",
-      "end": "\\}",
-      "name": "comment.multiline.hash-tick.braces.perl6fe",
+      "begin": "\\s*#`‘",
+      "end": "’",
+      "name": "comment.multiline.hash-tick.left_single_right_single.perl6fe",
       "patterns": [
         {
-          "begin": "\\{",
-          "end": "\\}",
-          "name": "comment.internal.braces.perl6fe"
+          "begin": "‘",
+          "end": "’",
+          "name": "comment.internal.left_single_right_single.perl6fe"
+        }
+      ]
+    },
+    {
+      "begin": "\\s*#`「",
+      "end": "」",
+      "name": "comment.multiline.hash-tick.fw_cornerbracket.perl6fe",
+      "patterns": [
+        {
+          "begin": "「",
+          "end": "」",
+          "name": "comment.internal.fw_cornerbracket.perl6fe"
+        }
+      ]
+    },
+    {
+      "begin": "\\s*#`｢",
+      "end": "｣",
+      "name": "comment.multiline.hash-tick.hw_cornerbracket.perl6fe",
+      "patterns": [
+        {
+          "begin": "｢",
+          "end": "｣",
+          "name": "comment.internal.hw_cornerbracket.perl6fe"
+        }
+      ]
+    },
+    {
+      "begin": "\\s*#`«",
+      "end": "»",
+      "name": "comment.multiline.hash-tick.chevron.perl6fe",
+      "patterns": [
+        {
+          "begin": "«",
+          "end": "»",
+          "name": "comment.internal.chevron.perl6fe"
+        }
+      ]
+    },
+    {
+      "begin": "\\s*#`⟅",
+      "end": "⟆",
+      "name": "comment.multiline.hash-tick.s-shaped-bag-delimiter.perl6fe",
+      "patterns": [
+        {
+          "begin": "⟅",
+          "end": "⟆",
+          "name": "comment.internal.s-shaped-bag-delimiter.perl6fe"
+        }
+      ]
+    },
+    {
+      "begin": "“",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.perl6fe"
+        }
+      },
+      "end": "”",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.perl6fe"
+        }
+      },
+      "name": "string.quoted.left_double_right_double.perl6fe",
+      "patterns": [
+        {
+          "match": "\\\\[“”abtnfre\\\\\\{\\}]",
+          "name": "constant.character.escape.perl6fe"
+        },
+        {
+          "include": "#interpolation"
+        },
+        {
+          "include": "source.quoting.perl6fe#q_left_double_right_double_string_content"
+        }
+      ]
+    },
+    {
+      "begin": "(?<=\\W|^)‘",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.perl6fe"
+        }
+      },
+      "end": "’",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.perl6fe"
+        }
+      },
+      "name": "string.quoted.single.left_single_right_single.perl6fe",
+      "patterns": [
+        {
+          "match": "\\\\[‘’\\\\]",
+          "name": "constant.character.escape.perl6fe"
+        },
+        {
+          "include": "source.quoting.perl6fe#q_left_single_right_single_string_content"
         }
       ]
     },
     {
-      "begin": "#`\\「",
-      "end": "\\」",
-      "name": "comment.multiline.hash-tick.fwcornerbracket.perl6fe",
+      "begin": "(?<=\\W|^)'",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.perl6fe"
+        }
+      },
+      "end": "'",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.perl6fe"
+        }
+      },
+      "name": "string.quoted.single.single.perl6fe",
       "patterns": [
         {
-          "begin": "\\「",
-          "end": "\\」",
-          "name": "comment.internal.fwcornerbracket.perl6fe"
+          "match": "\\\\['\\\\]",
+          "name": "constant.character.escape.perl6fe"
+        },
+        {
+          "include": "source.quoting.perl6fe#q_single_string_content"
         }
       ]
     },
     {
-      "begin": "#`\\｢",
-      "end": "\\｣",
-      "name": "comment.multiline.hash-tick.hwcornerbracket.perl6fe",
+      "begin": "\"",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.perl6fe"
+        }
+      },
+      "end": "\"",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.perl6fe"
+        }
+      },
+      "name": "string.quoted.double.perl6fe",
       "patterns": [
         {
-          "begin": "\\｢",
-          "end": "\\｣",
-          "name": "comment.internal.hwcornerbracket.perl6fe"
+          "match": "\\\\[\"abtnfre\\\\\\{\\}]",
+          "name": "constant.character.escape.perl6fe"
+        },
+        {
+          "include": "#interpolation"
+        },
+        {
+          "include": "source.quoting.perl6fe#q_double_string_content"
         }
       ]
     },
     {
-      "begin": "(?<!\\+\\<)(?<=\\<)(?!\\=)(?=[^\\<]*[^\\<\\}]\\>)",
-      "end": "(?<!\\})(?=\\>)",
-      "name": "string.array.words.perl6fe"
+      "begin": "”",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.perl6fe"
+        }
+      },
+      "end": "”",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.perl6fe"
+        }
+      },
+      "name": "string.quoted.right_double_right_double.perl6fe",
+      "patterns": [
+        {
+          "match": "\\\\[”abtnfre\\\\\\{\\}]",
+          "name": "constant.character.escape.perl6fe"
+        },
+        {
+          "include": "#interpolation"
+        },
+        {
+          "include": "source.quoting.perl6fe#q_right_double_right_double_string_content"
+        }
+      ]
     },
     {
       "begin": "(^[ \\t]+)?(?=#)",
@@ -200,7 +457,29 @@
       "include": "#p5_regex"
     },
     {
-      "begin": "(?x) (?<=^|[\\=,\\(\\[\\~]|when) \\s* (?:(m|rx)((?:(?<!\\:P5)\\s*:\\w+(?!\\s*\\:P5))*))? \\s* (\\/)",
+      "match": "(?x)\n(?<=\n  ^\n | ^\\s\n | [\\s\\(] [^\\p{Nd}\\p{L}]\n)\n([/]) # Solidus\n(.*?) # Regex contents\n(?: (?<!\\\\)|(?<=\\\\\\\\) ) (/) # Ending",
+      "captures": {
+        "1": {
+          "name": "punctuation.definition.regexp.perl6fe"
+        },
+        "2": {
+          "name": "string.regexp.perl6fe",
+          "patterns": [
+            {
+              "include": "#interpolation"
+            },
+            {
+              "include": "source.regexp.perl6fe"
+            }
+          ]
+        },
+        "3": {
+          "name": "punctuation.definition.regexp.perl6fe"
+        }
+      }
+    },
+    {
+      "begin": "(?x)\n(?<= ^|\\s )\n(?:\n  (m|rx|s|S)\n  (\n    (?:\n      (?<!:P5) # < This can maybe be removed because we\n      \\s*:\\w+\n      (?!\\s*:P5) # < include p5_regex above it\n    )*\n  )\n)\n\\s*\n([^\\#\\p{Ps}\\p{Pe}\\p{Pi}\\p{Pf}\\w'\\-<>\\-]) # Whatever",
       "beginCaptures": {
         "1": {
           "name": "string.regexp.construct.perl6fe"
@@ -212,7 +491,7 @@
           "name": "punctuation.definition.regexp.perl6fe"
         }
       },
-      "end": "(?<!\\\\)(\\/)",
+      "end": "(?x) (?: (?<!\\\\)|(?<=\\\\\\\\) ) (\\3)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.regexp.perl6fe"
@@ -229,7 +508,7 @@
       ]
     },
     {
-      "begin": "(?<![\\w\\/])(m|rx)((?:\\s*:\\w+)*)\\s*(\\{)",
+      "begin": "(?x)\n(?<= ^|[=,(\\[~]|when|=> ) \\s*\n(?:\n  (m|rx)\n  (\n    (?:\n      (?<!:P5) # < This can maybe be removed because we\n      \\s*:\\w+\n      (?!\\s*:P5) # < include p5_regex above it\n    )*\n  )\n) # With the m or rx\n\\s*\n([/]) # Solidus",
       "beginCaptures": {
         "1": {
           "name": "string.regexp.construct.perl6fe"
@@ -241,7 +520,7 @@
           "name": "punctuation.definition.regexp.perl6fe"
         }
       },
-      "end": "(?<!\\\\)(\\})",
+      "end": "(?x) (?: (?<!\\\\)|(?<=\\\\\\\\) ) (/)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.regexp.perl6fe"
@@ -258,7 +537,7 @@
       ]
     },
     {
-      "begin": "(?<![\\w\\/])(m|rx)((?:\\s*:\\w+)*)\\s*(\\[)",
+      "begin": "(?<![\\w\\/])(m|rx)((?:\\s*:\\w+)*)\\s*(\\{)",
       "beginCaptures": {
         "1": {
           "name": "string.regexp.construct.perl6fe"
@@ -270,7 +549,7 @@
           "name": "punctuation.definition.regexp.perl6fe"
         }
       },
-      "end": "(?<!\\\\)(\\])",
+      "end": "(?<!\\\\)(\\})",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.regexp.perl6fe"
@@ -287,7 +566,7 @@
       ]
     },
     {
-      "begin": "(?<![\\w\\/])(m|rx)((?:\\s*:\\w+)*)\\s*(\\|)",
+      "begin": "(?<![\\w\\/])(m|rx)((?:\\s*:\\w+)*)\\s*(\\[)",
       "beginCaptures": {
         "1": {
           "name": "string.regexp.construct.perl6fe"
@@ -299,7 +578,7 @@
           "name": "punctuation.definition.regexp.perl6fe"
         }
       },
-      "end": "(?<!\\\\)(\\|)",
+      "end": "(?<!\\\\)(\\])",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.regexp.perl6fe"
@@ -316,484 +595,125 @@
       ]
     },
     {
-      "begin": "(?<![\\w\\/])(m|rx)((?:\\s*:\\w+)*)\\s*(\\!)",
+      "begin": "(?<=\\W|^)｢",
       "beginCaptures": {
-        "1": {
-          "name": "string.regexp.construct.perl6fe"
-        },
-        "2": {
-          "name": "entity.name.section.adverb.regexp.perl6fe"
-        },
-        "3": {
-          "name": "punctuation.definition.regexp.perl6fe"
+        "0": {
+          "name": "punctuation.definition.string.begin.perl6fe"
         }
       },
-      "end": "(?<!\\\\)(\\!)",
+      "end": "｣",
       "endCaptures": {
-        "1": {
-          "name": "punctuation.definition.regexp.perl6fe"
+        "0": {
+          "name": "punctuation.definition.string.end.perl6fe"
         }
       },
-      "contentName": "string.regexp.perl6fe",
+      "name": "string.quoted.single.perl6fe",
       "patterns": [
         {
-          "include": "#interpolation"
-        },
-        {
-          "include": "source.regexp.perl6fe"
+          "include": "source.quoting.perl6fe#q_hw_cornerbracket_string_content"
         }
       ]
     },
     {
-      "begin": "(?<![\\w\\/])(m|rx)((?:\\s*:\\w+)*)\\s*(~)",
+      "include": "#shellquotes"
+    },
+    {
+      "begin": "(?x) (?: ( qq|qqx|qqw ) \\s* ( (?:\\s*:\\w+)*\\s*: (?: to|heredoc ) )\\s* | (qqto) \\s* ( (?:\\s*:\\w+)* )\\s* ) / (\\S+) /",
       "beginCaptures": {
         "1": {
-          "name": "string.regexp.construct.perl6fe"
+          "name": "string.quoted.construct.perl6fe"
         },
         "2": {
-          "name": "entity.name.section.adverb.regexp.perl6fe"
+          "name": "support.function.adverb.perl6fe"
         },
         "3": {
-          "name": "punctuation.definition.regexp.perl6fe"
+          "name": "string.quoted.construct.perl6fe"
+        },
+        "4": {
+          "name": "support.function.adverb.perl6fe"
+        },
+        "5": {
+          "name": "entity.other.attribute-name.heredoc.delimiter.perl6fe"
         }
       },
-      "end": "(?<!\\\\)(\\~)",
+      "end": "\\s*\\5",
       "endCaptures": {
-        "1": {
-          "name": "punctuation.definition.regexp.perl6fe"
+        "0": {
+          "name": "entity.other.attribute-name.heredoc.delimiter.perl6fe"
         }
       },
-      "contentName": "string.regexp.perl6fe",
       "patterns": [
         {
           "include": "#interpolation"
         },
         {
-          "include": "source.regexp.perl6fe"
-        }
-      ]
-    },
-    {
-      "begin": "(?<=\\W|^)'",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.begin.perl6fe"
-        }
-      },
-      "end": "'",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.end.perl6fe"
-        }
-      },
-      "name": "string.quoted.single.perl6fe",
-      "patterns": [
-        {
-          "match": "\\\\['\\\\]",
-          "name": "constant.character.escape.perl6fe"
-        }
-      ]
-    },
-    {
-      "begin": "(?<=\\W|^)‘",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.begin.perl6fe"
-        }
-      },
-      "end": "’",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.end.perl6fe"
-        }
-      },
-      "name": "string.quoted.single.perl6fe",
-      "patterns": [
-        {
-          "match": "\\\\[‘’\\\\]",
-          "name": "constant.character.escape.perl6fe"
-        }
-      ]
-    },
-    {
-      "begin": "\"",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.begin.perl6fe"
-        }
-      },
-      "end": "\"",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.end.perl6fe"
-        }
-      },
-      "name": "string.quoted.double.perl6fe",
-      "patterns": [
-        {
-          "match": "\\\\[abtnfre\"\\\\\\{\\}]",
-          "name": "constant.character.escape.perl6fe"
-        },
-        {
-          "include": "#interpolation"
-        },
-        {
-          "include": "#special_variables"
-        }
-      ]
-    },
-    {
-      "begin": "“",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.begin.perl6fe"
-        }
-      },
-      "end": "”",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.end.perl6fe"
-        }
-      },
-      "name": "string.quoted.double.perl6fe",
-      "patterns": [
-        {
-          "match": "\\\\[abtnfre“”\\\\\\{\\}]",
-          "name": "constant.character.escape.perl6fe"
-        },
-        {
-          "include": "#interpolation"
-        },
-        {
-          "include": "#special_variables"
-        }
-      ]
-    },
-    {
-      "begin": "”",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.begin.perl6fe"
-        }
-      },
-      "end": "”",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.end.perl6fe"
-        }
-      },
-      "name": "string.quoted.double.perl6fe",
-      "patterns": [
-        {
-          "match": "\\\\[abtnfre”“\\\\\\{\\}]",
-          "name": "constant.character.escape.perl6fe"
-        },
-        {
-          "include": "#interpolation"
-        },
-        {
-          "include": "#special_variables"
-        }
-      ]
-    },
-    {
-      "include": "#shellquotes"
-    },
-    {
-      "include": "#heredocs"
-    },
-    {
-      "begin": "(?x) (q{1,2}(?:x|w|ww|v|s|a|h|f|c|b|p)?|Q(?:x|w|ww|v|s|a|h|f|c|b|p)?) ((?: \\s*:(?: x|exec|w|words|ww|quotewords|v|val|q|single|double| s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash| regexp|substr|trans|codes|p|path ) )*) \\s*({{)",
-      "beginCaptures": {
-        "1": {
-          "name": "string.quoted.q.operator.perl6fe"
-        },
-        "2": {
-          "name": "support.function.quote.adverb.perl6fe"
-        },
-        "3": {
-          "name": "punctuation.definition.string.perl6fe"
-        }
-      },
-      "end": "}}",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.perl6fe"
-        }
-      },
-      "contentName": "string.quoted.q.double.brace.perl6fe",
-      "patterns": [
-        {
-          "include": "#q_brace_string_content"
-        }
-      ]
-    },
-    {
-      "begin": "(?x) (q{1,2}(?:x|w|ww|v|s|a|h|f|c|b|p)?|Q(?:x|w|ww|v|s|a|h|f|c|b|p)?) ((?: \\s*:(?: x|exec|w|words|ww|quotewords|v|val|q|single|double| s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash| regexp|substr|trans|codes|p|path ) )*) \\s*(<<)",
-      "beginCaptures": {
-        "1": {
-          "name": "string.quoted.q.operator.perl6fe"
-        },
-        "2": {
-          "name": "support.function.quote.adverb.perl6fe"
-        },
-        "3": {
-          "name": "punctuation.definition.string.perl6fe"
-        }
-      },
-      "end": ">>",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.perl6fe"
-        }
-      },
-      "contentName": "string.quoted.q.double.angle.perl6fe",
-      "patterns": [
-        {
-          "include": "#q_angle_string_content"
-        }
-      ]
-    },
-    {
-      "begin": "(?x) (q{1,2}(?:x|w|ww|v|s|a|h|f|c|b|p)?|Q(?:x|w|ww|v|s|a|h|f|c|b|p)?) ((?: \\s*:(?: x|exec|w|words|ww|quotewords|v|val|q|single|double| s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash| regexp|substr|trans|codes|p|path ) )*) \\s*(\\(\\()",
-      "beginCaptures": {
-        "1": {
-          "name": "string.quoted.q.operator.perl6fe"
-        },
-        "2": {
-          "name": "support.function.quote.adverb.perl6fe"
-        },
-        "3": {
-          "name": "punctuation.definition.string.perl6fe"
-        }
-      },
-      "end": "\\)\\)",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.perl6fe"
-        }
-      },
-      "contentName": "string.quoted.q.double.paren.perl6fe",
-      "patterns": [
-        {
-          "include": "#q_paren_string_content"
-        }
-      ]
-    },
-    {
-      "begin": "(?x) (q{1,2}(?:x|w|ww|v|s|a|h|f|c|b|p)?|Q(?:x|w|ww|v|s|a|h|f|c|b|p)?) ((?: \\s*:(?: x|exec|w|words|ww|quotewords|v|val|q|single|double| s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash| regexp|substr|trans|codes|p|path ) )*) \\s*(\\[\\[)",
-      "beginCaptures": {
-        "1": {
-          "name": "string.quoted.q.operator.perl6fe"
-        },
-        "2": {
-          "name": "support.function.quote.adverb.perl6fe"
-        },
-        "3": {
-          "name": "punctuation.definition.string.perl6fe"
-        }
-      },
-      "end": "\\]\\]",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.perl6fe"
-        }
-      },
-      "contentName": "string.quoted.q.double.bracket.perl6fe",
-      "patterns": [
-        {
-          "include": "#q_bracket_string_content"
-        }
-      ]
-    },
-    {
-      "begin": "(?x) (q{1,2}(?:x|w|ww|v|s|a|h|f|c|b|p)?|Q(?:x|w|ww|v|s|a|h|f|c|b|p)?) ((?: \\s*:(?: x|exec|w|words|ww|quotewords|v|val|q|single|double| s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash| regexp|substr|trans|codes|p|path ) )*) \\s*({)",
-      "beginCaptures": {
-        "1": {
-          "name": "string.quoted.q.operator.perl6fe"
-        },
-        "2": {
-          "name": "support.function.quote.adverb.perl6fe"
-        },
-        "3": {
-          "name": "punctuation.definition.string.perl6fe"
-        }
-      },
-      "end": "}",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.perl6fe"
-        }
-      },
-      "contentName": "string.quoted.q.single.brace.perl6fe",
-      "patterns": [
-        {
-          "include": "#q_brace_string_content"
-        }
-      ]
-    },
-    {
-      "begin": "(?x) (q{1,2}(?:x|w|ww|v|s|a|h|f|c|b|p)?|Q(?:x|w|ww|v|s|a|h|f|c|b|p)?) ((?: \\s*:(?: x|exec|w|words|ww|quotewords|v|val|q|single|double| s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash| regexp|substr|trans|codes|p|path ) )*) \\s*(<)",
-      "beginCaptures": {
-        "1": {
-          "name": "string.quoted.q.operator.perl6fe"
-        },
-        "2": {
-          "name": "support.function.quote.adverb.perl6fe"
-        },
-        "3": {
-          "name": "punctuation.definition.string.perl6fe"
-        }
-      },
-      "end": ">",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.perl6fe"
-        }
-      },
-      "contentName": "string.quoted.q.single.angle.perl6fe",
-      "patterns": [
-        {
-          "include": "#q_angle_string_content"
-        }
-      ]
-    },
-    {
-      "begin": "(?x) (q{1,2}(?:x|w|ww|v|s|a|h|f|c|b|p)?|Q(?:x|w|ww|v|s|a|h|f|c|b|p)?) ((?: \\s*:(?: x|exec|w|words|ww|quotewords|v|val|q|single|double| s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash| regexp|substr|trans|codes|p|path ) )*) \\s*(/)",
-      "beginCaptures": {
-        "1": {
-          "name": "string.quoted.q.operator.perl6fe"
-        },
-        "2": {
-          "name": "support.function.quote.adverb.perl6fe"
-        },
-        "3": {
-          "name": "punctuation.definition.string.perl6fe"
-        }
-      },
-      "end": "/",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.perl6fe"
-        }
-      },
-      "contentName": "string.quoted.q.single.slash.perl6fe",
-      "patterns": [
-        {
-          "include": "#q_slash_string_content"
-        }
-      ]
-    },
-    {
-      "begin": "(?x) (q{1,2}(?:x|w|ww|v|s|a|h|f|c|b|p)?|Q(?:x|w|ww|v|s|a|h|f|c|b|p)?) ((?: \\s*:(?: x|exec|w|words|ww|quotewords|v|val|q|single|double| s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash| regexp|substr|trans|codes|p|path ) )*) \\s*(\\()",
-      "beginCaptures": {
-        "1": {
-          "name": "string.quoted.q.operator.perl6fe"
-        },
-        "2": {
-          "name": "support.function.quote.adverb.perl6fe"
-        },
-        "3": {
-          "name": "punctuation.definition.string.perl6fe"
-        }
-      },
-      "end": "\\)",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.perl6fe"
-        }
-      },
-      "contentName": "string.quoted.q.single.paren.perl6fe",
-      "patterns": [
-        {
-          "include": "#q_paren_string_content"
-        }
-      ]
-    },
-    {
-      "begin": "(?x) (q{1,2}(?:x|w|ww|v|s|a|h|f|c|b|p)?|Q(?:x|w|ww|v|s|a|h|f|c|b|p)?) ((?: \\s*:(?: x|exec|w|words|ww|quotewords|v|val|q|single|double| s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash| regexp|substr|trans|codes|p|path ) )*) \\s*(\\[)",
-      "beginCaptures": {
-        "1": {
-          "name": "string.quoted.q.operator.perl6fe"
-        },
-        "2": {
-          "name": "support.function.quote.adverb.perl6fe"
-        },
-        "3": {
-          "name": "punctuation.definition.string.perl6fe"
-        }
-      },
-      "end": "\\]",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.perl6fe"
-        }
-      },
-      "contentName": "string.quoted.q.single.bracket.perl6fe",
-      "patterns": [
+          "begin": "(?<=/)",
+          "end": "\\n",
+          "patterns": [
+            {
+              "include": "$self"
+            }
+          ],
+          "name": "meta.heredoc.continuation.perl6fe"
+        },
         {
-          "include": "#q_bracket_string_content"
+          "match": "(?x) ^ (?: . | \\n )* $",
+          "name": "string.quoted.qq.heredoc.perl6fe"
         }
-      ]
+      ],
+      "name": "meta.heredoc.perl6fe"
     },
     {
-      "begin": "(?x) (q{1,2}(?:x|w|ww|v|s|a|h|f|c|b|p)?|Q(?:x|w|ww|v|s|a|h|f|c|b|p)?) ((?: \\s*:(?: x|exec|w|words|ww|quotewords|v|val|q|single|double| s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash| regexp|substr|trans|codes|p|path ) )*) \\s*(')",
+      "begin": "(?x) (?: ( [qQ](?!/)|qw|qww|qx|qqx ) \\s* ( (?:\\s*:\\w+)*\\s*: (?: to|heredoc ) )\\s* | (qto|Qto) \\s* ( (?:\\s*:\\w+)* )\\s* ) / (\\S+) /",
       "beginCaptures": {
         "1": {
-          "name": "string.quoted.q.operator.perl6fe"
+          "name": "string.quoted.construct.perl6fe"
         },
         "2": {
-          "name": "support.function.quote.adverb.perl6fe"
+          "name": "support.function.adverb.perl6fe"
         },
         "3": {
-          "name": "punctuation.definition.string.perl6fe"
-        }
-      },
-      "end": "'",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.perl6fe"
-        }
-      },
-      "contentName": "string.quoted.q.single.apostrophe.perl6fe",
-      "patterns": [
-        {
-          "include": "#q_single_string_content"
-        }
-      ]
-    },
-    {
-      "begin": "(?x) (q{1,2}(?:x|w|ww|v|s|a|h|f|c|b|p)?|Q(?:x|w|ww|v|s|a|h|f|c|b|p)?) ((?: \\s*:(?: x|exec|w|words|ww|quotewords|v|val|q|single|double| s|scalar|a|array|h|hash|f|function|c|closure|b|blackslash| regexp|substr|trans|codes|p|path ) )*) \\s*(\")",
-      "beginCaptures": {
-        "1": {
-          "name": "string.quoted.q.operator.perl6fe"
+          "name": "string.quoted.construct.perl6fe"
         },
-        "2": {
-          "name": "support.function.quote.adverb.perl6fe"
+        "4": {
+          "name": "support.function.adverb.perl6fe"
         },
-        "3": {
-          "name": "punctuation.definition.string.perl6fe"
+        "5": {
+          "name": "entity.other.attribute-name.heredoc.delimiter.perl6fe"
         }
       },
-      "end": "\"",
+      "end": "\\s*\\5",
       "endCaptures": {
         "0": {
-          "name": "punctuation.definition.string.perl6fe"
+          "name": "entity.other.attribute-name.heredoc.delimiter.perl6fe"
         }
       },
-      "contentName": "string.quoted.q.single.quote.perl6fe",
       "patterns": [
         {
-          "include": "#q_double_string_content"
+          "begin": "(?<=/)",
+          "end": "\\n",
+          "patterns": [
+            {
+              "include": "$self"
+            }
+          ],
+          "name": "meta.heredoc.continuation.perl6fe"
+        },
+        {
+          "match": "(?x) ^ (?: . | \\n )* $",
+          "name": "string.quoted.q.heredoc.perl6fe"
         }
-      ]
+      ],
+      "name": "meta.heredoc.perl6fe"
+    },
+    {
+      "include": "source.quoting.perl6fe"
     },
     {
-      "match": "\\b\\$\\w+\\b",
-      "name": "variable.other.perl6fe"
+      "include": "#variables"
     },
     {
-      "begin": "(?x)(?<![%$&@]|\\w) (multi\\s+)? (macro|sub|submethod|method|multi|proto|only|category)\\s+ (!)?(?=\\w)",
+      "begin": "(?x) (?<![%$&@]|\\w) (?:  (multi) \\s+ )? (macro|sub|submethod|method|multi|proto|only|category) \\s+ (!)? (  [^\\s\\(\\)\\{\\}]+ )",
       "beginCaptures": {
         "1": {
           "name": "storage.type.declarator.multi.perl6fe"
@@ -803,13 +723,37 @@
         },
         "3": {
           "name": "support.class.method.private.perl6fe"
+        },
+        "4": {
+          "patterns": [
+            {
+              "match": "(?x) ( [\\p{Digit}\\p{Alpha}'\\-_]+ ) \\b (:)? (\\w+ \\b )? (\\S+  )?",
+              "captures": {
+                "1": {
+                  "name": "entity.name.function.perl6fe"
+                },
+                "2": {
+                  "name": "punctuation.definition.function.adverb.perl6fe"
+                },
+                "3": {
+                  "name": "support.type.class.adverb.perl6fe"
+                },
+                "4": {
+                  "patterns": [
+                    {
+                      "include": "$self"
+                    }
+                  ]
+                }
+              }
+            }
+          ]
         }
       },
-      "end": "\\s*(?=[\\(\\{])",
-      "contentName": "entity.name.function.perl6fe"
+      "end": "(?=[\\(\\{\\s])"
     },
     {
-      "begin": "(?<!\\.)(regex|rule|token)(?!\\s*=>)",
+      "begin": "(?<![\\.:])(regex|rule|token)(?!\\s*=>|\\S)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.declare.regexp.named.perl6fe"
@@ -824,7 +768,11 @@
       "name": "meta.regexp.named.perl6fe",
       "patterns": [
         {
-          "match": "\\w+",
+          "match": "TOP",
+          "name": "entity.name.function.regexp.named.TOP.perl6fe"
+        },
+        {
+          "match": "[\\p{Digit}\\p{Alpha}'\\-_]+",
           "name": "entity.name.function.regexp.named.perl6fe"
         },
         {
@@ -840,10 +788,15 @@
           "name": "meta.regexp.named.adverb.perl6fe"
         },
         {
-          "begin": "\\x{00AB}|\\<",
-          "end": "(\\x{00BB}|\\>)(?=[\\s\\{])",
+          "begin": "<",
+          "end": "(?x) \\\\\\\\|(?<!\\\\) ( > ) (?=[\\s\\{])",
           "contentName": "string.array.words.perl6fe"
         },
+        {
+          "begin": "«",
+          "end": "(?x)  \\\\\\\\|(?<!\\\\) ( » ) (?=[\\s\\{])",
+          "contentName": "string.array.words.chevron.perl6fe"
+        },
         {
           "begin": "\\(",
           "end": "(?<!\\\\)\\)",
@@ -896,19 +849,58 @@
       "name": "storage.modifier.declarator.perl6fe"
     },
     {
-      "match": "([+\\-.*/]|\\|\\|)?(?<!\\=)=(?![\\>\\=\\~])",
+      "begin": "(?x) (?<= = | for ) \\s* ( < )",
+      "beginCaptures": {
+        "1": {
+          "name": "span.keyword.operator.array.words.perl6fe"
+        }
+      },
+      "end": "(?x)  \\\\\\\\|(?<!\\\\) ( > )",
+      "endCaptures": {
+        "1": {
+          "name": "span.keyword.operator.array.words.perl6fe"
+        }
+      },
+      "contentName": "string.array.words.perl6fe",
+      "patterns": [
+        {
+          "include": "source.quoting.perl6fe#q_bracket_string_content"
+        }
+      ]
+    },
+    {
+      "match": "(?x) ( [+:\\-.*/] | \\|\\| )? (?<! = ) = (?! [>=~] )",
       "name": "storage.modifier.assignment.perl6fe"
     },
+    {
+      "begin": "(?x) (?<! \\+< | \\+\\s|\\+ ) \\s* (<) (?<! > ) (?= [^<]* (?: [^<] ) > )",
+      "beginCaptures": {
+        "1": {
+          "name": "span.keyword.operator.array.words.perl6fe"
+        }
+      },
+      "end": "(?x) \\\\\\\\|(?<!\\\\) ( > )",
+      "endCaptures": {
+        "1": {
+          "name": "span.keyword.operator.array.words.perl6fe"
+        }
+      },
+      "contentName": "string.array.words.perl6fe"
+    },
     {
       "match": "\\b(for|loop|repeat|while|until|gather|given)(?!\\-)\\b",
       "name": "keyword.control.repeat.perl6fe"
     },
     {
-      "match": "(?x)\\b(?<![\\-:])( take|do|when|next|last|redo|return|return-rw |contend|maybe|defer|default|exit |make|made|continue|break|goto|leave|supply |async|lift|await|start|react|whenever )(?!\\-)\\b",
+      "match": "(?x)\n\\b (?<! [\\-:.] )\n(\n   take|do|when|next|last|redo|return|return-rw\n  |contend|maybe|defer|default|exit\n  |continue|break|goto|leave|supply\n  |async|lift|await|start|react|whenever|parse\n)\n(?! - ) \\b",
       "name": "keyword.control.flowcontrol.perl6fe"
     },
     {
-      "match": "(?x)\\b(?<![\\-:])( is|does|as|but|trusts|of|returns|handles|where|augment|supersede )(?!\\-)\\b",
+      "match": "(?x)\n\\b (?<! [\\-:] )\n(\n  make|made\n)\n(?! - ) \\b",
+      "name": "keyword.control.flowcontrol.regex.perl6fe"
+    },
+    {
+      "match": "(?x)\\b(?<![\\-:]) (is|does|as|but|trusts|of|returns|handles|where|augment|supersede) (?!\\-)\\b (?!\\s*=>)",
       "name": "storage.modifier.type.constraints.perl6fe"
     },
     {
@@ -916,11 +908,11 @@
       "name": "keyword.control.closure.trait.perl6fe"
     },
     {
-      "match": "\\b(?<![\\-:])(die|fail|try|warn)(?!\\-)\\b",
+      "match": "\\b(?<![\\-:])(die|fail|try|warn)(?!\\-)\\b(?!\\s*=>)",
       "name": "keyword.control.control-handlers.perl6fe"
     },
     {
-      "match": "(?x)\\b(?<![\\-:])( prec|irs|ofs|ors|export|deep |binary|unary|reparsed|rw|parsed |cached|readonly|defequiv|will |ref|copy|inline|tighter|looser |equiv|assoc|required )(?!\\-)\\b",
+      "match": "(?x)\\b(?<![\\-:])( prec|irs|ofs|ors|export|raw|deep |binary|unary|reparsed|rw|parsed |cached|readonly|defequiv|will |ref|copy|inline|tighter|looser |equiv|assoc|required )(?!\\-)\\b  (?!\\s*=>)",
       "name": "entity.name.type.trait.perl6fe"
     },
     {
@@ -932,7 +924,7 @@
       "name": "constant.language.boolean.perl6fe"
     },
     {
-      "match": "(?x)\\b(?<![\\-:])( fatal|internals|MONKEY\\-TYPING|nqp| strict|trace|worries|invocant|parameters|experimental| cur|soft|variables|attributes|v6(?:\\.\\w)*|lib|Test|NativeCall )(?!\\-)\\b",
+      "match": "(?x)\\b(?<![\\-:])( fatal|internals|MONKEY\\-TYPING|nqp| strict|trace|worries|invocant|parameters|experimental| cur|soft|variables|attributes|v6(?:\\.\\w)*|lib|Test|NativeCall )(?!\\-) \\b (?!\\s*=>)",
       "name": "constant.language.pragma.perl6fe"
     },
     {
@@ -944,7 +936,7 @@
       }
     },
     {
-      "match": "(?x)\\b(?<!:)( AST|Any|Array|Associative|Attribute|Bag|BagHash|Baggy| Blob|Block|Bool|Callable|Capture|Channel|Code|Complex|Cool| CurrentThreadScheduler|Cursor|Date|DateTime|Dateish|Duration| Enum|FatRat|Grammar|Hash|IO|Instant|Iterable| Iterator|Junction|Label|List|Lock|Macro|Map|Match|Metamodel| Method|Mix|MixHash|Mixy|Mu|Nil|Numeric|ObjAt|Pair| Parameter|Pod|Positional|PositionalBindFailover|Proc|Promise| Proxy|QuantHash|Range|Rat|Rational|Real|Regex|Routine|Scheduler| Seq|Set|SetHash|Setty|Signature|Slip|Stash|Str|str|Stringy|Sub| Submethod|Supply|Tap|Temporal|Thread|ThreadPoolScheduler| Variable|Version|Whatever|WhateverCode|bool|size_t| Int|int|int1|int2|int4|int8|int16|int32|int64| Rat|rat|rat1|rat2|rat4|rat8|rat16|rat32|rat64| Buf|buf|buf1|buf2|buf4|buf8|buf16|buf32|buf64| UInt|uint|uint1|uint2|uint4|uint8|uint16|uint32|uint64| utf8|utf16|utf32|Num|num|num32|num64|IntStr|NumStr| RatStr|ComplexStr )(?!\\:\\:)\\b",
+      "match": "(?x)\\b(?<!:)( AST|Any|Array|Associative|Attribute|Bag|BagHash|Baggy| Blob|Block|Bool|Callable|Capture|Channel|Code|Complex|Cool| CurrentThreadScheduler|Cursor|Date|DateTime|Dateish|Duration| Enum|FatRat|Grammar|Hash|IO|Instant|Iterable| Iterator|Junction|Label|List|Lock|Macro|Map|Match|Metamodel| Method|Mix|MixHash|Mixy|Mu|Nil|Numeric|ObjAt|Pair| Parameter|Pod|Positional|PositionalBindFailover|Proc|Promise| Proxy|QuantHash|Range|Rat|Rational|Real|Regex|Routine|Scheduler| Seq|Set|SetHash|Setty|Signature|Slip|Stash|Str|str|Stringy|Sub| Submethod|Supply|Tap|Temporal|Thread|ThreadPoolScheduler| Variable|Version|Whatever|WhateverCode|bool|size_t| Int|int|int1|int2|int4|int8|int16|int32|int64| Rat|rat|rat1|rat2|rat4|rat8|rat16|rat32|rat64| Buf|buf|buf1|buf2|buf4|buf8|buf16|buf32|buf64| UInt|uint|uint1|uint2|uint4|uint8|uint16|uint32|uint64| utf8|utf16|utf32|Num|num|num32|num64|IntStr|NumStr| RatStr|ComplexStr|CArray|Pointer|long|longlong )\\b (?!\\s*=>)",
       "captures": {
         "1": {
           "name": "support.type.perl6fe"
@@ -954,6 +946,10 @@
         }
       }
     },
+    {
+      "match": "(?x) ( \\[ / \\] )",
+      "name": "keyword.operator.reduction.perl6fe"
+    },
     {
       "match": "(?<=\\w)(\\:)([DU_])\\b",
       "name": "meta.adverb.definedness.perl6fe",
@@ -971,22 +967,16 @@
       "name": "keyword.operator.word.perl6fe"
     },
     {
-      "match": "(=)(~)(=)",
+      "match": "(=~=|≅)",
       "captures": {
         "1": {
           "name": "keyword.operator.approx-equal.perl6fe"
-        },
-        "2": {
-          "name": "keyword.operator.approx-equal.perl6fe"
-        },
-        "3": {
-          "name": "keyword.operator.approx-equal.perl6fe"
         }
       },
       "name": "meta.operator.non.ligature.perl6fe"
     },
     {
-      "match": "(?x) <=> | => | --> | -> | \\+\\| | \\+\\+ | -- | \\*\\* | \\?\\?\\? | \\?\\? | \\!\\!\\! | \\!\\! | && | \\+\\^ | \\?\\^ | %% | \\+& | \\+< | \\+> | \\+\\^ | \\.\\.(?!\\.) | \\.\\.\\^ | \\^\\.\\. | \\^\\.\\.\\^ | \\?\\| | !=(?!\\=) | !==(?!\\=) | <=(?!>) | >= | === | == | =:= | ~~ | \\x{2245} | \\|\\| | \\^\\^ | \\/\\/ | := | ::= | \\.\\.\\.",
+      "match": "(?x) <== | <=> | => | --> | -> | \\+\\| | \\+\\+ | -- | \\*\\* | \\?\\?\\? | \\?\\? | \\!\\!\\! | \\!\\! | && | \\+\\^ | \\?\\^ | %% | \\+& | \\+< | \\+> | \\+\\^ | \\.\\.(?!\\.) | \\.\\.\\^ | \\^\\.\\. | \\^\\.\\.\\^ | \\?\\| | !=(?!\\=) | !==(?!\\=) | <=(?!>) | >= | === | == | =:= | ~~ | \\x{2245} | \\|\\| | \\^\\^ | \\/\\/ | := | ::= | \\.\\.\\.",
       "name": "keyword.operator.multi-symbol.perl6fe"
     },
     {
@@ -1012,22 +1002,32 @@
       "name": "constant.language.whatever.hack.perl6fe"
     },
     {
-      "include": "#variables"
+      "match": "(?x)\\b(?<![\\-:\\\\])( :: )?( eager|hyper|substr|index|rindex|grep|map|sort|join|lines|hints |chmod|split|reduce|min|max|reverse|truncate|zip|cat|roundrobin |classify|first|sum|keys|values|pairs|defined|delete|exists |elems|end|kv|any|all|one|wrap|shape|key|value|name|pop|push |shift|splice|unshift|floor|ceiling|abs|exp|log|log10|rand|sign |sqrt|sin|cos|tan|round|strand|roots|cis|unpolar|polar|atan2 |pick|chop|chomp|lc|lcfirst|uc|ucfirst|capitalize|mkdir |normalize|pack|unpack|quotemeta|comb|samecase|sameaccent|chars |nfd|nfc|nfkd|nfkc|printf|sprintf|caller|evalfile|run|runinstead |nothing|want|bless|chr|ord|ords|gmtime|time|eof|localtime|gethost |getpw|chroot|getlogin|getpeername|kill|fork|wait|perl|graphs |codes|bytes|clone|print|open|read|write|readline|say|seek|close |opendir|readdir|slurp|spurt|shell|run|pos|fmt|vec|link|unlink |symlink|unique|pair|asin|atan|sec|cosec|cotan|asec|acosec|acotan |sinh|cosh|tanh|asinh|done|acos|acosh|atanh|sech|cosech|cotanh |sech|acosech|acotanh|asech|ok|nok|plan-ok|dies-ok|lives-ok|skip |todo|pass|flunk|force-todo|use-ok|isa-ok|diag|is-deeply|isnt |like|skip-rest|unlike|cmp-ok|eval-dies-ok|nok-error|cmp-ok |eval-lives-ok|approx|is-approx|throws-ok|version-lt|plan|EVAL |succ|pred|times|nonce|once|signature|new|connect|operator|undef |undefine|sleep|from|to|infix|postfix|prefix|circumfix|can-ok |postcircumfix|minmax|lazy|count|unwrap|getc|pi|tau|context|void |quasi|body|each|contains|rewinddir|subst|can|isa|flush|arity |assuming|rewind|callwith|callsame|nextwith|nextsame|attr|does-ok |eval-elsewhere|none|not|srand|so|trim|trim-start|trim-end|lastcall |WHAT|WHY|WHERE|HOW|WHICH|VAR|WHO|WHENCE|ACCEPTS|REJECTS|not |iterator|by|re|im|invert|flip|gist|flat|tree|is-prime |throws-like|trans|race|hyper|tap|emit|done-testing|quit|dd|note |prepend|categorize|antipairs|categorize-list|parse-base|base |starts-with|ends-with|put|append|tail|\\x{03C0}|\\x{03C4}|\\x{212F} |get|words|new-from-pairs|uniname|uninames|uniprop|uniprops |slurp-rest|throw|break|keep )(?!\\-)\\b(?!\\s*=>)",
+      "captures": {
+        "1": {
+          "name": "keyword.operator.colon.perl6fe"
+        }
+      },
+      "name": "support.function.perl6fe"
     },
     {
-      "match": "(?x)\\b(?<![\\-:]|\\\\)( eager|hyper|substr|index|rindex|grep|map|sort|join|lines|hints |chmod|split|reduce|min|max|reverse|truncate|zip|cat|roundrobin |classify|first|sum|keys|values|pairs|defined|delete|exists |elems|end|kv|any|all|one|wrap|shape|key|value|name|pop|push |shift|splice|unshift|floor|ceiling|abs|exp|log|log10|rand|sign |sqrt|sin|cos|tan|round|strand|roots|cis|unpolar|polar|atan2 |pick|chop|chomp|lc|lcfirst|uc|ucfirst|capitalize |normalize|pack|unpack|quotemeta|comb|samecase|sameaccent|chars |nfd|nfc|nfkd|nfkc|printf|sprintf|caller|evalfile|run|runinstead |nothing|want|bless|chr|ord|gmtime|time|eof|localtime|gethost |getpw|chroot|getlogin|getpeername|kill|fork|wait|perl|graphs |codes|bytes|clone|print|open|read|write|readline|say|seek|close |opendir|readdir|slurp|spurt|shell|run|pos|fmt|vec|link|unlink |symlink|unique|pair|asin|atan|sec|cosec|cotan|asec|acosec|acotan |sinh|cosh|tanh|asinh|done|acos|acosh|atanh|sech|cosech|cotanh |sech|acosech|acotanh|asech|ok|nok|plan-ok|dies-ok|lives-ok|skip |todo|pass|flunk|force-todo|use-ok|isa-ok|diag|is-deeply|isnt |like|skip-rest|unlike|cmp-ok|eval-dies-ok|nok-error|cmp-ok |eval-lives-ok|approx|is-approx|throws-ok|version-lt|plan|EVAL |succ|pred|times|nonce|once|signature|new|connect|operator|undef |undefine|sleep|from|to|infix|postfix|prefix|circumfix|can-ok |postcircumfix|minmax|lazy|count|unwrap|getc|pi|tau|e|context|void |quasi|body|each|contains|rewinddir|subst|can|isa|flush|arity |assuming|rewind|callwith|callsame|nextwith|nextsame|attr|does-ok |eval-elsewhere|none|srand|trim|trim-start|trim-end|lastcall |WHAT|WHY|WHERE|HOW|WHICH|VAR|WHO|WHENCE|ACCEPTS|REJECTS|not |iterator|by|re|im|invert|flip|gist|flat|tree|is-prime |throws-like|trans|race|hyper|tap|emit|done-testing|quit|dd|note |starts-with|ends-with|put|append|tail|\\x{03C0}|\\x{03C4}|\\x{212F} )(?!\\-)\\b(?!\\s*=>)",
+      "match": "(?x)\\b(?<![\\-:]|\\\\)(?<=\\.) (e|d|f|s|l|r|w|rw|x|rwx|z|abspath|basename|extension|dirname |watch|is-absolute|parts|volume|path|is-relative|parent|child |resolve|dir) (?!\\-)\\b(?!\\s*=>)",
       "name": "support.function.perl6fe"
     },
+    {
+      "include": "#numbers"
+    },
     {
       "match": "(?x) (?<!\\(|\\*)\\%| [\\^\\+><\\*\\!\\?~\\/\\|]| (?<!\\$)\\.| (?<!:):(?!:)| (?<=\\s)\\-(?=[\\s\\(\\{\\[])| (?<!\\w)[o\\x{2218}](?!\\w)",
       "name": "keyword.operator.generic.perl6fe"
     },
     {
-      "match": "(?x) ([a-zA-Z_À-ÿ\\$]) ( [a-zA-Z0-9_À-ÿ\\$]| [\\-'][a-zA-Z_À-ÿ\\$][a-zA-Z0-9_À-ÿ\\$] )*",
-      "name": "routine.name.perl6fe"
+      "match": "(?x) (?<=^|\\W|\\s) ([\\w'\\-]+) \\s* (?= =>)",
+      "name": "string.pair.key.perl6fe"
     },
     {
-      "include": "#numbers"
+      "match": "(?x) \\b (?<!\\d) ([a-zA-Z_\\x{c0}-\\x{ff}\\$]) ( [a-zA-Z0-9_\\x{c0}-\\x{ff}\\$]| [\\-'][a-zA-Z_\\x{c0}-\\x{ff}\\$][a-zA-Z0-9_\\x{c0}-\\x{ff}\\$] )*",
+      "name": "routine.name.perl6fe"
     },
     {
       "begin": "(?<=\\:)(\\d+)(<)",
@@ -1072,11 +1072,15 @@
     "numbers": {
       "patterns": [
         {
-          "match": "(?<=[=,;\\^\\s\\{\\[\\(\\/]|\\.\\.)0[bodx]\\w+",
+          "match": "(?x)\n(?<= ^ | [=,;^\\s{\\[(/] | \\.\\. )\n[-−+]?\n0[bodx]\\w+",
           "name": "constant.numeric.radix.perl6fe"
         },
         {
-          "match": "(?x) (?<=[=,:;\\^\\s\\{\\[\\(\\/]|\\.\\.) (?:[\\+\\-])? (?: \\d+ (?:[\\_\\d]+\\d)? ) (?: \\.  \\d+ (?:[\\_\\d]+\\d)? )? (?:   e  \\d+ (?:[\\_\\d]+\\d)? )?",
+          "match": "(?x)\n          (?<= ^ | [×÷*=,:;^\\s{\\[(/] | \\.\\. )\n          (?: [+-−] )?\n(?:\n    (?: \\d+ (?: [\\_\\d]+ \\d )? )\n    (?: \\.  \\d+ (?: [\\_\\d]+ \\d )? )?\n)\n(?:  e  (?:-|−)? \\d+ (?: [\\_\\d]+ \\d )? )?",
+          "name": "constant.numeric.perl6fe"
+        },
+        {
+          "match": "(?x)\n          (?<= ^ | [×÷*=,:;^\\s{\\[(/] | \\.\\. )\n          (?: [+-−] )?\n(?:\n    (?: \\.  \\d+ (?: [\\_\\d]+ \\d )? )\n)\n(?:  e  (?:-|−)? \\d+ (?: [\\_\\d]+ \\d )? )?",
           "name": "constant.numeric.perl6fe"
         }
       ]
@@ -1084,8 +1088,8 @@
     "comment-block-delimited": {
       "patterns": [
         {
-          "begin": "^(=)(begin)\\s+(\\w+)",
-          "end": "^(=)(end)\\s+(\\w+)",
+          "begin": "^\\s*(=)(begin)\\s+(\\w+)",
+          "end": "^\\s*(=)(end)\\s+(\\w+)",
           "captures": {
             "1": {
               "name": "storage.modifier.block.delimited.perl6fe"
@@ -1109,7 +1113,34 @@
     "comment-block-abbreviated": {
       "patterns": [
         {
-          "match": "^(=)(\\w+)\\s+(.+)$",
+          "begin": "^\\s*(=)(head\\w*)\\s+(.+?)\\s*$",
+          "end": "(?=^\\s*$|^\\s*=\\w+.*$)",
+          "captures": {
+            "1": {
+              "name": "storage.modifier.block.abbreviated.perl6fe"
+            },
+            "2": {
+              "name": "entity.other.attribute-name.block.abbreviated.perl6fe"
+            },
+            "3": {
+              "name": "entity.name.section.abbreviated.perl6fe",
+              "patterns": [
+                {
+                  "include": "#comment-block-syntax"
+                }
+              ]
+            }
+          },
+          "contentName": "entity.name.section.head.abbreviated.perl6fe",
+          "patterns": [
+            {
+              "include": "#comment-block-syntax"
+            }
+          ]
+        },
+        {
+          "begin": "^\\s*(=)(\\w+)\\s+(.+?)\\s*$",
+          "end": "(?=^\\s*$|^\\s*=\\w+.*$)",
           "captures": {
             "1": {
               "name": "storage.modifier.block.abbreviated.perl6fe"
@@ -1118,17 +1149,169 @@
               "name": "entity.other.attribute-name.block.abbreviated.perl6fe"
             },
             "3": {
-              "name": "entity.name.section.abbreviated.perl6fe"
+              "name": "entity.name.section.abbreviated.perl6fe",
+              "patterns": [
+                {
+                  "include": "#comment-block-syntax"
+                }
+              ]
+            }
+          },
+          "contentName": "comment.block.abbreviated.perl6fe",
+          "patterns": [
+            {
+              "include": "#comment-block-syntax"
+            }
+          ]
+        }
+      ]
+    },
+    "shellquotes": {
+      "patterns": [
+        {
+          "begin": "([qQ]x)\\s*({{)",
+          "beginCaptures": {
+            "1": {
+              "name": "string.quoted.q.shell.operator.perl6fe"
+            },
+            "2": {
+              "name": "punctuation.section.embedded.shell.begin.perl6fe"
+            }
+          },
+          "end": "}}",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.shell.begin.perl6fe"
+            }
+          },
+          "name": "meta.shell.quote.single.perl6fe",
+          "patterns": [
+            {
+              "include": "source.quoting.perl6fe#q_single_string_content"
+            }
+          ]
+        },
+        {
+          "begin": "([qQ]x)\\s*({)",
+          "beginCaptures": {
+            "1": {
+              "name": "string.quoted.q.shell.operator.perl6fe"
+            },
+            "2": {
+              "name": "punctuation.section.embedded.shell.begin.perl6fe"
+            }
+          },
+          "end": "}",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.shell.begin.perl6fe"
+            }
+          },
+          "name": "meta.shell.quote.single.perl6fe",
+          "patterns": [
+            {
+              "include": "source.quoting.perl6fe#q_single_string_content"
+            }
+          ]
+        },
+        {
+          "begin": "([qQ]x)\\s*(\\[\\[)",
+          "beginCaptures": {
+            "1": {
+              "name": "string.quoted.q.shell.operator.perl6fe"
+            },
+            "2": {
+              "name": "punctuation.section.embedded.shell.begin.perl6fe"
+            }
+          },
+          "end": "\\]\\]",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.shell.begin.perl6fe"
+            }
+          },
+          "name": "meta.shell.quote.single.perl6fe",
+          "patterns": [
+            {
+              "include": "source.quoting.perl6fe#q_single_string_content"
+            }
+          ]
+        },
+        {
+          "begin": "([Qq]x)\\s*(\\[)",
+          "beginCaptures": {
+            "1": {
+              "name": "string.quoted.q.shell.operator.perl6fe"
+            },
+            "2": {
+              "name": "punctuation.section.embedded.shell.begin.perl6fe"
+            }
+          },
+          "end": "\\]",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.shell.begin.perl6fe"
+            }
+          },
+          "name": "meta.shell.quote.single.perl6fe",
+          "patterns": [
+            {
+              "include": "source.quoting.perl6fe#q_single_string_content"
+            }
+          ]
+        },
+        {
+          "begin": "([Qq]x)\\s*(\\|)",
+          "beginCaptures": {
+            "1": {
+              "name": "string.quoted.q.shell.operator.perl6fe"
+            },
+            "2": {
+              "name": "punctuation.section.embedded.shell.begin.perl6fe"
+            }
+          },
+          "end": "\\|",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.shell.begin.perl6fe"
+            }
+          },
+          "name": "meta.shell.quote.single.perl6fe",
+          "patterns": [
+            {
+              "include": "source.quoting.perl6fe#q_single_string_content"
+            }
+          ]
+        },
+        {
+          "begin": "([Qq]x)\\s*(\\/)",
+          "beginCaptures": {
+            "1": {
+              "name": "string.quoted.q.shell.operator.perl6fe"
+            },
+            "2": {
+              "name": "punctuation.section.embedded.shell.begin.perl6fe"
+            }
+          },
+          "end": "(?<!\\\\)\\/",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.shell.begin.perl6fe"
             }
           },
-          "name": "meta.block.abbreviated.perl6fe"
-        }
-      ]
-    },
-    "shellquotes": {
-      "patterns": [
+          "name": "meta.shell.quote.single.perl6fe",
+          "patterns": [
+            {
+              "match": "\\\\\\/",
+              "name": "constant.character.escape.perl6fe"
+            },
+            {
+              "include": "source.quoting.perl6fe#q_single_string_content"
+            }
+          ]
+        },
         {
-          "begin": "([qQ]x)\\s*({{)",
+          "begin": "(qqx)\\s*({{)",
           "beginCaptures": {
             "1": {
               "name": "string.quoted.q.shell.operator.perl6fe"
@@ -1143,15 +1326,21 @@
               "name": "punctuation.section.embedded.shell.begin.perl6fe"
             }
           },
-          "name": "meta.shell.quote.single.perl6fe",
+          "name": "meta.shell.quote.double.perl6fe",
           "patterns": [
             {
-              "include": "#q_single_string_content"
+              "include": "#interpolation"
+            },
+            {
+              "include": "#variables"
+            },
+            {
+              "include": "source.shell"
             }
           ]
         },
         {
-          "begin": "([qQ]x)\\s*({)",
+          "begin": "(qqx)\\s*({)",
           "beginCaptures": {
             "1": {
               "name": "string.quoted.q.shell.operator.perl6fe"
@@ -1166,15 +1355,21 @@
               "name": "punctuation.section.embedded.shell.begin.perl6fe"
             }
           },
-          "name": "meta.shell.quote.single.perl6fe",
+          "name": "meta.shell.quote.double.perl6fe",
           "patterns": [
             {
-              "include": "#q_single_string_content"
+              "include": "#interpolation"
+            },
+            {
+              "include": "#variables"
+            },
+            {
+              "include": "source.shell"
             }
           ]
         },
         {
-          "begin": "([qQ]x)\\s*(\\[\\[)",
+          "begin": "(qqx)\\s*(\\[\\[)",
           "beginCaptures": {
             "1": {
               "name": "string.quoted.q.shell.operator.perl6fe"
@@ -1189,15 +1384,21 @@
               "name": "punctuation.section.embedded.shell.begin.perl6fe"
             }
           },
-          "name": "meta.shell.quote.single.perl6fe",
+          "name": "meta.shell.quote.double.perl6fe",
           "patterns": [
             {
-              "include": "#q_single_string_content"
+              "include": "#interpolation"
+            },
+            {
+              "include": "#variables"
+            },
+            {
+              "include": "source.shell"
             }
           ]
         },
         {
-          "begin": "([Qq]x)\\s*(\\[)",
+          "begin": "(qqx)\\s*(\\[)",
           "beginCaptures": {
             "1": {
               "name": "string.quoted.q.shell.operator.perl6fe"
@@ -1212,15 +1413,21 @@
               "name": "punctuation.section.embedded.shell.begin.perl6fe"
             }
           },
-          "name": "meta.shell.quote.single.perl6fe",
+          "name": "meta.shell.quote.double.perl6fe",
           "patterns": [
             {
-              "include": "#q_single_string_content"
+              "include": "#interpolation"
+            },
+            {
+              "include": "#variables"
+            },
+            {
+              "include": "source.shell"
             }
           ]
         },
         {
-          "begin": "([Qq]x)\\s*(\\|)",
+          "begin": "(qqx)\\s*(\\|)",
           "beginCaptures": {
             "1": {
               "name": "string.quoted.q.shell.operator.perl6fe"
@@ -1235,15 +1442,21 @@
               "name": "punctuation.section.embedded.shell.begin.perl6fe"
             }
           },
-          "name": "meta.shell.quote.single.perl6fe",
+          "name": "meta.shell.quote.double.perl6fe",
           "patterns": [
             {
-              "include": "#q_single_string_content"
+              "include": "#interpolation"
+            },
+            {
+              "include": "#variables"
+            },
+            {
+              "include": "source.shell"
             }
           ]
         },
         {
-          "begin": "([Qq]x)\\s*(\\/)",
+          "begin": "(qqx)\\s*(\\/)",
           "beginCaptures": {
             "1": {
               "name": "string.quoted.q.shell.operator.perl6fe"
@@ -1258,338 +1471,464 @@
               "name": "punctuation.section.embedded.shell.begin.perl6fe"
             }
           },
-          "name": "meta.shell.quote.single.perl6fe",
+          "name": "meta.shell.quote.double.perl6fe",
           "patterns": [
             {
               "match": "\\\\\\/",
               "name": "constant.character.escape.perl6fe"
             },
             {
-              "include": "#q_single_string_content"
+              "include": "#interpolation"
+            },
+            {
+              "include": "#variables"
+            },
+            {
+              "include": "source.shell"
             }
           ]
+        }
+      ]
+    },
+    "comment-block-syntax": {
+      "patterns": [
+        {
+          "include": "#comment-block-delimited"
         },
         {
-          "begin": "(qqx)\\s*({{)",
+          "include": "#comment-block-abbreviated"
+        },
+        {
+          "begin": "(?x) (U) (<<<)",
           "beginCaptures": {
             "1": {
-              "name": "string.quoted.q.shell.operator.perl6fe"
+              "name": "support.function.pod.code.perl6fe"
             },
             "2": {
-              "name": "punctuation.section.embedded.shell.begin.perl6fe"
+              "name": "punctuation.section.embedded.pod.code.perl6fe"
             }
           },
-          "end": "}}",
+          "end": "(?x) (>>>)",
           "endCaptures": {
-            "0": {
-              "name": "punctuation.section.embedded.shell.begin.perl6fe"
+            "1": {
+              "name": "punctuation.section.embedded.pod.code.perl6fe"
             }
           },
-          "name": "meta.shell.quote.double.perl6fe",
+          "contentName": "markup.underline.perl6fe",
+          "name": "meta.pod.c.perl6fe",
           "patterns": [
             {
-              "include": "#interpolation"
+              "include": "#comment-block-syntax"
             },
             {
-              "include": "source.shell"
+              "include": "source.quoting.perl6fe#q_triple_angle_string_content"
             }
           ]
         },
         {
-          "begin": "(qqx)\\s*({)",
+          "begin": "(?x) (I) (<<<)",
           "beginCaptures": {
             "1": {
-              "name": "string.quoted.q.shell.operator.perl6fe"
+              "name": "support.function.pod.code.perl6fe"
             },
             "2": {
-              "name": "punctuation.section.embedded.shell.begin.perl6fe"
+              "name": "punctuation.section.embedded.pod.code.perl6fe"
             }
           },
-          "end": "}",
+          "end": "(?x) (>>>)",
           "endCaptures": {
-            "0": {
-              "name": "punctuation.section.embedded.shell.begin.perl6fe"
+            "1": {
+              "name": "punctuation.section.embedded.pod.code.perl6fe"
             }
           },
-          "name": "meta.shell.quote.double.perl6fe",
+          "contentName": "markup.italic.perl6fe",
+          "name": "meta.pod.c.perl6fe",
           "patterns": [
             {
-              "include": "#interpolation"
+              "include": "#comment-block-syntax"
             },
             {
-              "include": "source.shell"
+              "include": "source.quoting.perl6fe#q_triple_angle_string_content"
             }
           ]
         },
         {
-          "begin": "(qqx)\\s*(\\[\\[)",
+          "begin": "(?x) (B) (<<<)",
           "beginCaptures": {
             "1": {
-              "name": "string.quoted.q.shell.operator.perl6fe"
+              "name": "support.function.pod.code.perl6fe"
             },
             "2": {
-              "name": "punctuation.section.embedded.shell.begin.perl6fe"
+              "name": "punctuation.section.embedded.pod.code.perl6fe"
             }
           },
-          "end": "\\]\\]",
+          "end": "(?x) (>>>)",
           "endCaptures": {
-            "0": {
-              "name": "punctuation.section.embedded.shell.begin.perl6fe"
+            "1": {
+              "name": "punctuation.section.embedded.pod.code.perl6fe"
+            }
+          },
+          "contentName": "markup.bold.perl6fe",
+          "name": "meta.pod.c.perl6fe",
+          "patterns": [
+            {
+              "include": "#comment-block-syntax"
+            },
+            {
+              "include": "source.quoting.perl6fe#q_triple_angle_string_content"
+            }
+          ]
+        },
+        {
+          "begin": "(?x) ([A-Z]) (<<<)",
+          "beginCaptures": {
+            "1": {
+              "name": "support.function.pod.code.perl6fe"
+            },
+            "2": {
+              "name": "punctuation.section.embedded.pod.code.perl6fe"
+            }
+          },
+          "end": "(?x) (>>>)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.section.embedded.pod.code.perl6fe"
+            }
+          },
+          "contentName": "markup.raw.code.perl6fe",
+          "name": "meta.pod.c.perl6fe",
+          "patterns": [
+            {
+              "include": "#comment-block-syntax"
+            },
+            {
+              "include": "source.quoting.perl6fe#q_triple_angle_string_content"
+            }
+          ]
+        },
+        {
+          "begin": "(?x) (U) (<<)",
+          "beginCaptures": {
+            "1": {
+              "name": "support.function.pod.code.perl6fe"
+            },
+            "2": {
+              "name": "punctuation.section.embedded.pod.code.perl6fe"
+            }
+          },
+          "end": "(?x) (>>)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.section.embedded.pod.code.perl6fe"
+            }
+          },
+          "contentName": "markup.underline.perl6fe",
+          "name": "meta.pod.c.perl6fe",
+          "patterns": [
+            {
+              "include": "#comment-block-syntax"
+            },
+            {
+              "include": "source.quoting.perl6fe#q_double_angle_string_content"
+            }
+          ]
+        },
+        {
+          "begin": "(?x) (I) (<<)",
+          "beginCaptures": {
+            "1": {
+              "name": "support.function.pod.code.perl6fe"
+            },
+            "2": {
+              "name": "punctuation.section.embedded.pod.code.perl6fe"
+            }
+          },
+          "end": "(?x) (>>)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.section.embedded.pod.code.perl6fe"
+            }
+          },
+          "contentName": "markup.italic.perl6fe",
+          "name": "meta.pod.c.perl6fe",
+          "patterns": [
+            {
+              "include": "#comment-block-syntax"
+            },
+            {
+              "include": "source.quoting.perl6fe#q_double_angle_string_content"
+            }
+          ]
+        },
+        {
+          "begin": "(?x) (B) (<<)",
+          "beginCaptures": {
+            "1": {
+              "name": "support.function.pod.code.perl6fe"
+            },
+            "2": {
+              "name": "punctuation.section.embedded.pod.code.perl6fe"
+            }
+          },
+          "end": "(?x) (>>)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.section.embedded.pod.code.perl6fe"
+            }
+          },
+          "contentName": "markup.bold.perl6fe",
+          "name": "meta.pod.c.perl6fe",
+          "patterns": [
+            {
+              "include": "#comment-block-syntax"
+            },
+            {
+              "include": "source.quoting.perl6fe#q_double_angle_string_content"
+            }
+          ]
+        },
+        {
+          "begin": "(?x) ([A-Z]) (<<)",
+          "beginCaptures": {
+            "1": {
+              "name": "support.function.pod.code.perl6fe"
+            },
+            "2": {
+              "name": "punctuation.section.embedded.pod.code.perl6fe"
+            }
+          },
+          "end": "(?x) (>>)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.section.embedded.pod.code.perl6fe"
+            }
+          },
+          "contentName": "markup.raw.code.perl6fe",
+          "name": "meta.pod.c.perl6fe",
+          "patterns": [
+            {
+              "include": "#comment-block-syntax"
+            },
+            {
+              "include": "source.quoting.perl6fe#q_double_angle_string_content"
+            }
+          ]
+        },
+        {
+          "begin": "(?x) (U) (<)",
+          "beginCaptures": {
+            "1": {
+              "name": "support.function.pod.code.perl6fe"
+            },
+            "2": {
+              "name": "punctuation.section.embedded.pod.code.perl6fe"
+            }
+          },
+          "end": "(?x) (>)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.section.embedded.pod.code.perl6fe"
             }
           },
-          "name": "meta.shell.quote.double.perl6fe",
+          "contentName": "markup.underline.perl6fe",
+          "name": "meta.pod.c.perl6fe",
           "patterns": [
             {
-              "include": "#interpolation"
+              "include": "#comment-block-syntax"
             },
             {
-              "include": "source.shell"
+              "include": "source.quoting.perl6fe#q_angle_string_content"
             }
           ]
         },
         {
-          "begin": "(qqx)\\s*(\\[)",
+          "begin": "(?x) (I) (<)",
           "beginCaptures": {
             "1": {
-              "name": "string.quoted.q.shell.operator.perl6fe"
+              "name": "support.function.pod.code.perl6fe"
             },
             "2": {
-              "name": "punctuation.section.embedded.shell.begin.perl6fe"
+              "name": "punctuation.section.embedded.pod.code.perl6fe"
             }
           },
-          "end": "\\]",
+          "end": "(?x) (>)",
           "endCaptures": {
-            "0": {
-              "name": "punctuation.section.embedded.shell.begin.perl6fe"
+            "1": {
+              "name": "punctuation.section.embedded.pod.code.perl6fe"
             }
           },
-          "name": "meta.shell.quote.double.perl6fe",
+          "contentName": "markup.italic.perl6fe",
+          "name": "meta.pod.c.perl6fe",
           "patterns": [
             {
-              "include": "#interpolation"
+              "include": "#comment-block-syntax"
             },
             {
-              "include": "source.shell"
+              "include": "source.quoting.perl6fe#q_angle_string_content"
             }
           ]
         },
         {
-          "begin": "(qqx)\\s*(\\|)",
+          "begin": "(?x) (B) (<)",
           "beginCaptures": {
             "1": {
-              "name": "string.quoted.q.shell.operator.perl6fe"
+              "name": "support.function.pod.code.perl6fe"
             },
             "2": {
-              "name": "punctuation.section.embedded.shell.begin.perl6fe"
+              "name": "punctuation.section.embedded.pod.code.perl6fe"
             }
           },
-          "end": "\\|",
+          "end": "(?x) (>)",
           "endCaptures": {
-            "0": {
-              "name": "punctuation.section.embedded.shell.begin.perl6fe"
+            "1": {
+              "name": "punctuation.section.embedded.pod.code.perl6fe"
             }
           },
-          "name": "meta.shell.quote.double.perl6fe",
+          "contentName": "markup.bold.perl6fe",
+          "name": "meta.pod.c.perl6fe",
           "patterns": [
             {
-              "include": "#interpolation"
+              "include": "#comment-block-syntax"
             },
             {
-              "include": "source.shell"
+              "include": "source.quoting.perl6fe#q_angle_string_content"
             }
           ]
         },
         {
-          "begin": "(qqx)\\s*(\\/)",
+          "begin": "(?x) ([A-Z]) (<)",
           "beginCaptures": {
             "1": {
-              "name": "string.quoted.q.shell.operator.perl6fe"
+              "name": "support.function.pod.code.perl6fe"
             },
             "2": {
-              "name": "punctuation.section.embedded.shell.begin.perl6fe"
+              "name": "punctuation.section.embedded.pod.code.perl6fe"
             }
           },
-          "end": "(?<!\\\\)\\/",
+          "end": "(?x) (>)",
           "endCaptures": {
-            "0": {
-              "name": "punctuation.section.embedded.shell.begin.perl6fe"
+            "1": {
+              "name": "punctuation.section.embedded.pod.code.perl6fe"
             }
           },
-          "name": "meta.shell.quote.double.perl6fe",
+          "contentName": "markup.raw.code.perl6fe",
+          "name": "meta.pod.c.perl6fe",
           "patterns": [
             {
-              "match": "\\\\\\/",
-              "name": "constant.character.escape.perl6fe"
-            },
-            {
-              "include": "#interpolation"
+              "include": "#comment-block-syntax"
             },
             {
-              "include": "source.shell"
+              "include": "source.quoting.perl6fe#q_angle_string_content"
             }
           ]
-        }
-      ]
-    },
-    "comment-block-syntax": {
-      "patterns": [
-        {
-          "include": "#comment-block-delimited"
         },
         {
-          "include": "#comment-block-abbreviated"
-        },
-        {
-          "match": "(L)(\\<)(.+?)(?:(\\|)(.+?))?(\\>)",
-          "captures": {
+          "begin": "(?x) (U) («)",
+          "beginCaptures": {
             "1": {
-              "name": "support.function.pod.link.perl6fe"
+              "name": "support.function.pod.code.perl6fe"
             },
             "2": {
-              "name": "punctuation.section.embedded.pod.link.perl6fe"
-            },
-            "3": {
-              "name": "entity.name.type.pod.link.perl6fe"
-            },
-            "4": {
-              "name": "punctuation.section.embedded.pod.link.perl6fe"
-            },
-            "5": {
-              "name": "markup.underline.link.pod.perl6fe"
-            },
-            "6": {
-              "name": "punctuation.section.embedded.pod.link.perl6fe"
+              "name": "punctuation.section.embedded.pod.code.perl6fe"
             }
           },
-          "name": "meta.pod.l.perl6fe"
-        },
-        {
-          "match": "([CKT])(?:(\\<\\<)(.+?)(\\>\\>)|(\\<)(.+?)(\\>))",
-          "captures": {
+          "end": "(?x) (»)",
+          "endCaptures": {
             "1": {
-              "name": "support.function.pod.code.perl6fe"
-            },
-            "2": {
-              "name": "punctuation.section.embedded.pod.code.perl6fe"
-            },
-            "3": {
-              "name": "markup.raw.code.perl6fe"
-            },
-            "4": {
-              "name": "punctuation.section.embedded.pod.code.perl6fe"
-            },
-            "5": {
-              "name": "punctuation.section.embedded.pod.code.perl6fe"
-            },
-            "6": {
-              "name": "markup.raw.code.perl6fe"
-            },
-            "7": {
               "name": "punctuation.section.embedded.pod.code.perl6fe"
             }
           },
-          "name": "meta.pod.c.perl6fe"
+          "contentName": "markup.underline.perl6fe",
+          "name": "meta.pod.c.perl6fe",
+          "patterns": [
+            {
+              "include": "#comment-block-syntax"
+            },
+            {
+              "include": "source.quoting.perl6fe#q_chevron_string_content"
+            }
+          ]
         },
         {
-          "match": "(U)(\\<)(.+?)(\\>)",
-          "captures": {
+          "begin": "(?x) (I) («)",
+          "beginCaptures": {
             "1": {
               "name": "support.function.pod.code.perl6fe"
             },
             "2": {
               "name": "punctuation.section.embedded.pod.code.perl6fe"
-            },
-            "3": {
-              "name": "markup.underline.perl6fe"
-            },
-            "4": {
-              "name": "punctuation.section.embedded.pod.code.perl6fe"
             }
           },
-          "name": "meta.pod.c.perl6fe"
-        },
-        {
-          "match": "(I)(\\<)(.+?)(\\>)",
-          "captures": {
+          "end": "(?x) (»)",
+          "endCaptures": {
             "1": {
-              "name": "support.function.pod.code.perl6fe"
-            },
-            "2": {
-              "name": "punctuation.section.embedded.pod.code.perl6fe"
-            },
-            "3": {
-              "name": "markup.italic.perl6fe"
-            },
-            "4": {
               "name": "punctuation.section.embedded.pod.code.perl6fe"
             }
           },
-          "name": "meta.pod.c.perl6fe"
+          "contentName": "markup.italic.perl6fe",
+          "name": "meta.pod.c.perl6fe",
+          "patterns": [
+            {
+              "include": "#comment-block-syntax"
+            },
+            {
+              "include": "source.quoting.perl6fe#q_chevron_string_content"
+            }
+          ]
         },
         {
-          "match": "(B)(\\<)(.+?)(\\>)",
-          "captures": {
+          "begin": "(?x) (B) («)",
+          "beginCaptures": {
             "1": {
               "name": "support.function.pod.code.perl6fe"
             },
             "2": {
               "name": "punctuation.section.embedded.pod.code.perl6fe"
-            },
-            "3": {
-              "name": "markup.bold.perl6fe"
-            },
-            "4": {
+            }
+          },
+          "end": "(?x) (»)",
+          "endCaptures": {
+            "1": {
               "name": "punctuation.section.embedded.pod.code.perl6fe"
             }
           },
-          "name": "meta.pod.c.perl6fe"
-        }
-      ]
-    },
-    "heredocs": {
-      "patterns": [
+          "contentName": "markup.bold.perl6fe",
+          "name": "meta.pod.c.perl6fe",
+          "patterns": [
+            {
+              "include": "#comment-block-syntax"
+            },
+            {
+              "include": "source.quoting.perl6fe#q_chevron_string_content"
+            }
+          ]
+        },
         {
-          "begin": "(?x) (?: ([qQ](?!/)|qq|qw|qww|qx|qqx) \\s* ((?:\\s*:\\w+)*\\s*:(?:to|heredoc))\\s* | (qto|qqto|Qto) \\s* ((?:\\s*:\\w+)*)\\s* ) /(\\w+)/",
+          "begin": "(?x) ([A-Z]) («)",
           "beginCaptures": {
             "1": {
-              "name": "string.quoted.construct.perl6fe"
+              "name": "support.function.pod.code.perl6fe"
             },
             "2": {
-              "name": "support.function.adverb.perl6fe"
-            },
-            "3": {
-              "name": "string.quoted.construct.perl6fe"
-            },
-            "4": {
-              "name": "support.function.adverb.perl6fe"
-            },
-            "5": {
-              "name": "entity.other.attribute-name.heredoc.delimiter.perl6fe"
+              "name": "punctuation.section.embedded.pod.code.perl6fe"
             }
           },
-          "end": "\\s*\\5",
+          "end": "(?x) (»)",
           "endCaptures": {
-            "0": {
-              "name": "entity.other.attribute-name.heredoc.delimiter.perl6fe"
+            "1": {
+              "name": "punctuation.section.embedded.pod.code.perl6fe"
             }
           },
+          "contentName": "markup.raw.code.perl6fe",
+          "name": "meta.pod.c.perl6fe",
           "patterns": [
             {
-              "begin": "(?<=/)",
-              "end": "\\n",
-              "patterns": [
-                {
-                  "include": "$self"
-                }
-              ],
-              "name": "meta.heredoc.continuation.perl6fe"
+              "include": "#comment-block-syntax"
             },
             {
-              "match": "^(?:.|\\n)*$",
-              "name": "string.quoted.heredoc.perl6fe"
+              "include": "source.quoting.perl6fe#q_chevron_string_content"
             }
-          ],
-          "name": "meta.heredoc.perl6fe"
+          ]
         }
       ]
     },
@@ -1629,7 +1968,7 @@
               "include": "#p5_escaped_char"
             },
             {
-              "include": "#q_brace_string_content"
+              "include": "source.quoting.perl6fe#q_brace_string_content"
             }
           ]
         },
@@ -1667,7 +2006,7 @@
               "include": "#p5_escaped_char"
             },
             {
-              "include": "#q_bracket_string_content"
+              "include": "source.quoting.perl6fe#q_bracket_string_content"
             }
           ]
         },
@@ -1705,7 +2044,7 @@
               "include": "#p5_escaped_char"
             },
             {
-              "include": "#q_slash_string_content"
+              "include": "source.quoting.perl6fe#q_slash_string_content"
             }
           ]
         }
@@ -1759,7 +2098,7 @@
         }
       ]
     },
-    "variables": {
+    "regexp-variables": {
       "patterns": [
         {
           "begin": "\\$(?=\\<)",
@@ -1786,9 +2125,16 @@
               }
             }
           ]
+        }
+      ]
+    },
+    "variables": {
+      "patterns": [
+        {
+          "include": "#regexp-variables"
         },
         {
-          "match": "(?x) (\\$|@|%|&) (\\.|\\*|:|!|\\^|~|=|\\?)? ( (?:[a-zA-Z]) (?: [a-zA-Z0-9_À-ÿ\\$]| [\\-'][a-zA-Z_À-ÿ\\$] )* )",
+          "match": "(?x)\n(\\$|@|%|&)\n(\\.|\\*|:|!|\\^|~|=|\\?)?\n(\n    (?:[\\p{Alpha}_])             # Must start with Alpha or underscore\n    (?:\n       [\\p{Digit}\\p{Alpha}_]  # have alphanum/underscore or a ' or -\n    |                           # followed by an alphanum or underscore\n       [\\-'] [\\p{Digit}\\p{Alpha}_]\n    )*\n)",
           "captures": {
             "1": {
               "name": "variable.other.identifier.sigil.perl6fe"
@@ -1804,12 +2150,108 @@
         }
       ]
     },
+    "hex_escapes": {
+      "patterns": [
+        {
+          "match": "(?x) (\\\\x) ( \\[ ) ( [\\dA-Fa-f]+ ) ( \\] )",
+          "captures": {
+            "1": {
+              "name": "keyword.punctuation.hex.perl6fe"
+            },
+            "2": {
+              "name": "keyword.operator.bracket.open.perl6fe"
+            },
+            "3": {
+              "name": "routine.name.hex.perl6fe"
+            },
+            "4": {
+              "name": "keyword.operator.bracket.close.perl6fe"
+            }
+          },
+          "name": "punctuation.hex.perl6fe"
+        }
+      ]
+    },
     "interpolation": {
       "patterns": [
         {
-          "match": "(?x)(?<!\\\\) (\\$|@|%|&)(?!\\$) (\\.|\\*|:|!|\\^|~|=|\\?)? ([a-zA-Z_À-ÿ\\$]) ( [a-zA-Z0-9_À-ÿ\\$]| [\\-'][a-zA-Z_À-ÿ\\$][a-zA-Z0-9_À-ÿ\\$] )*",
+          "match": "(?x)\n(?<!\\\\)\n(\\$|@|%|&)\n(?!\\$)\n(\\.|\\*|:|!|\\^|~|=|\\?)?  # Twigils\n([\\p{Alpha}_])             # Must start with Alpha or underscore\n(\n   [\\p{Digit}\\p{Alpha}_]  # have alphanum/underscore or a ' or -\n|                           # followed by an alphanum or underscore\n   [\\-'] [\\p{Digit}\\p{Alpha}_]\n)*\n( \\[ .* \\] )?             # postcircumfix [ ]\n## methods\n(?:\n  (?:\n    ( \\. )\n    (\n       [\\p{Alpha}]\n        (?:\n          [\\p{Digit}\\p{Alpha}_]  # have alphanum/underscore or a ' or -\n        |                           # followed by an alphanum or underscore\n          [\\-'] [\\p{Digit}\\p{Alpha}_]\n        )*\n\n    )\n  )?\n  ( \\( .*?  \\) )\n)?",
+          "captures": {
+            "1": {
+              "name": "variable.other.identifier.sigil.perl6fe"
+            },
+            "2": {
+              "name": "support.class.twigil.interpolated.perl6fe"
+            },
+            "5": {
+              "patterns": [
+                {
+                  "begin": "<",
+                  "beginCaptures": {
+                    "0": {
+                      "name": "keyword.operator.chevron.open.perl6fe"
+                    }
+                  },
+                  "end": ">",
+                  "endCaptures": {
+                    "0": {
+                      "name": "keyword.operator.chevron.close.perl6fe"
+                    }
+                  }
+                },
+                {
+                  "begin": "\\[",
+                  "beginCaptures": {
+                    "0": {
+                      "name": "keyword.operator.bracket.open.perl6fe"
+                    }
+                  },
+                  "end": "\\]",
+                  "endCaptures": {
+                    "0": {
+                      "name": "keyword.operator.bracket.close.perl6fe"
+                    }
+                  },
+                  "patterns": [
+                    {
+                      "include": "$self"
+                    }
+                  ]
+                }
+              ]
+            },
+            "6": {
+              "name": "keyword.operator.dot.perl6fe"
+            },
+            "7": {
+              "name": "support.function.perl6fe"
+            },
+            "8": {
+              "begin": "(",
+              "beginCaptures": {
+                "0": "keyword.operator.paren.open.perl6fe"
+              },
+              "end": ")",
+              "endCaptures": {
+                "0": {
+                  "name": "keyword.operator.paren.close.perl6fe"
+                }
+              },
+              "patterns": [
+                {
+                  "include": "$self"
+                }
+              ]
+            }
+          },
           "name": "variable.other.identifier.interpolated.perl6fe"
         },
+        {
+          "include": "#hex_escapes"
+        },
+        {
+          "include": "#regexp-variables"
+        },
         {
           "begin": "(\\{)",
           "beginCaptures": {
@@ -1832,66 +2274,12 @@
         }
       ]
     },
-    "q_angle_string_content": {
-      "begin": "<",
-      "end": ">",
-      "patterns": [
-        {
-          "include": "#q_angle_string_content"
-        }
-      ]
-    },
-    "q_brace_string_content": {
-      "begin": "{",
-      "end": "}",
-      "patterns": [
-        {
-          "include": "#q_brace_string_content"
-        }
-      ]
-    },
-    "q_bracket_string_content": {
-      "begin": "\\[",
-      "end": "\\]",
-      "patterns": [
-        {
-          "include": "#q_bracket_string_content"
-        }
-      ]
-    },
-    "q_double_string_content": {
-      "begin": "\"",
-      "end": "\"",
-      "patterns": [
-        {
-          "include": "#q_double_string_content"
-        }
-      ]
-    },
-    "q_paren_string_content": {
-      "begin": "\\(",
-      "end": "\\)",
-      "patterns": [
-        {
-          "include": "#q_paren_string_content"
-        }
-      ]
-    },
-    "q_single_string_content": {
-      "begin": "'",
-      "end": "'",
-      "patterns": [
-        {
-          "include": "#q_single_string_content"
-        }
-      ]
-    },
-    "q_slash_string_content": {
-      "begin": "\\\\/",
-      "end": "\\\\/",
+    "q_right_double_right_double_string_content": {
+      "begin": "”",
+      "end": "”",
       "patterns": [
         {
-          "include": "#q_slash_string_content"
+          "include": "#q_right_double_right_double_string_content"
         }
       ]
     }