github-linguist 4.8.2 → 4.8.3

data/grammars/source.pawn.json

@@ -437,7 +437,7 @@
       ]
     },
     "disabled": {
-      "begin": "^\\s*#\\s*(if|elseif)\\s*(!?defined)?\\b.*$",
+      "begin": "^\\s*#\\s*(if|elseif)\\s*(!?defined)?\\b[a-zA-Z0-9_]*$",
       "comment": "eat nested preprocessor if(def)s",
       "end": "^\\s*#\\s*endif\\b.*$",
       "patterns": [
@@ -663,7 +663,7 @@
       ]
     },
     "preprocessor-rule-other": {
-      "begin": "^\\s*(#\\s*((if|elseif)\\s*(!?defined)?)\\b\\s*(.*?)(?:(?=(?://|/\\*))|$))",
+      "begin": "\\s(#\\s*((if|elseif)\\s*(!?defined)?)\\b\\s*(.*?)(?:(?=(?://|/\\*))|$))",
       "captures": {
         "1": {
           "name": "meta.preprocessor.macro.c"
@@ -671,7 +671,7 @@
         "2": {
           "name": "keyword.control.import.c"
         },
-        "5": {
+        "3": {
           "name": "entity.name.function.preprocessor.c"
         }
       },
@@ -683,7 +683,7 @@
       ]
     },
     "preprocessor-rule-other-block": {
-      "begin": "^\\s*(#\\s*((if|elseif)\\s*(!?defined)?)\\b\\s*(.*?)(?:(?=(?://|/\\*))|$))",
+      "begin": "^\\s*(#\\s*((if|elseif)\\s*(!?defined)?)\\b\\s*([a-zA-Z0-9_]*?)(?:(?=(?://|/\\*))|$))",
       "captures": {
         "1": {
           "name": "meta.preprocessor.macro.c"

data/grammars/source.perl6fe.json

@@ -682,13 +682,15 @@
       "name": "variable.other.perl6fe"
     },
     {
-      "match": "(?x)\\b(?<![\\-:])( macro|sub|submethod|method |multi|proto|only|category )(?!\\-)\\b",
-      "name": "storage.type.declare.routine.perl6fe"
-    },
-    {
-      "begin": "(?x)(?<= macro|sub|submethod|method )(?!\\-)\\s+(!)?(?=\\w)",
+      "begin": "(?x)(?<![%$&@]|\\w) (multi\\s+)? (macro|sub|submethod|method|multi|proto|only|category)\\s+ (!)?(?=\\w)",
       "beginCaptures": {
         "1": {
+          "name": "storage.type.declarator.multi.perl6fe"
+        },
+        "2": {
+          "name": "storage.type.declarator.type.perl6fe"
+        },
+        "3": {
           "name": "support.class.method.private.perl6fe"
         }
       },
@@ -819,7 +821,7 @@
       "name": "constant.language.boolean.perl6fe"
     },
     {
-      "match": "(?x)\\b(?<![\\-:])( fatal|internals|MONKEY\\-TYPING|nqp| strict|trace|worries|invocant|parameters| cur|soft|variables|attributes|v6|lib )(?!\\-)\\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",
       "name": "constant.language.pragma.perl6fe"
     },
     {
@@ -831,7 +833,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|Num|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|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 )(?!\\:\\:)(?:\\:([DU]))?\\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 )(?!\\:\\:)\\b",
       "captures": {
         "1": {
           "name": "support.type.perl6fe"
@@ -841,6 +843,18 @@
         }
       }
     },
+    {
+      "match": "(?<=\\w)(\\:)([DU_])\\b",
+      "name": "meta.adverb.definedness.perl6fe",
+      "captures": {
+        "1": {
+          "name": "keyword.operator.adverb.perl6fe"
+        },
+        "2": {
+          "name": "keyword.other.special-method.definedness.perl6fe"
+        }
+      }
+    },
     {
       "match": "(?x)\\b( div|mod|gcd|lcm|x|xx|temp|let|but|cmp|leg| eq|ne|gt|ge|lt|le|before|after|eqv|min|max|ff|fff|not|so|Z| and|andthen|or|orelse )\\b| \\b(X)(?!:)\\b",
       "name": "keyword.operator.word.perl6fe"
@@ -861,17 +875,36 @@
       "name": "meta.operator.non.ligature.perl6fe"
     },
     {
-      "match": "(?x) <=> | => | -> | \\+\\| | \\+\\+ | -- | \\*\\* | \\?\\?\\? | \\?\\? | \\!\\!\\! | \\!\\! | && | \\+\\^ | \\?\\^ | %% | \\+& | \\+< | \\+> | \\+\\^ | \\.\\.(?!\\.) | \\.\\.\\^ | \\^\\.\\. | \\^\\.\\.\\^ | \\?\\| | !=(?!\\=) | !==(?!\\=) | <=(?!>) | >= | === | == | =:= | ~~ | \\x{2245} | \\|\\| | \\^\\^ | \\/\\/ | := | ::= | \\.\\.\\.",
+      "match": "(?x) <=> | => | --> | -> | \\+\\| | \\+\\+ | -- | \\*\\* | \\?\\?\\? | \\?\\? | \\!\\!\\! | \\!\\! | && | \\+\\^ | \\?\\^ | %% | \\+& | \\+< | \\+> | \\+\\^ | \\.\\.(?!\\.) | \\.\\.\\^ | \\^\\.\\. | \\^\\.\\.\\^ | \\?\\| | !=(?!\\=) | !==(?!\\=) | <=(?!>) | >= | === | == | =:= | ~~ | \\x{2245} | \\|\\| | \\^\\^ | \\/\\/ | := | ::= | \\.\\.\\.",
       "name": "keyword.operator.multi-symbol.perl6fe"
     },
     {
       "include": "#special_variables"
     },
+    {
+      "match": "(?x)(?<=\\[) \\s* (\\*) \\s* ([\\-\\*%\\^\\+\\/]|div|mod|gcd|lcm) \\s* (\\d+) \\s* (?=\\])",
+      "name": "meta.subscript.whatever.perl6fe",
+      "captures": {
+        "1": {
+          "name": "constant.language.whatever.perl6fe"
+        },
+        "2": {
+          "name": "keyword.operator.minus.back-from.perl6fe"
+        },
+        "3": {
+          "name": "constant.numeric.back-from.perl6fe"
+        }
+      }
+    },
+    {
+      "match": "\\*\\s*(?=\\])",
+      "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 |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 |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 |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 |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|quit|dd|note |starts-with|ends-with|put|append|tail|\\x{03C0}|\\x{03C4}|\\x{212F} )(?!\\-)\\b(?!\\s*=>)",
+      "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 |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 |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 |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*=>)",
       "name": "support.function.perl6fe"
     },
     {
@@ -932,7 +965,7 @@
           "name": "constant.numeric.radix.perl6fe"
         },
         {
-          "match": "(?x) (?<=[=,;\\^\\s\\{\\[\\(\\/]|\\.\\.) (?:[\\+\\-])? (?: \\d+ (?:[\\_\\d]+\\d)? ) (?: \\.  \\d+ (?:[\\_\\d]+\\d)? )? (?:   e  \\d+ (?:[\\_\\d]+\\d)? )?",
+          "match": "(?x) (?<=[=,:;\\^\\s\\{\\[\\(\\/]|\\.\\.) (?:[\\+\\-])? (?: \\d+ (?:[\\_\\d]+\\d)? ) (?: \\.  \\d+ (?:[\\_\\d]+\\d)? )? (?:   e  \\d+ (?:[\\_\\d]+\\d)? )?",
           "name": "constant.numeric.perl6fe"
         }
       ]

