github-linguist 4.8.8 → 4.8.9

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": "([\\p{Ll}_][\\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*)+)",
     "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": ".+?",
@@ -35,33 +35,9 @@
         }
       }
     },
-    {
-      "begin": "(\\[)([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)(\\|)",
-      "end": "(\\|)(\\])",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.definition.quasiquotes.begin.purescript"
-        },
-        "2": {
-          "name": "entity.name.tag.purescript"
-        },
-        "3": {
-          "name": "string.quoted.quasiquotes.purescript"
-        }
-      },
-      "endCaptures": {
-        "1": {
-          "name": "string.quoted.quasiquotes.purescript"
-        },
-        "2": {
-          "name": "punctuation.definition.quasiquotes.end.purescript"
-        }
-      },
-      "contentName": "string.quoted.quasiquotes.purescript"
-    },
     {
       "name": "meta.declaration.module.purescript",
-      "begin": "\\b(module)\\b",
+      "begin": "\\b(module)(?!')\\b",
       "end": "(where)",
       "beginCaptures": {
         "1": {
@@ -91,7 +67,7 @@
     },
     {
       "name": "meta.declaration.typeclass.purescript",
-      "begin": "\\b(class)\\b",
+      "begin": "\\b(class)(?!')\\b",
       "end": "\\b(where)\\b|$",
       "beginCaptures": {
         "1": {
@@ -111,7 +87,7 @@
     },
     {
       "name": "meta.declaration.instance.purescript",
-      "begin": "\\b(instance)\\b",
+      "begin": "\\b(instance)(?!')\\b",
       "end": "\\b(where)\\b|$",
       "contentName": "meta.type-signature.purescript",
       "beginCaptures": {
@@ -131,10 +107,10 @@
       ]
     },
     {
-      "name": "meta.foreign.purescript",
-      "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*(::|∷ )))?",
+      "name": "meta.foreign.data.purescript",
+      "begin": "^(\\s*)(foreign)\\s+(import)\\s+(data)\\s+([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)",
       "end": "^(?!\\1[ \\t]|[ \\t]*$)",
-      "contentName": "meta.type-signature.purescript",
+      "contentName": "meta.kind-signature.purescript",
       "beginCaptures": {
         "2": {
           "name": "keyword.other.purescript"
@@ -143,18 +119,44 @@
           "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}']*"
-            }
-          ]
+          "name": "keyword.other.purescript"
         },
         "5": {
+          "name": "entity.name.type.purescript"
+        },
+        "6": {
           "name": "keyword.other.double-colon.purescript"
         }
       },
       "patterns": [
+        {
+          "include": "#double_colon"
+        },
+        {
+          "include": "#kind_signature"
+        }
+      ]
+    },
+    {
+      "name": "meta.foreign.purescript",
+      "begin": "^(\\s*)(foreign)\\s+(import)\\s+([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)",
+      "end": "^(?!\\1[ \\t]|[ \\t]*$)",
+      "contentName": "meta.type-signature.purescript",
+      "beginCaptures": {
+        "2": {
+          "name": "keyword.other.purescript"
+        },
+        "3": {
+          "name": "keyword.other.purescript"
+        },
+        "4": {
+          "name": "entity.name.function.purescript"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#double_colon"
+        },
         {
           "include": "#type_signature"
         }
@@ -162,8 +164,8 @@
     },
     {
       "name": "meta.import.purescript",
-      "begin": "\\b(import)\\b",
-      "end": "($|;|(?=--))",
+      "begin": "\\b(import)(?!')\\b",
+      "end": "($|(?=--))",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.purescript"
@@ -177,7 +179,7 @@
           "include": "#module_exports"
         },
         {
-          "match": "\\b(qualified|as|hiding)\\b",
+          "match": "\\b(as|hiding)\\b",
           "captures": {
             "1": {
               "name": "keyword.other.purescript"
@@ -306,24 +308,28 @@
     },
     {
       "name": "keyword.other.purescript",
-      "match": "\\b(derive|where|data|type|newtype)\\b"
+      "match": "\\b(derive|where|data|type|newtype|infix[lr]?|foreign)(?!')\\b"
     },
     {
-      "name": "storage.type.purescript",
-      "match": "\\b(data|type|newtype)\\b"
+      "name": "entity.name.function.typed-hole.purescript",
+      "match": "\\?(?:[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)"
     },
     {
-      "name": "keyword.operator.purescript",
-      "match": "\\binfix[lr]?\\b"
+      "name": "storage.type.purescript",
+      "match": "\\b(data|type|newtype)(?!')\\b"
     },
     {
       "name": "keyword.control.purescript",
-      "match": "\\b(do|if|then|else|case|of|let|in)\\b"
+      "match": "\\b(do|if|then|else|case|of|let|in)(?!')\\b"
     },
     {
       "name": "constant.numeric.float.purescript",
       "match": "\\b([0-9]+\\.[0-9]+([eE][+-]?[0-9]+)?|[0-9]+[eE][+-]?[0-9]+)\\b"
     },
+    {
+      "name": "constant.language.boolean.purescript",
+      "match": "\\b(true|false)\\b"
+    },
     {
       "name": "constant.numeric.purescript",
       "match": "\\b([0-9]+|0([xX][0-9a-fA-F]+|[oO][0-7]+))\\b"
@@ -433,20 +439,18 @@
       }
     },
     {
-      "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"
-        },
+      "begin": "^(\\s*)(?:(::|∷))",
+      "beginCaptures": {
         "2": {
-          "name": "meta.type-signature.purescript",
-          "patterns": [
-            {
-              "include": "#type_signature"
-            }
-          ]
+          "name": "keyword.other.double-colon.purescript"
         }
-      }
+      },
+      "end": "^(?!\\1[ \\t]*|[ \\t]*$)",
+      "patterns": [
+        {
+          "include": "#type_signature"
+        }
+      ]
     },
     {
       "include": "#data_ctor"
@@ -474,18 +478,18 @@
     "block_comment": {
       "patterns": [
         {
-          "name": "comment.block.haddock.purescript",
-          "begin": "\\{-\\s*[|^]",
+          "name": "comment.block.documentation.purescript",
+          "begin": "\\{-\\s*\\|",
           "end": "-\\}",
           "applyEndPatternLast": 1,
           "beginCaptures": {
             "0": {
-              "name": "punctuation.definition.comment.haddock.purescript"
+              "name": "punctuation.definition.comment.documentation.purescript"
             }
           },
           "endCaptures": {
             "0": {
-              "name": "punctuation.definition.comment.haddock.purescript"
+              "name": "punctuation.definition.comment.documentation.purescript"
             }
           },
           "patterns": [
@@ -496,7 +500,7 @@
         },
         {
           "name": "comment.block.purescript",
-          "begin": "\\{-(?!#)",
+          "begin": "\\{-",
           "end": "-\\}",
           "applyEndPatternLast": 1,
           "beginCaptures": {
@@ -515,7 +519,7 @@
     "comments": {
       "patterns": [
         {
-          "begin": "(^[ \\t]+)?(?=--+\\s+[|^])",
+          "begin": "(^[ \\t]+)?(?=--+\\s+\\|)",
           "end": "(?!\\G)",
           "beginCaptures": {
             "1": {
@@ -524,15 +528,15 @@
           },
           "patterns": [
             {
-              "name": "comment.line.double-dash.haddock.purescript",
-              "begin": "(--+)\\s+([|^])",
+              "name": "comment.line.double-dash.documentation.purescript",
+              "begin": "(--+)\\s+(\\|)",
               "end": "\\n",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.definition.comment.purescript"
                 },
                 "2": {
-                  "name": "punctuation.definition.comment.haddock.purescript"
+                  "name": "punctuation.definition.comment.documentation.purescript"
                 }
               }
             }
@@ -637,26 +641,21 @@
       "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*)([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)\\s*(?:(::|∷)(?!.*<-))",
           "end": "^(?!\\1[ \\t]|[ \\t]*$)",
           "contentName": "meta.type-signature.purescript",
           "beginCaptures": {
             "2": {
-              "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}']*"
-                },
-                {
-                  "include": "#infix_op"
-                }
-              ]
+              "name": "entity.name.function.purescript"
             },
             "3": {
               "name": "keyword.other.double-colon.purescript"
             }
           },
           "patterns": [
+            {
+              "include": "#double_colon"
+            },
             {
               "include": "#type_signature"
             }
@@ -668,8 +667,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": "([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)\\s*(::|∷)",
+          "end": "(?=([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)\\s*(::|∷)|})",
           "contentName": "meta.type-signature.purescript",
           "beginCaptures": {
             "1": {
@@ -677,9 +676,6 @@
                 {
                   "name": "entity.other.attribute-name.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}']*"
-                },
-                {
-                  "include": "#infix_op"
                 }
               ]
             },
@@ -695,11 +691,31 @@
         }
       ]
     },
+    "kind_signature": {
+      "patterns": [
+        {
+          "name": "keyword.other.star.purescript",
+          "match": "\\*"
+        },
+        {
+          "name": "keyword.other.exclaimation-point.purescript",
+          "match": "!"
+        },
+        {
+          "name": "keyword.other.pound-sign.purescript",
+          "match": "#"
+        },
+        {
+          "name": "keyword.other.arrow.purescript",
+          "match": "->|→"
+        }
+      ]
+    },
     "type_signature": {
       "patterns": [
         {
           "name": "meta.class-constraints.purescript",
-          "match": "(?:(?:\\()(?:(?<classConstraints>(?:(?:(?:([\\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>)?))))(?:\\s*(?:,)\\s*\\g<classConstraints>)?))(?:\\))(?:\\s*(=>|<=|⇒)))",
+          "match": "(?:(?:\\()(?:(?<classConstraints>(?:(?:(?:([\\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>)?))))(?:\\s*(?:,)\\s*\\g<classConstraints>)?))(?:\\))(?:\\s*(=>|<=|⇐|⇒)))",
           "captures": {
             "1": {
               "patterns": [
@@ -715,7 +731,7 @@
         },
         {
           "name": "meta.class-constraints.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}']*)*)\\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>)?))))\\s*(=>|<=|⇒)",
+          "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}']*)*)\\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>)?))))\\s*(=>|<=|⇐|⇒)",
           "captures": {
             "1": {
               "patterns": [
@@ -739,11 +755,11 @@
         },
         {
           "name": "keyword.other.big-arrow-left.purescript",
-          "match": "<="
+          "match": "<=|⇐"
         },
         {
           "name": "keyword.other.forall.purescript",
-          "match": "forall"
+          "match": "forall|∀"
         },
         {
           "include": "#generic_type"
@@ -760,7 +776,7 @@
       "patterns": [
         {
           "name": "entity.name.type.purescript",
-          "match": "\\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}']*)*\\b"
+          "match": "\\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}']*)*"
         }
       ]
     },
@@ -768,7 +784,7 @@
       "patterns": [
         {
           "name": "entity.name.tag.purescript",
-          "match": "\\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}']*)*\\b"
+          "match": "\\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}']*)*"
         }
       ]
     },
@@ -776,7 +792,15 @@
       "patterns": [
         {
           "name": "variable.other.generic-type.purescript",
-          "match": "\\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}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*\\b"
+          "match": "\\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}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*"
+        }
+      ]
+    },
+    "double_colon": {
+      "patterns": [
+        {
+          "name": "keyword.other.double-colon.purescript",
+          "match": "(?:::|∷)"
         }
       ]
     },
@@ -790,7 +814,7 @@
               "patterns": [
                 {
                   "name": "entity.name.type.purescript",
-                  "match": "\\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}']*)*\\b"
+                  "match": "\\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}']*)*"
                 }
               ]
             },

data/grammars/source.python.json

@@ -10,7 +10,9 @@
     "SConstruct",
     "Sconstruct",
     "sconstruct",
-    "SConscript"
+    "SConscript",
+    "gyp",
+    "gypi"
   ],
   "first_line_match": "^#!/.*\\bpython[\\d\\.]*\\b",
   "firstLineMatch": "^#!/.*\\bpython[\\d\\.]*\\b",
@@ -1124,7 +1126,7 @@
     "function-declaration": {
       "name": "meta.function.python",
       "begin": "(?x)\n  \\s*\n  (?:\\b(async) \\s+)? \\b(def)\\s+\n    (?=\n      [[:alpha:]_][[:word:]]* \\s* \\(\n    )\n",
-      "end": "(:)",
+      "end": "(:|(?=[#'\"\\n]))",
       "beginCaptures": {
         "1": {
           "name": "storage.type.function.async.python"
@@ -1145,6 +1147,9 @@
         {
           "include": "#parameters"
         },
+        {
+          "include": "#line-continuation"
+        },
         {
           "include": "#return-annotation"
         }
@@ -1196,7 +1201,7 @@
           "include": "#parameter-special"
         },
         {
-          "match": "([[:alpha:]_]\\w*)\\s*(?:(,)|(?=\\)))",
+          "match": "(?x)\n  ([[:alpha:]_]\\w*)\n    \\s* (?: (,) | (?=[)#\\n=]))\n",
           "captures": {
             "1": {
               "name": "variable.parameter.function.language.python"
@@ -1210,7 +1215,7 @@
           "include": "#comments"
         },
         {
-          "include": "#parameter-with-default"
+          "include": "#loose-default"
         },
         {
           "include": "#annotated-parameter"
@@ -1234,14 +1239,11 @@
         }
       }
     },
-    "parameter-with-default": {
-      "begin": "(?x)\n  \\b\n  ([[:alpha:]_]\\w*) \\s* (=)\n",
+    "loose-default": {
+      "begin": "(=)",
       "end": "(,)|(?=\\))",
       "beginCaptures": {
         "1": {
-          "name": "variable.parameter.function.language.python"
-        },
-        "2": {
           "name": "keyword.operator.python"
         }
       },