data/grammars/source.purescript.json

@@ -14,7 +14,7 @@
     "operatorFun": "(?:\\((?!--+\\))[\\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@\\[\\]\\\\\\^_]))",
     "classConstraint": "(?:(?:([\\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+)(?:(?<classConstraint>(?:[\\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}']*)(?:\\s*(?:\\s+)\\s*\\g<classConstraint>)?)))",
-    "functionTypeDeclaration": "(?:(?:(?<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*\\g<functionTypeDeclaration>)?))(?:\\s*(::|∷)))",
+    "functionTypeDeclaration": "(?:(?:(?<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*\\g<functionTypeDeclaration>)?))(?:\\s*(::|∷ )))",
     "ctorArgs": "(?:[\\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}']*|(?:(?:[\\w()'→⇒\\[\\],]|->|=>)+\\s*)+)",
     "ctor": "(?:(?:\\b([\\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+)(?:(?<ctorArgs>(?:(?:[\\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}']*|(?:(?:[\\w()'→⇒\\[\\],]|->|=>)+\\s*)+))(?:\\s*(?:\\s+)\\s*\\g<ctorArgs>)?)?))",
     "typeDecl": ".+?",
@@ -132,22 +132,31 @@
     },
     {
       "name": "meta.foreign.purescript",
-      "begin": "^(\\s*)(foreign)\\s+(import)\\b",
+      "begin": "^(\\s*)(foreign)\\s+(import)\\s+(?:(?:(?<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*\\g<functionTypeDeclaration>)?))(?:\\s*(::|∷ )))?",
       "end": "^(?!\\1[ \\t]|[ \\t]*$)",
+      "contentName": "meta.type-signature.purescript",
       "beginCaptures": {
         "2": {
           "name": "keyword.other.purescript"
         },
         "3": {
           "name": "keyword.other.purescript"
+        },
+        "4": {
+          "patterns": [
+            {
+              "name": "entity.name.function.purescript",
+              "match": "(?:[\\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}']*"
+            }
+          ]
+        },
+        "5": {
+          "name": "keyword.other.double-colon.purescript"
         }
       },
       "patterns": [
         {
           "include": "#type_signature"
-        },
-        {
-          "include": "$self"
         }
       ]
     },
@@ -309,7 +318,7 @@
     },
     {
       "name": "keyword.control.purescript",
-      "match": "\\b(do|if|then|else|case|of|let|in|default)\\b"
+      "match": "\\b(do|if|then|else|case|of|let|in)\\b"
     },
     {
       "name": "constant.numeric.float.purescript",
@@ -400,6 +409,45 @@
     {
       "include": "#function_type_declaration"
     },
+    {
+      "match": "\\((?<paren>(?:[^()]|\\(\\g<paren>\\))*)(::|∷)(?<paren2>(?:[^()]|\\(\\g<paren2>\\))*)\\)",
+      "captures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "$self"
+            }
+          ]
+        },
+        "2": {
+          "name": "keyword.other.double-colon.purescript"
+        },
+        "3": {
+          "name": "meta.type-signature.purescript",
+          "patterns": [
+            {
+              "include": "#type_signature"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "match": "(::|∷)((?:[\\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}']*|\\->|=>|[→⇒()\\[\\]]|\\s)*)",
+      "captures": {
+        "1": {
+          "name": "keyword.other.double-colon.purescript"
+        },
+        "2": {
+          "name": "meta.type-signature.purescript",
+          "patterns": [
+            {
+              "include": "#type_signature"
+            }
+          ]
+        }
+      }
+    },
     {
       "include": "#data_ctor"
     },
@@ -589,7 +637,7 @@
       "patterns": [
         {
           "name": "meta.function.type-declaration.purescript",
-          "begin": "(?:(?:^(\\s*))(?:(?:(?:(?<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*\\g<functionTypeDeclaration>)?))(?:\\s*(::|∷)))))",
+          "begin": "(?:(?:^(\\s*))(?:(?:(?:(?<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*\\g<functionTypeDeclaration>)?))(?:\\s*(::|∷ ))))(?:(?!.*<-)))",
           "end": "^(?!\\1[ \\t]|[ \\t]*$)",
           "contentName": "meta.type-signature.purescript",
           "beginCaptures": {
@@ -620,8 +668,8 @@
       "patterns": [
         {
           "name": "meta.record-field.type-declaration.purescript",
-          "begin": "(?:(?:(?<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*\\g<functionTypeDeclaration>)?))(?:\\s*(::|∷)))",
-          "end": "(?=(?:(?:(?<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*\\g<functionTypeDeclaration>)?))(?:\\s*(::|∷)))|})",
+          "begin": "(?:(?:(?<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*\\g<functionTypeDeclaration>)?))(?:\\s*(::|∷ )))",
+          "end": "(?=(?:(?:(?<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*\\g<functionTypeDeclaration>)?))(?:\\s*(::|∷ )))|})",
           "contentName": "meta.type-signature.purescript",
           "beginCaptures": {
             "1": {

data/grammars/source.regexp.babel.json

@@ -4,6 +4,32 @@
   "fileTypes": [
     "re"
   ],
+  "patterns": [
+    {
+      "include": "#anchor"
+    },
+    {
+      "include": "#backref"
+    },
+    {
+      "include": "#quantifier"
+    },
+    {
+      "include": "#operator"
+    },
+    {
+      "include": "#group-assertion"
+    },
+    {
+      "include": "#group-definition"
+    },
+    {
+      "include": "#character-class-definition"
+    },
+    {
+      "include": "#character-class"
+    }
+  ],
   "repository": {
     "character-class-definition": {
       "patterns": [
@@ -25,26 +51,35 @@
             }
           },
           "patterns": [
-            {
-              "include": "#character-class"
-            },
             {
               "name": "constant.other.character-class.range.regexp",
-              "match": "((\\\\[wWsSdD]|\\.)|(\\\\([trnvf0]|c[A-Z]|x[\\da-fA-F]{2}|u[\\da-fA-F]{4}|.)))\\-((\\\\[wWsSdD]|\\.)|(\\\\([trnvf0]|c[A-Z]|x[\\da-fA-F]{2}|u[\\da-fA-F]{4}|.)))",
+              "match": "((\\\\[wWsSdD]|\\.)|(\\\\([trnvf0]|c[A-Z]|x[\\da-fA-F]{2}|u[\\da-fA-F]{4}|u\\{[\\da-fA-F]+\\}|.)|([^\\]\\s])))(\\-)((\\\\[wWsSdD]|\\.)|(\\\\([trnvf0]|c[A-Z]|x[\\da-fA-F]{2}|u[\\da-fA-F]{4}|u\\{[\\da-fA-F]+\\}|.)|([^\\]\\s])))",
               "captures": {
                 "2": {
-                  "name": "constant.other.character-class.escape.backslash.regexp"
+                  "name": "constant.character.escape.backslash.regexp"
                 },
                 "3": {
                   "name": "constant.character.escape.backslash.regexp"
                 },
                 "5": {
-                  "name": "constant.other.character-class.escape.backslash.regexp"
+                  "name": "constant.character.regexp"
                 },
                 "6": {
+                  "name": "punctuation.definition.range.regexp"
+                },
+                "8": {
                   "name": "constant.character.escape.backslash.regexp"
+                },
+                "9": {
+                  "name": "constant.character.escape.backslash.regexp"
+                },
+                "11": {
+                  "name": "constant.character.regexp"
                 }
               }
+            },
+            {
+              "include": "#character-class"
             }
           ]
         }
@@ -53,11 +88,6 @@
     "group-assertion": {
       "patterns": [
         {
-          "patterns": [
-            {
-              "include": "$self"
-            }
-          ],
           "begin": "(\\()((\\?=)|(\\?!))",
           "end": "(\\))",
           "name": "meta.group.assertion.regexp",
@@ -79,7 +109,12 @@
             "4": {
               "name": "meta.assertion.negative-look-ahead.regexp"
             }
-          }
+          },
+          "patterns": [
+            {
+              "include": "$self"
+            }
+          ]
         }
       ]
     },
@@ -102,11 +137,6 @@
     "group-definition": {
       "patterns": [
         {
-          "patterns": [
-            {
-              "include": "$self"
-            }
-          ],
           "begin": "(\\()((\\?:))?",
           "end": "(\\))",
           "name": "meta.group.regexp",
@@ -128,7 +158,12 @@
             "6": {
               "name": "punctuation.definition.group.no-capture.regexp"
             }
-          }
+          },
+          "patterns": [
+            {
+              "include": "$self"
+            }
+          ]
         }
       ]
     },
@@ -151,40 +186,18 @@
     "character-class": {
       "patterns": [
         {
-          "name": "constant.other.character-class.escape.backslash.regexp",
-          "match": "\\\\[wWsSdD]|\\."
+          "name": "constant.character.escape.backslash.regexp",
+          "match": "\\\\[wWsSdD]"
         },
         {
-          "name": "constant.character.escape.backslash.regexp",
-          "match": "\\\\([trnvf0\\\\]|c[A-Z]|x[\\da-fA-F]{2}|u[\\da-fA-F]{4}|.)"
+          "match": "(\\\\([trnvf0\\\\]|c[A-Z]|x[\\da-fA-F]{2}|u[\\da-fA-F]{4}|u\\{[\\da-fA-F]+\\}|.))",
+          "captures": {
+            "1": {
+              "name": "constant.character.escape.backslash.regexp"
+            }
+          }
         }
       ]
     }
-  },
-  "patterns": [
-    {
-      "include": "#anchor"
-    },
-    {
-      "include": "#backref"
-    },
-    {
-      "include": "#quantifier"
-    },
-    {
-      "include": "#operator"
-    },
-    {
-      "include": "#group-assertion"
-    },
-    {
-      "include": "#group-definition"
-    },
-    {
-      "include": "#character-class"
-    },
-    {
-      "include": "#character-class-definition"
-    }
-  ]
+  }
 }

data/grammars/source.ruby.json

@@ -1428,6 +1428,44 @@
         }
       ]
     },
+    {
+      "begin": "(?=(?><<-(\"?)((?:[_\\w]+_|)GRAPHQL)\\b\\1))",
+      "comment": "Heredoc with embedded GraphQL",
+      "end": "(?!\\G)",
+      "name": "meta.embedded.block.graphql",
+      "patterns": [
+        {
+          "begin": "(?><<-(\"?)((?:[_\\w]+_|)GRAPHQL)\\b\\1)",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.ruby"
+            }
+          },
+          "contentName": "source.graphql",
+          "end": "\\s*\\2$\\n?",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.end.ruby"
+            }
+          },
+          "name": "string.unquoted.heredoc.ruby",
+          "patterns": [
+            {
+              "include": "#heredoc"
+            },
+            {
+              "include": "#interpolated_ruby"
+            },
+            {
+              "include": "source.graphql"
+            },
+            {
+              "include": "#escaped_char"
+            }
+          ]
+        }
+      ]
+    },
     {
       "begin": "(?>[=,]\\s*<<(\\w+))",
       "beginCaptures": {