github-linguist 5.3.3 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1de9a70dcfac92fc574e43f6dbd0f5bc7043639
-  data.tar.gz: cb4a74d96a47c1a3c6d5a536682a414e27b4cfd9
+  metadata.gz: db6d9aa8a004c4508d9a250b5681363780a404a0
+  data.tar.gz: 233c71f2eff076a7cd43cc853e5d260db364bf7c
 SHA512:
-  metadata.gz: abee467159bffa6ea2391f39445730f0bbbd95d9389a2a52862445f8af84f17dd4c979ce25b3af1beb80615a84177aed3886e06e330606af3498656434a04a1c
-  data.tar.gz: 90a9bdc3ab5470a10494bab3827c872b14ad2eccd7c2ea8c70d7b80342275baab777bfa3755429f4756fadaf4382270640077f08c37aa9ce470b406582446bc6
+  metadata.gz: 844e27beff910a740a6c0a3ae20472d4634f120680603b83083597a3aefe543741d2bddcb1f779f892d1b10b00612d84425c323fdb06cb411f81e6d755d7166c
+  data.tar.gz: 03ed08ceac11aa9de771163ac3125a144199db3eba6875a5912573a7a24c90ada47180ad6df817708c9814ad413c59c2ed4f1821b721ebccc2bb361638cd785e

data/bin/git-linguist

@@ -117,9 +117,8 @@ def git_linguist(args)
   end
 
   parser.parse!(args)
-
   git_dir = `git rev-parse --git-dir`.strip
-  raise "git-linguist must be run in a Git repository (#{Dir.pwd})" unless $?.success?
+  raise "git-linguist must be run in a Git repository" unless $?.success?
   wrapper = GitLinguist.new(git_dir, commit, incremental)
 
   case args.pop
@@ -141,6 +140,10 @@ def git_linguist(args)
     $stderr.print(parser.help)
     exit 1
   end
+rescue Exception => e
+  $stderr.puts e.message
+  $stderr.puts e.backtrace
+  exit 1
 end
 
 git_linguist(ARGV)

data/ext/linguist/linguist.c

@@ -2,6 +2,9 @@
 #include "linguist.h"
 #include "lex.linguist_yy.h"
 
+// Anything longer is unlikely to be useful.
+#define MAX_TOKEN_LEN 32
+
 int linguist_yywrap(yyscan_t yyscanner) {
 	return 1;
 }
@@ -32,19 +35,27 @@ static VALUE rb_tokenizer_extract_tokens(VALUE self, VALUE rb_data) {
 		case NO_ACTION:
 			break;
 		case REGULAR_TOKEN:
-			rb_ary_push(ary, rb_str_new2(extra.token));
+			len = strlen(extra.token);
+			if (len <= MAX_TOKEN_LEN)
+				rb_ary_push(ary, rb_str_new(extra.token, len));
 			free(extra.token);
 			break;
 		case SHEBANG_TOKEN:
-			s = rb_str_new2("SHEBANG#!");
-			rb_str_cat2(s, extra.token);
-			rb_ary_push(ary, s);
+			len = strlen(extra.token);
+			if (len <= MAX_TOKEN_LEN) {
+				s = rb_str_new2("SHEBANG#!");
+				rb_str_cat(s, extra.token, len);
+				rb_ary_push(ary, s);
+			}
 			free(extra.token);
 			break;
 		case SGML_TOKEN:
-			s = rb_str_new2(extra.token);
-			rb_str_cat2(s, ">");
-			rb_ary_push(ary, s);
+			len = strlen(extra.token);
+			if (len <= MAX_TOKEN_LEN) {
+				s = rb_str_new(extra.token, len);
+				rb_str_cat2(s, ">");
+				rb_ary_push(ary, s);
+			}
 			free(extra.token);
 			break;
 		}

data/grammars/annotation.liquidhaskell.haskell.json

@@ -1,41 +1,5 @@
 {
-  "fileTypes": [
-
-  ],
   "scopeName": "annotation.liquidhaskell.haskell",
-  "macros": {
-    "identStartCharClass": "[\\p{Ll}_\\p{Lu}\\p{Lt}]",
-    "identContCharClass": "[\\p{Ll}_\\p{Lu}\\p{Lt}']",
-    "identCharClass": "[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']",
-    "functionNameOne": "[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*",
-    "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}](?<![(),;\\[\\]`{}_\"']))+\\))",
-    "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}](?<![(),;\\[\\]`{}_\"'])))",
-    "functionList": "((?:(?:[\\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}](?<![(),;\\[\\]`{}_\"']))+\\))))*)",
-    "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}']*))",
-    "typeDecl": "(?>(?:(?:(?!(?:(?=[\\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}']*)))(?:\\s+(?:(?!(?:(?=[\\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}']*)))*)",
-    "indentChar": "[ \\t]",
-    "indentBlockStart": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\t]*)",
-    "indentBlockEnd": "(?:^(?!\\1[ \\t]|[ \\t]*$)|(?=@-}))",
-    "maybeBirdTrack": "(?:\\G(?:\\s*\\w+\\s)?|^)",
-    "lb": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?<![\\p{Ll}_\\p{Lu}\\p{Lt}']))",
-    "rb": "(?:(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
-    "b": "(?:(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?<![\\p{Ll}_\\p{Lu}\\p{Lt}']))|(?:(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])))"
-  },
   "patterns": [
     {
       "include": "#class_decl"
@@ -54,16 +18,46 @@
     },
     {
       "include": "#lazy_function_type_signature"
+    },
+    {
+      "include": "#haskell_expr"
+    },
+    {
+      "include": "#comments"
     }
   ],
   "repository": {
+    "assignment_op": {
+      "patterns": [
+        {
+          "match": "=",
+          "captures": {
+            "0": {
+              "name": "keyword.operator.assignment.haskell"
+            }
+          }
+        }
+      ]
+    },
+    "attribute_name": {
+      "patterns": [
+        {
+          "name": "entity.other.attribute-name.haskell",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\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}']*(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
+        }
+      ]
+    },
     "block_comment": {
       "patterns": [
         {
           "name": "comment.block.haddock.haskell",
           "begin": "\\{-\\s*[|^]",
           "end": "-\\}",
-          "applyEndPatternLast": 1,
+          "patterns": [
+            {
+              "include": "#block_comment"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.haddock.haskell"
@@ -74,17 +68,17 @@
               "name": "punctuation.definition.comment.haddock.haskell"
             }
           },
-          "patterns": [
-            {
-              "include": "#block_comment"
-            }
-          ]
+          "applyEndPatternLast": true
         },
         {
           "name": "comment.block.haskell",
           "begin": "\\{-",
           "end": "-\\}",
-          "applyEndPatternLast": 1,
+          "patterns": [
+            {
+              "include": "#block_comment"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.block.start.haskell"
@@ -95,14 +89,77 @@
               "name": "punctuation.definition.comment.block.end.haskell"
             }
           },
+          "applyEndPatternLast": true
+        }
+      ]
+    },
+    "c_preprocessor": {
+      "patterns": [
+        {
+          "name": "meta.preprocessor.c.haskell",
+          "begin": "(?:\\G(?:\\s*\\w+\\s)?|^)(?=#)",
+          "end": "(?\u003c!\\\\)(?=$)",
           "patterns": [
             {
-              "include": "#block_comment"
+              "name": "keyword.control.c.haskell",
+              "match": "^#\\S+"
             }
           ]
         }
       ]
     },
+    "characters": {
+      "patterns": [
+        {
+          "name": "constant.character.escape.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\\\\\\\"'\\\u0026])"
+        },
+        {
+          "name": "constant.character.escape.octal.haskell",
+          "match": "(?:\\\\o[0-7]+)"
+        },
+        {
+          "name": "constant.character.escape.hexadecimal.haskell",
+          "match": "(?:\\\\x[0-9A-Fa-f]+)"
+        },
+        {
+          "name": "constant.character.escape.control.haskell",
+          "match": "(?:\\\\\\^[A-Z@\\[\\]\\\\^_])"
+        }
+      ]
+    },
+    "class_decl": {
+      "patterns": [
+        {
+          "name": "meta.declaration.class.haskell",
+          "begin": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\t]*)(class)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "end": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(where)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))|(?:^(?!\\1[ \\t]|[ \\t]*$)|(?=@-}))",
+          "patterns": [
+            {
+              "include": "#type_signature"
+            }
+          ],
+          "beginCaptures": {
+            "2": {
+              "name": "keyword.other.class.haskell"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "keyword.other.haskell"
+            }
+          }
+        }
+      ]
+    },
+    "comma": {
+      "patterns": [
+        {
+          "name": "punctuation.separator.comma.haskell",
+          "match": ","
+        }
+      ]
+    },
     "comments": {
       "patterns": [
         {
@@ -125,7 +182,7 @@
           ]
         },
         {
-          "begin": "((?:\\G(?:\\s*\\w+\\s)?|^)[ \\t]+)?(?=--+(?!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))))",
+          "begin": "((?:\\G(?:\\s*\\w+\\s)?|^)[ \\t]+)?(?=--+(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))))",
           "end": "(?!\\G)",
           "patterns": [
             {
@@ -145,169 +202,246 @@
         }
       ]
     },
-    "characters": {
+    "common_toplevel": {
       "patterns": [
         {
-          "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\\\\\\\"'\\&])",
-          "name": "constant.character.escape.haskell"
+          "include": "#class_decl"
+        },
+        {
+          "include": "#instance_decl"
+        },
+        {
+          "include": "#deriving_instance_decl"
+        },
+        {
+          "include": "#foreign_import"
+        },
+        {
+          "include": "#regular_import"
         },
         {
-          "match": "(?:\\\\o[0-7]+)",
-          "name": "constant.character.escape.octal.haskell"
+          "include": "#data_decl"
         },
         {
-          "match": "(?:\\\\x[0-9A-Fa-f]+)",
-          "name": "constant.character.escape.hexadecimal.haskell"
+          "include": "#type_alias"
         },
         {
-          "match": "(?:\\\\\\^[A-Z@\\[\\]\\\\^_])",
-          "name": "constant.character.escape.control.haskell"
+          "include": "#c_preprocessor"
         }
       ]
     },
-    "infix_op": {
+    "ctor_type_declaration": {
       "patterns": [
         {
-          "name": "entity.name.function.infix.haskell",
-          "match": "(?:\\((?!--+\\))(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))+\\))"
+          "name": "meta.ctor.type-declaration.haskell",
+          "contentName": "meta.type-signature.haskell",
+          "begin": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\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{Lu}\\p{Lt}])(?\u003c![\\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{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\)))(?:(?:\\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{Lu}\\p{Lt}])(?\u003c![\\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{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\))))*))(?:\\s*((?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))))))",
+          "end": "(?:^(?!\\1[ \\t]|[ \\t]*$)|(?=@-}))",
+          "patterns": [
+            {
+              "include": "#type_signature"
+            }
+          ],
+          "beginCaptures": {
+            "2": {
+              "patterns": [
+                {
+                  "include": "#type_ctor"
+                },
+                {
+                  "include": "#infix_op"
+                }
+              ]
+            },
+            "3": {
+              "name": "keyword.other.double-colon.haskell"
+            }
+          }
         }
       ]
     },
-    "module_exports": {
+    "data_decl": {
       "patterns": [
         {
-          "name": "meta.declaration.exports.haskell",
-          "begin": "\\(",
-          "end": "\\)",
-          "applyEndPatternLast": 1,
+          "name": "meta.declaration.type.data.haskell",
+          "begin": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\t]*)(data|newtype)\\s+((?:(?!=|where).)*)",
+          "end": "(?:^(?!\\1[ \\t]|[ \\t]*$)|(?=@-}))",
           "patterns": [
             {
               "include": "#comments"
             },
             {
-              "include": "#function_name"
+              "include": "#where"
             },
             {
-              "include": "#type_name"
+              "include": "#deriving"
             },
             {
-              "include": "#comma"
+              "include": "#assignment_op"
             },
             {
-              "name": "meta.other.constructor-list.haskell",
-              "begin": "(?:(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))\\s*\\(",
-              "end": "\\)",
-              "patterns": [
-                {
-                  "include": "#type_ctor"
+              "match": "(?:(?:(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\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()'→⇒\\[\\],]|-\u003e|=\u003e)+\\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()'→⇒\\[\\],]|-\u003e|=\u003e)+\\s*)+)))*)?))",
+              "captures": {
+                "1": {
+                  "patterns": [
+                    {
+                      "include": "#type_ctor"
+                    }
+                  ]
                 },
+                "2": {
+                  "name": "meta.type-signature.haskell",
+                  "patterns": [
+                    {
+                      "include": "#type_signature"
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              "match": "\\|",
+              "captures": {
+                "0": {
+                  "name": "punctuation.separator.pipe.haskell"
+                }
+              }
+            },
+            {
+              "name": "meta.declaration.type.data.record.block.haskell",
+              "begin": "\\{",
+              "end": "\\}",
+              "patterns": [
                 {
-                  "include": "#attribute_name"
+                  "include": "#comments"
                 },
                 {
                   "include": "#comma"
                 },
                 {
-                  "match": "\\.\\.",
-                  "name": "keyword.operator.wildcard.haskell"
+                  "include": "#record_field_declaration"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "keyword.operator.record.begin.haskell"
+                }
+              },
+              "endCaptures": {
+                "0": {
+                  "name": "keyword.operator.record.end.haskell"
+                }
+              }
             },
             {
-              "include": "#infix_op"
+              "include": "#ctor_type_declaration"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "2": {
+              "name": "keyword.other.data.haskell"
+            },
+            "3": {
+              "name": "meta.type-signature.haskell",
+              "patterns": [
+                {
+                  "include": "#family_and_instance"
+                },
+                {
+                  "include": "#type_signature"
+                }
+              ]
+            }
+          }
         }
       ]
     },
-    "module_name": {
+    "deriving": {
       "patterns": [
         {
-          "name": "support.other.module.haskell",
-          "match": "(?:(?=[\\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{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
+          "include": "#deriving_list"
+        },
+        {
+          "include": "#deriving_simple"
+        },
+        {
+          "include": "#deriving_keyword"
         }
       ]
     },
-    "module_name_prefix": {
+    "deriving_instance_decl": {
       "patterns": [
         {
-          "name": "support.other.module.haskell",
-          "match": "(?:(?=[\\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}']*)*\\."
+          "name": "meta.declaration.instance.deriving.haskell",
+          "contentName": "meta.type-signature.haskell",
+          "begin": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\t]*)(deriving\\s+instance)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "end": "(?:^(?!\\1[ \\t]|[ \\t]*$)|(?=@-}))",
+          "patterns": [
+            {
+              "include": "#pragma"
+            },
+            {
+              "include": "#type_signature"
+            }
+          ],
+          "beginCaptures": {
+            "2": {
+              "name": "keyword.other.haskell"
+            }
+          }
         }
       ]
     },
-    "pragma": {
+    "deriving_keyword": {
       "patterns": [
         {
-          "name": "meta.preprocessor.haskell",
-          "begin": "\\{-#",
-          "end": "#-\\}",
-          "patterns": [
-            {
-              "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?<![\\p{Ll}_\\p{Lu}\\p{Lt}']))((?i:NOTINLINE CONSTRUCTORLIKE|NOINLINE CONSTRUCTORLIKE|INLINE CONSTRUCTORLIKE|SPECIALISE NOTINLINE|SPECIALIZE NOTINLINE|SPECIALISE NOINLINE|SPECIALIZE NOINLINE|NOTINLINE CONLIKE|SPECIALISE INLINE|SPECIALIZE INLINE|NOINLINE CONLIKE|VECTORISE SCALAR|VECTORIZE SCALAR|OPTIONS_HADDOCK|INLINE CONLIKE|OPTIONS_DERIVE|OPTIONS_CATCH|OPTIONS_NHC98|OPTIONS_HUGS|OVERLAPPABLE|NOVECTORISE|NOVECTORIZE|OPTIONS_GHC|OPTIONS_JHC|OPTIONS_YHC|OVERLAPPING|DEPRECATED|INCOHERENT|INLINEABLE|SPECIALISE|SPECIALIZE|GENERATED|INLINABLE|NOTINLINE|VECTORISE|VECTORIZE|CONTRACT|LANGUAGE|NOINLINE|NOUNPACK|OVERLAPS|INCLUDE|MINIMAL|OPTIONS|WARNING|CFILES|INLINE|SOURCE|UNPACK|CTYPE|RULES|CORE|LINE|ANN|SCC))(?:(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
-              "name": "keyword.other.preprocessor.haskell"
+          "name": "meta.deriving.haskell",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(deriving)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "captures": {
+            "1": {
+              "name": "keyword.other.haskell"
             }
-          ]
+          }
         }
       ]
     },
-    "function_type_declaration": {
+    "deriving_list": {
       "patterns": [
         {
-          "name": "meta.function.type-declaration.haskell",
-          "begin": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\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": {
-            "2": {
-              "patterns": [
-                {
-                  "include": "#function_name"
-                },
-                {
-                  "include": "#infix_op"
-                }
-              ]
-            },
-            "3": {
-              "name": "keyword.other.double-colon.haskell"
-            }
-          },
+          "name": "meta.deriving.haskell",
+          "begin": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(deriving)\\s*\\(",
+          "end": "\\)",
           "patterns": [
             {
-              "include": "#type_signature"
+              "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\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}']*)*)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+              "captures": {
+                "1": {
+                  "name": "entity.other.inherited-class.haskell"
+                }
+              }
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.haskell"
+            }
+          }
         }
       ]
     },
-    "lazy_function_type_signature": {
+    "deriving_simple": {
       "patterns": [
         {
-          "name": "meta.function.type-declaration.haskell",
-          "begin": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\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*$",
-          "end": "(?:^(?!\\1[ \\t]|[ \\t]*$)|(?=@-}))",
-          "contentName": "meta.type-signature.haskell",
-          "beginCaptures": {
-            "2": {
-              "patterns": [
-                {
-                  "include": "#function_name"
-                },
-                {
-                  "include": "#infix_op"
-                }
-              ]
-            }
-          },
-          "patterns": [
-            {
-              "include": "#double_colon_operator"
+          "name": "meta.deriving.haskell",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(deriving)\\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}']*)*)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "captures": {
+            "1": {
+              "name": "keyword.other.haskell"
             },
-            {
-              "include": "#type_signature"
+            "2": {
+              "name": "entity.other.inherited-class.haskell"
             }
-          ]
+          }
         }
       ]
     },
@@ -315,118 +449,223 @@
       "patterns": [
         {
           "name": "keyword.other.double-colon.haskell",
-          "match": "(?<!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))"
+          "match": "(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))"
         }
       ]
     },
-    "ctor_type_declaration": {
+    "empty_list": {
       "patterns": [
         {
-          "name": "meta.ctor.type-declaration.haskell",
-          "begin": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\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}](?<![(),;\\[\\]`{}_\"']))))))",
+          "name": "constant.language.empty-list.haskell",
+          "match": "\\[\\]"
+        }
+      ]
+    },
+    "family_and_instance": {
+      "patterns": [
+        {
+          "name": "keyword.other.haskell",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(family|instance)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
+        }
+      ]
+    },
+    "foreign_import": {
+      "patterns": [
+        {
+          "name": "meta.foreign.haskell",
+          "begin": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\t]*)(foreign)\\s+(import|export)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
           "end": "(?:^(?!\\1[ \\t]|[ \\t]*$)|(?=@-}))",
-          "contentName": "meta.type-signature.haskell",
+          "patterns": [
+            {
+              "match": "(?:un)?safe",
+              "captures": {
+                "0": {
+                  "name": "keyword.other.haskell"
+                }
+              }
+            },
+            {
+              "include": "#function_type_declaration"
+            },
+            {
+              "include": "#haskell_expr"
+            },
+            {
+              "include": "#comments"
+            }
+          ],
           "beginCaptures": {
             "2": {
-              "patterns": [
-                {
-                  "include": "#type_ctor"
-                },
-                {
-                  "include": "#infix_op"
-                }
-              ]
+              "name": "keyword.other.haskell"
             },
             "3": {
-              "name": "keyword.other.double-colon.haskell"
-            }
-          },
-          "patterns": [
-            {
-              "include": "#type_signature"
+              "name": "keyword.other.haskell"
             }
-          ]
+          }
         }
       ]
     },
-    "record_field_declaration": {
+    "function_name": {
       "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}](?<![(),;\\[\\]`{}_\"']))))))|})",
+          "name": "entity.name.function.haskell",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\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}']*(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
+        }
+      ]
+    },
+    "function_type_declaration": {
+      "patterns": [
+        {
+          "name": "meta.function.type-declaration.haskell",
           "contentName": "meta.type-signature.haskell",
+          "begin": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\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{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\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{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\)))(?:(?:\\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{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\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{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\))))*)\\s*((?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))))))",
+          "end": "(?:^(?!\\1[ \\t]|[ \\t]*$)|(?=@-}))|(?=(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(\u003c-|=)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))))",
+          "patterns": [
+            {
+              "include": "#type_signature"
+            }
+          ],
           "beginCaptures": {
-            "1": {
+            "2": {
               "patterns": [
                 {
-                  "include": "#attribute_name"
+                  "include": "#function_name"
                 },
                 {
                   "include": "#infix_op"
                 }
               ]
             },
-            "2": {
+            "3": {
               "name": "keyword.other.double-colon.haskell"
             }
-          },
-          "patterns": [
-            {
-              "include": "#type_signature"
-            }
-          ]
+          }
         }
       ]
     },
-    "type_signature": {
+    "function_type_declaration_with_scoped_type": {
       "patterns": [
         {
-          "include": "#liquid_id"
+          "include": "#scoped_type_override"
         },
         {
-          "include": "#liquid_type"
+          "include": "#function_type_declaration"
         },
         {
-          "include": "#type_signature_hs"
+          "include": "#multiline_type_declaration"
         }
       ]
     },
-    "unit": {
+    "haskell_expr": {
       "patterns": [
         {
-          "name": "constant.language.unit.haskell",
-          "match": "\\(\\)"
+          "include": "#infix_function"
+        },
+        {
+          "include": "#unit"
+        },
+        {
+          "include": "#empty_list"
+        },
+        {
+          "include": "#quasi_quotes"
+        },
+        {
+          "include": "#keywords"
+        },
+        {
+          "include": "#pragma"
+        },
+        {
+          "include": "#string"
+        },
+        {
+          "include": "#newline_escape"
+        },
+        {
+          "include": "#quoted_character"
+        },
+        {
+          "include": "#comments"
+        },
+        {
+          "include": "#infix_op"
+        },
+        {
+          "include": "#comma"
+        },
+        {
+          "include": "#lit_num"
+        },
+        {
+          "include": "#scoped_type"
+        },
+        {
+          "include": "#operator"
+        },
+        {
+          "include": "#identifier"
+        },
+        {
+          "include": "#type_ctor"
         }
       ]
     },
-    "empty_list": {
+    "haskell_source": {
       "patterns": [
         {
-          "name": "constant.language.empty-list.haskell",
-          "match": "\\[\\]"
+          "include": "#shebang"
+        },
+        {
+          "include": "#module_decl"
+        },
+        {
+          "include": "#haskell_toplevel"
         }
       ]
     },
-    "deriving": {
+    "haskell_toplevel": {
       "patterns": [
         {
-          "include": "#deriving_list"
+          "include": "#liquidhaskell_annotation"
         },
         {
-          "include": "#deriving_simple"
+          "include": "#common_toplevel"
         },
         {
-          "include": "#deriving_keyword"
+          "include": "#function_type_declaration_with_scoped_type"
+        },
+        {
+          "include": "#haskell_expr"
         }
       ]
     },
-    "deriving_keyword": {
+    "hsig_decl": {
       "patterns": [
         {
-          "name": "meta.deriving.haskell",
-          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?<![\\p{Ll}_\\p{Lu}\\p{Lt}']))(deriving)(?:(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
-          "captures": {
+          "name": "meta.declaration.module.haskell",
+          "begin": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\t]*)(signature)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "end": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(where)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))|(?:^(?!\\1[ \\t]|[ \\t]*$)|(?=@-}))",
+          "patterns": [
+            {
+              "include": "#comments"
+            },
+            {
+              "include": "#module_name"
+            },
+            {
+              "include": "#module_exports"
+            },
+            {
+              "include": "#invalid"
+            }
+          ],
+          "beginCaptures": {
+            "2": {
+              "name": "keyword.other.haskell"
+            }
+          },
+          "endCaptures": {
             "1": {
               "name": "keyword.other.haskell"
             }
@@ -434,41 +673,48 @@
         }
       ]
     },
-    "deriving_list": {
+    "hsig_source": {
       "patterns": [
         {
-          "name": "meta.deriving.haskell",
-          "begin": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?<![\\p{Ll}_\\p{Lu}\\p{Lt}']))(deriving)\\s*\\(",
-          "end": "\\)",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.other.haskell"
-            }
-          },
-          "patterns": [
-            {
-              "match": "(?:(?=[\\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{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
-              "captures": {
-                "1": {
-                  "name": "entity.other.inherited-class.haskell"
-                }
-              }
-            }
-          ]
+          "include": "#hsig_decl"
+        },
+        {
+          "include": "#hsig_toplevel"
         }
       ]
     },
-    "deriving_simple": {
+    "hsig_toplevel": {
       "patterns": [
         {
-          "name": "meta.deriving.haskell",
-          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?<![\\p{Ll}_\\p{Lu}\\p{Lt}']))(deriving)\\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{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "include": "#common_toplevel"
+        },
+        {
+          "include": "#function_type_declaration"
+        },
+        {
+          "include": "#lazy_function_type_signature"
+        },
+        {
+          "include": "#comments"
+        }
+      ]
+    },
+    "identifier": {
+      "patterns": [
+        {
+          "name": "identifier.haskell",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\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}']*(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
           "captures": {
-            "1": {
-              "name": "keyword.other.haskell"
-            },
-            "2": {
-              "name": "entity.other.inherited-class.haskell"
+            "0": {
+              "patterns": [
+                {
+                  "include": "#module_name_prefix"
+                },
+                {
+                  "name": "support.function.prelude.$1.haskell",
+                  "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(abs|acos|acosh|all|and|any|appendFile|asTypeOf|asin|asinh|atan|atan2|atanh|break|ceiling|compare|concat|concatMap|const|cos|cosh|curry|cycle|decodeFloat|div|divMod|drop|dropWhile|either|elem|encodeFloat|enumFrom|enumFromThen|enumFromThenTo|enumFromTo|error|errorWithoutStackTrace|even|exp|exponent|fail|filter|flip|floatDigits|floatRadix|floatRange|floor|fmap|foldMap|foldl|foldl1|foldr|foldr1|fromEnum|fromInteger|fromIntegral|fromRational|fst|gcd|getChar|getContents|getLine|head|id|init|interact|ioError|isDenormalized|isIEEE|isInfinite|isNaN|isNegativeZero|iterate|last|lcm|length|lex|lines|log|logBase|lookup|map|mapM|mapM_|mappend|max|maxBound|maximum|maybe|mconcat|mempty|min|minBound|minimum|mod|negate|not|notElem|null|odd|or|otherwise|pi|pred|print|product|properFraction|pure|putChar|putStr|putStrLn|quot|quotRem|read|readFile|readIO|readList|readLn|readParen|reads|readsPrec|realToFrac|recip|rem|repeat|replicate|return|reverse|round|scaleFloat|scanl|scanl1|scanr|scanr1|seq|sequence|sequenceA|sequence_|show|showChar|showList|showParen|showString|shows|showsPrec|significand|signum|sin|sinh|snd|span|splitAt|sqrt|subtract|succ|sum|tail|take|takeWhile|tan|tanh|toEnum|toInteger|toRational|traverse|truncate|uncurry|undefined|unlines|until|unwords|unzip|unzip3|userError|words|writeFile|zip|zip3|zipWith|zipWith3)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
+                }
+              ]
             }
           }
         }
@@ -490,72 +736,42 @@
         }
       ]
     },
-    "quasi_quotes": {
+    "infix_op": {
       "patterns": [
         {
-          "begin": "(\\[)((?:[\\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}']*)(\\|)",
-          "end": "(\\|)(\\])",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.quasiquotes.begin.haskell"
-            },
-            "2": {
-              "name": "entity.name.tag.haskell",
+          "name": "entity.name.function.operator.haskell",
+          "match": "(?:\\((?!--+\\))(?:(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\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{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\))",
+          "captures": {
+            "0": {
               "patterns": [
                 {
                   "include": "#module_name_prefix"
+                },
+                {
+                  "name": "support.operator.prelude.haskell",
+                  "match": "^\\((\\!\\!|\\$\\!|\\$|\\\u0026\\\u0026|\\*|\\*\\*|\\*\\\u003e|\\+|\\+\\+|\\-|\\.|\\/|\\/\\=|\\\u003c\\$|\\\u003c\\$\\\u003e|\\\u003c|\\\u003c\\*|\\\u003c\\*\\\u003e|\\\u003c\\=|\\=\\\u003c\\\u003c|\\=\\=|\\\u003e|\\\u003e\\=|\\\u003e\\\u003e|\\\u003e\\\u003e\\=|\\^|\\^\\^|\\|\\|)\\)$"
                 }
               ]
             }
-          },
-          "endCaptures": {
-            "2": {
-              "name": "punctuation.definition.quasiquotes.end.haskell"
-            }
-          },
-          "contentName": "string.quoted.quasiquotes.haskell"
+          }
         }
       ]
     },
-    "module_decl": {
+    "instance_decl": {
       "patterns": [
         {
-          "name": "meta.declaration.module.haskell",
-          "begin": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\t]*)(module)(?:(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
-          "end": "(?:(?=[\\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}']))|(?:^(?!\\1[ \\t]|[ \\t]*$)|(?=@-}))",
-          "beginCaptures": {
-            "2": {
-              "name": "keyword.other.haskell"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "keyword.other.haskell"
-            }
-          },
+          "name": "meta.declaration.instance.haskell",
+          "contentName": "meta.type-signature.haskell",
+          "begin": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\t]*)(instance)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "end": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(where)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))|(?:^(?!\\1[ \\t]|[ \\t]*$)|(?=@-}))",
           "patterns": [
             {
-              "include": "#comments"
-            },
-            {
-              "include": "#module_name"
-            },
-            {
-              "include": "#module_exports"
+              "include": "#pragma"
             },
             {
-              "include": "#invalid"
+              "include": "#type_signature"
             }
-          ]
-        }
-      ]
-    },
-    "hsig_decl": {
-      "patterns": [
-        {
-          "name": "meta.declaration.module.haskell",
-          "begin": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\t]*)(signature)(?:(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
-          "end": "(?:(?=[\\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}']))|(?:^(?!\\1[ \\t]|[ \\t]*$)|(?=@-}))",
+          ],
           "beginCaptures": {
             "2": {
               "name": "keyword.other.haskell"
@@ -565,370 +781,290 @@
             "1": {
               "name": "keyword.other.haskell"
             }
-          },
-          "patterns": [
-            {
-              "include": "#comments"
-            },
-            {
-              "include": "#module_name"
-            },
-            {
-              "include": "#module_exports"
-            },
-            {
-              "include": "#invalid"
-            }
-          ]
+          }
         }
       ]
     },
-    "class_decl": {
+    "invalid": {
       "patterns": [
         {
-          "name": "meta.declaration.class.haskell",
-          "begin": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\t]*)(class)(?:(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
-          "end": "(?:(?=[\\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}']))|(?:^(?!\\1[ \\t]|[ \\t]*$)|(?=@-}))",
-          "beginCaptures": {
-            "2": {
-              "name": "keyword.other.class.haskell"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "keyword.other.haskell"
-            }
-          },
-          "patterns": [
-            {
-              "include": "#type_signature"
-            }
-          ]
+          "name": "invalid.illegal.character-not-allowed-here.haskell",
+          "match": "\\S+"
         }
       ]
     },
-    "instance_decl": {
+    "keywords": {
       "patterns": [
         {
-          "name": "meta.declaration.instance.haskell",
-          "begin": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\t]*)(instance)(?:(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
-          "end": "(?:(?=[\\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}']))|(?:^(?!\\1[ \\t]|[ \\t]*$)|(?=@-}))",
-          "contentName": "meta.type-signature.haskell",
-          "beginCaptures": {
-            "2": {
-              "name": "keyword.other.haskell"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "keyword.other.haskell"
-            }
-          },
-          "patterns": [
-            {
-              "include": "#pragma"
-            },
-            {
-              "include": "#type_signature"
-            }
-          ]
+          "name": "keyword.other.$1.haskell",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(deriving|where|data|type|newtype)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
+        },
+        {
+          "name": "keyword.operator.$1.haskell",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(infix[lr]?)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
+        },
+        {
+          "name": "keyword.control.$1.haskell",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(do|if|then|else|case|of|let|in|default|mdo|rec|proc)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
         }
       ]
     },
-    "deriving_instance_decl": {
+    "lazy_function_type_signature": {
       "patterns": [
         {
-          "name": "meta.declaration.instance.deriving.haskell",
-          "begin": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\t]*)(deriving\\s+instance)(?:(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
-          "end": "(?:^(?!\\1[ \\t]|[ \\t]*$)|(?=@-}))",
+          "name": "meta.function.type-declaration.haskell",
           "contentName": "meta.type-signature.haskell",
-          "beginCaptures": {
-            "2": {
-              "name": "keyword.other.haskell"
-            }
-          },
+          "begin": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\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{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\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{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\)))(?:(?:\\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{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\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{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\))))*))\\s*$",
+          "end": "(?:^(?!\\1[ \\t]|[ \\t]*$)|(?=@-}))",
           "patterns": [
             {
-              "include": "#pragma"
+              "include": "#double_colon_operator"
             },
             {
               "include": "#type_signature"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "2": {
+              "patterns": [
+                {
+                  "include": "#function_name"
+                },
+                {
+                  "include": "#infix_op"
+                }
+              ]
+            }
+          }
         }
       ]
     },
-    "foreign_import": {
+    "liquid_id": {
       "patterns": [
         {
-          "name": "meta.foreign.haskell",
-          "begin": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\t]*)(foreign)\\s+(import|export)(?:(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
-          "end": "(?:^(?!\\1[ \\t]|[ \\t]*$)|(?=@-}))",
-          "beginCaptures": {
-            "2": {
-              "name": "keyword.other.haskell"
-            },
-            "3": {
-              "name": "keyword.other.haskell"
-            }
-          },
-          "patterns": [
-            {
-              "match": "(?:un)?safe",
-              "captures": {
-                "0": {
-                  "name": "keyword.other.haskell"
+          "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}']*\\s*:",
+          "captures": {
+            "0": {
+              "patterns": [
+                {
+                  "include": "#identifier"
                 }
-              }
-            },
-            {
-              "include": "#function_type_declaration"
-            },
-            {
-              "include": "#haskell_expr"
-            },
-            {
-              "include": "#comments"
+              ]
             }
-          ]
+          }
         }
       ]
     },
-    "regular_import": {
+    "liquid_type": {
       "patterns": [
         {
-          "name": "meta.import.haskell",
-          "begin": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\t]*)(import)(?:(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
-          "end": "(?:^(?!\\1[ \\t]|[ \\t]*$)|(?=@-}))",
-          "beginCaptures": {
-            "2": {
-              "name": "keyword.other.haskell"
-            }
-          },
+          "name": "liquid.type.haskell",
+          "begin": "\\{",
+          "end": "\\}",
           "patterns": [
             {
-              "include": "#module_name"
-            },
-            {
-              "include": "#module_exports"
-            },
-            {
-              "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?<![\\p{Ll}_\\p{Lu}\\p{Lt}']))(qualified|as|hiding)(?:(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+              "match": "\\G(.*?)\\|",
               "captures": {
                 "1": {
-                  "name": "keyword.other.haskell"
+                  "patterns": [
+                    {
+                      "include": "#type_signature"
+                    }
+                  ]
                 }
               }
             },
             {
-              "include": "#comments"
+              "include": "#haskell_expr"
             }
           ]
         }
       ]
     },
-    "data_decl": {
+    "liquidhaskell_annotation": {
       "patterns": [
         {
-          "name": "meta.declaration.type.data.haskell",
-          "begin": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\t]*)(data|newtype)\\s+((?:(?!=|where).)*)",
-          "end": "(?:^(?!\\1[ \\t]|[ \\t]*$)|(?=@-}))",
-          "beginCaptures": {
-            "2": {
-              "name": "keyword.other.data.haskell"
-            },
-            "3": {
-              "name": "meta.type-signature.haskell",
-              "patterns": [
-                {
-                  "include": "#family_and_instance"
-                },
-                {
-                  "include": "#type_signature"
-                }
-              ]
+          "name": "block.liquidhaskell.haskell",
+          "contentName": "block.liquidhaskell.annotation.haskell",
+          "begin": "\\{-@(?!#)",
+          "end": "@-\\}",
+          "patterns": [
+            {
+              "include": "annotation.liquidhaskell.haskell"
             }
-          },
+          ]
+        }
+      ]
+    },
+    "lit_num": {
+      "patterns": [
+        {
+          "name": "constant.numeric.hexfloat.haskell",
+          "match": "0[xX][0-9a-fA-F_]*(?:\\.[0-9a-fA-F_]+(?:[pP][+-]?[0-9_]+)?|[pP][+-]?[0-9_]+)"
+        },
+        {
+          "name": "constant.numeric.hexadecimal.haskell",
+          "match": "0[xX][_0-9a-fA-F]+"
+        },
+        {
+          "name": "constant.numeric.octal.haskell",
+          "match": "0[oO][_0-7]+"
+        },
+        {
+          "name": "constant.numeric.binary.haskell",
+          "match": "0[bB][_01]+"
+        },
+        {
+          "name": "constant.numeric.float.haskell",
+          "match": "[0-9][0-9_]*(?:\\.[0-9_]+(?:[eE][+-]?[0-9_]+)?|[eE][+-]?[0-9_]+)"
+        },
+        {
+          "name": "constant.numeric.decimal.haskell",
+          "match": "[0-9][_0-9]*"
+        }
+      ]
+    },
+    "module_decl": {
+      "patterns": [
+        {
+          "name": "meta.declaration.module.haskell",
+          "begin": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\t]*)(module)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "end": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(where)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))|(?:^(?!\\1[ \\t]|[ \\t]*$)|(?=@-}))",
           "patterns": [
             {
               "include": "#comments"
             },
             {
-              "include": "#where"
+              "include": "#module_name"
             },
             {
-              "include": "#deriving"
+              "include": "#module_exports"
             },
             {
-              "include": "#assignment_op"
-            },
+              "include": "#invalid"
+            }
+          ],
+          "beginCaptures": {
+            "2": {
+              "name": "keyword.other.haskell"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "keyword.other.haskell"
+            }
+          }
+        }
+      ]
+    },
+    "module_exports": {
+      "patterns": [
+        {
+          "name": "meta.declaration.exports.haskell",
+          "begin": "\\(",
+          "end": "\\)",
+          "patterns": [
             {
-              "match": "(?:(?:(?:(?=[\\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*)+)))*)?))",
-              "captures": {
-                "1": {
-                  "patterns": [
-                    {
-                      "include": "#type_ctor"
-                    }
-                  ]
-                },
-                "2": {
-                  "name": "meta.type-signature.haskell",
-                  "patterns": [
-                    {
-                      "include": "#type_signature"
-                    }
-                  ]
-                }
-              }
+              "include": "#comments"
             },
             {
-              "match": "\\|",
-              "captures": {
-                "0": {
-                  "name": "punctuation.separator.pipe.haskell"
-                }
-              }
+              "include": "#c_preprocessor"
             },
             {
-              "name": "meta.declaration.type.data.record.block.haskell",
-              "begin": "\\{",
+              "begin": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(module)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+              "end": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\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}']*)*)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+              "patterns": [
+                {
+                  "include": "#invalid"
+                }
+              ],
               "beginCaptures": {
-                "0": {
-                  "name": "keyword.operator.record.begin.haskell"
+                "1": {
+                  "name": "keyword.other.haskell"
                 }
               },
-              "end": "\\}",
               "endCaptures": {
-                "0": {
-                  "name": "keyword.operator.record.end.haskell"
+                "1": {
+                  "name": "support.other.module.haskell"
                 }
-              },
+              }
+            },
+            {
+              "include": "#function_name"
+            },
+            {
+              "include": "#type_name"
+            },
+            {
+              "include": "#comma"
+            },
+            {
+              "name": "meta.other.constructor-list.haskell",
+              "begin": "(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))\\s*\\(",
+              "end": "\\)",
               "patterns": [
                 {
                   "include": "#comments"
                 },
+                {
+                  "include": "#c_preprocessor"
+                },
+                {
+                  "include": "#type_ctor"
+                },
+                {
+                  "include": "#attribute_name"
+                },
                 {
                   "include": "#comma"
                 },
                 {
-                  "include": "#record_field_declaration"
+                  "name": "keyword.operator.wildcard.haskell",
+                  "match": "\\.\\."
                 }
               ]
             },
             {
-              "include": "#ctor_type_declaration"
+              "include": "#infix_op"
             }
-          ]
+          ],
+          "applyEndPatternLast": true
         }
       ]
     },
-    "type_alias": {
+    "module_name": {
       "patterns": [
         {
-          "name": "meta.declaration.type.type.haskell",
-          "begin": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\t]*)(type)(?:(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
-          "end": "(?:^(?!\\1[ \\t]|[ \\t]*$)|(?=@-}))",
-          "contentName": "meta.type-signature.haskell",
-          "beginCaptures": {
-            "2": {
-              "name": "keyword.other.type.haskell"
-            }
-          },
-          "patterns": [
-            {
-              "include": "#comments"
-            },
-            {
-              "include": "#family_and_instance"
-            },
-            {
-              "include": "#where"
-            },
-            {
-              "include": "#assignment_op"
-            },
-            {
-              "include": "#type_signature"
-            }
-          ]
+          "name": "support.other.module.haskell",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\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}']*)*(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
         }
       ]
     },
-    "keywords": {
+    "module_name_prefix": {
       "patterns": [
         {
-          "name": "keyword.other.haskell",
-          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?<![\\p{Ll}_\\p{Lu}\\p{Lt}']))(deriving|where|data|type|newtype)(?:(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
-        },
-        {
-          "name": "keyword.other.haskell",
-          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?<![\\p{Ll}_\\p{Lu}\\p{Lt}']))(data|type|newtype)(?:(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
-        },
-        {
-          "name": "keyword.operator.haskell",
-          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?<![\\p{Ll}_\\p{Lu}\\p{Lt}']))infix[lr]?(?:(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
-        },
-        {
-          "name": "keyword.control.haskell",
-          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?<![\\p{Ll}_\\p{Lu}\\p{Lt}']))(do|if|then|else|case|of|let|in|default|mdo|rec|proc)(?:(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
+          "name": "support.other.module.haskell",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\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}']*)*\\."
         }
       ]
     },
-    "c_preprocessor": {
+    "multiline_type_declaration": {
       "patterns": [
         {
-          "name": "meta.preprocessor.c.haskell",
-          "begin": "(?:\\G(?:\\s*\\w+\\s)?|^)(?=#)",
-          "end": "(?<!\\\\)(?=$)",
+          "name": "meta.multiline.type-declaration.haskell",
+          "contentName": "meta.type-signature.haskell",
+          "begin": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\t]*)((?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))))",
+          "end": "(?:^(?!\\1|[ \\t]*$)|(?=@-}))|(?=(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(\u003c-|=)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))))",
           "patterns": [
             {
-              "include": "source.c"
+              "include": "#type_signature"
             }
-          ]
-        }
-      ]
-    },
-    "string": {
-      "patterns": [
-        {
-          "name": "string.quoted.double.haskell",
-          "begin": "\"",
-          "end": "\"",
+          ],
           "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.begin.haskell"
-            }
-          },
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.end.haskell"
-            }
-          },
-          "patterns": [
-            {
-              "include": "#characters"
-            },
-            {
-              "begin": "\\\\\\s",
-              "end": "\\\\",
-              "beginCaptures": {
-                "0": {
-                  "name": "markup.other.escape.newline.begin.haskell"
-                }
-              },
-              "endCaptures": {
-                "0": {
-                  "name": "markup.other.escape.newline.end.haskell"
-                }
-              },
-              "patterns": [
-                {
-                  "include": "#invalid"
-                }
-              ]
+            "2": {
+              "name": "keyword.other.double-colon.haskell"
             }
-          ]
+          }
         }
       ]
     },
@@ -940,421 +1076,363 @@
         }
       ]
     },
-    "quoted_character": {
+    "operator": {
       "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}](?<![(),;\\[\\]`{}_\"']))))(')",
+          "name": "keyword.operator.haskell",
+          "match": "(?:(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\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{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+",
           "captures": {
-            "1": {
-              "name": "punctuation.definition.string.begin.haskell"
-            },
-            "2": {
+            "0": {
               "patterns": [
                 {
-                  "include": "#characters"
+                  "include": "#module_name_prefix"
+                },
+                {
+                  "name": "support.operator.prelude.haskell",
+                  "match": "^(\\!\\!|\\$\\!|\\$|\\\u0026\\\u0026|\\*|\\*\\*|\\*\\\u003e|\\+|\\+\\+|\\-|\\.|\\/|\\/\\=|\\\u003c\\$|\\\u003c\\$\\\u003e|\\\u003c|\\\u003c\\*|\\\u003c\\*\\\u003e|\\\u003c\\=|\\=\\\u003c\\\u003c|\\=\\=|\\\u003e|\\\u003e\\=|\\\u003e\\\u003e|\\\u003e\\\u003e\\=|\\^|\\^\\^|\\|\\|)$"
                 }
               ]
-            },
-            "3": {
-              "name": "punctuation.definition.string.end.haskell"
             }
           }
         }
       ]
     },
-    "scoped_type": {
+    "pragma": {
       "patterns": [
         {
-          "match": "\\(((?<paren>(?:[^\\(\\)]|\\(\\g<paren>\\))*)(?<!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))(?<paren2>(?:[^\\(\\)]|\\(\\g<paren2>\\))*))\\)",
-          "captures": {
-            "1": {
-              "patterns": [
-                {
-                  "include": "#haskell_expr"
-                }
-              ]
+          "name": "meta.preprocessor.haskell",
+          "begin": "\\{-#",
+          "end": "#-\\}",
+          "patterns": [
+            {
+              "name": "keyword.other.preprocessor.haskell",
+              "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))((?i:NOTINLINE CONSTRUCTORLIKE|NOINLINE CONSTRUCTORLIKE|INLINE CONSTRUCTORLIKE|SPECIALISE NOTINLINE|SPECIALIZE NOTINLINE|SPECIALISE NOINLINE|SPECIALIZE NOINLINE|NOTINLINE CONLIKE|SPECIALISE INLINE|SPECIALIZE INLINE|NOINLINE CONLIKE|VECTORISE SCALAR|VECTORIZE SCALAR|OPTIONS_HADDOCK|INLINE CONLIKE|OPTIONS_DERIVE|OPTIONS_CATCH|OPTIONS_NHC98|OPTIONS_HUGS|OVERLAPPABLE|NOVECTORISE|NOVECTORIZE|OPTIONS_GHC|OPTIONS_JHC|OPTIONS_YHC|OVERLAPPING|DEPRECATED|INCOHERENT|INLINEABLE|SPECIALISE|SPECIALIZE|GENERATED|INLINABLE|NOTINLINE|VECTORISE|VECTORIZE|CONTRACT|LANGUAGE|NOINLINE|NOUNPACK|OVERLAPS|INCLUDE|MINIMAL|OPTIONS|WARNING|CFILES|INLINE|SOURCE|UNPACK|CTYPE|RULES|CORE|LINE|ANN|SCC))(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
             }
-          }
-        },
+          ]
+        }
+      ]
+    },
+    "quasi_quotes": {
+      "patterns": [
         {
-          "match": "((?<!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))))(.*?)(?=(?<!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))(<-|=)(?!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))|$)",
-          "captures": {
+          "contentName": "string.quoted.quasiquotes.haskell",
+          "begin": "(\\[)((?:[\\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}']*)(\\|)",
+          "end": "(\\|)(\\])",
+          "beginCaptures": {
             "1": {
-              "name": "keyword.other.double-colon.haskell"
+              "name": "punctuation.definition.quasiquotes.begin.haskell"
             },
             "2": {
-              "name": "meta.type-signature.haskell",
+              "name": "entity.name.tag.haskell",
               "patterns": [
                 {
-                  "include": "#type_signature"
+                  "include": "#module_name_prefix"
                 }
               ]
             }
+          },
+          "endCaptures": {
+            "2": {
+              "name": "punctuation.definition.quasiquotes.end.haskell"
+            }
           }
         }
       ]
     },
-    "scoped_type_override": {
+    "quoted_character": {
       "patterns": [
         {
-          "match": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\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}](?<![(),;\\[\\]`{}_\"'])))",
+          "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\\\\\\\"'\\\u0026])|(?:\\\\o[0-7]+)|(?:\\\\x[0-9A-Fa-f]+)|(?:\\\\\\^[A-Z@\\[\\]\\\\^_])|(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))))(')",
           "captures": {
+            "1": {
+              "name": "punctuation.definition.string.begin.haskell"
+            },
             "2": {
               "patterns": [
                 {
-                  "include": "#identifier"
+                  "include": "#characters"
                 }
               ]
             },
             "3": {
-              "name": "keyword.other.double-colon.haskell"
-            },
-            "4": {
-              "name": "meta.type-signature.haskell",
-              "patterns": [
-                {
-                  "include": "#type_signature"
-                }
-              ]
-            },
-            "5": {
-              "patterns": [
-                {
-                  "include": "#assignment_op"
-                },
-                {
-                  "include": "#operator"
-                }
-              ]
+              "name": "punctuation.definition.string.end.haskell"
             }
           }
         }
       ]
     },
-    "comma": {
-      "patterns": [
-        {
-          "name": "punctuation.separator.comma.haskell",
-          "match": ","
-        }
-      ]
-    },
-    "lit_num": {
-      "patterns": [
-        {
-          "name": "constant.numeric.hexadecimal.haskell",
-          "match": "0[xX][0-9a-fA-F]+"
-        },
-        {
-          "name": "constant.numeric.octal.haskell",
-          "match": "0[oO][0-7]+"
-        },
-        {
-          "name": "constant.numeric.float.haskell",
-          "match": "[0-9]+(\\.[0-9]+[eE][+-]?|\\.|[eE][+-]?)[0-9]+"
-        },
-        {
-          "name": "constant.numeric.decimal.haskell",
-          "match": "[0-9]+"
-        }
-      ]
-    },
-    "operator": {
-      "patterns": [
-        {
-          "name": "keyword.operator.haskell",
-          "match": "(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"']))+"
-        }
-      ]
-    },
-    "identifier": {
+    "record_field_declaration": {
       "patterns": [
         {
-          "match": "(?:(?=[\\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{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
-          "name": "identifier.haskell",
-          "captures": {
-            "0": {
+          "name": "meta.record-field.type-declaration.haskell",
+          "contentName": "meta.type-signature.haskell",
+          "begin": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\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{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\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{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\)))(?:(?:\\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{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\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{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\))))*)\\s*((?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))))))",
+          "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{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\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{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\)))(?:(?:\\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{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\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{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\))))*)\\s*((?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))))))|})",
+          "patterns": [
+            {
+              "include": "#type_signature"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
               "patterns": [
                 {
-                  "include": "#module_name_prefix"
+                  "include": "#attribute_name"
                 },
                 {
-                  "name": "support.function.prelude.$1.haskell",
-                  "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?<![\\p{Ll}_\\p{Lu}\\p{Lt}']))(abs|acos|acosh|all|and|any|appendFile|asTypeOf|asin|asinh|atan|atan2|atanh|break|ceiling|compare|concat|concatMap|const|cos|cosh|curry|cycle|decodeFloat|div|divMod|drop|dropWhile|either|elem|encodeFloat|enumFrom|enumFromThen|enumFromThenTo|enumFromTo|error|even|exp|exponent|fail|filter|flip|floatDigits|floatRadix|floatRange|floor|fmap|foldMap|foldl|foldl1|foldr|foldr1|fromEnum|fromInteger|fromIntegral|fromRational|fst|gcd|getChar|getContents|getLine|head|id|init|interact|ioError|isDenormalized|isIEEE|isInfinite|isNaN|isNegativeZero|iterate|last|lcm|length|lex|lines|log|logBase|lookup|map|mapM|mapM_|mappend|max|maxBound|maximum|maybe|mconcat|mempty|min|minBound|minimum|mod|negate|not|notElem|null|odd|or|otherwise|pi|pred|print|product|properFraction|pure|putChar|putStr|putStrLn|quot|quotRem|read|readFile|readIO|readList|readLn|readParen|reads|readsPrec|realToFrac|recip|rem|repeat|replicate|return|reverse|round|scaleFloat|scanl|scanl1|scanr|scanr1|seq|sequence|sequenceA|sequence_|show|showChar|showList|showParen|showString|shows|showsPrec|significand|signum|sin|sinh|snd|span|splitAt|sqrt|subtract|succ|sum|tail|take|takeWhile|tan|tanh|toEnum|toInteger|toRational|traverse|truncate|uncurry|undefined|unlines|until|unwords|unzip|unzip3|userError|words|writeFile|zip|zip3|zipWith|zipWith3)(?:(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
+                  "include": "#infix_op"
                 }
               ]
+            },
+            "2": {
+              "name": "keyword.other.double-colon.haskell"
             }
           }
         }
       ]
     },
-    "type_name": {
+    "regular_import": {
       "patterns": [
         {
-          "name": "entity.name.type.haskell",
-          "match": "(?:(?=[\\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{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
-          "captures": {
-            "0": {
-              "patterns": [
-                {
-                  "include": "#module_name_prefix"
-                },
-                {
-                  "name": "entity.other.inherited-class.prelude.$1.haskell",
-                  "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?<![\\p{Ll}_\\p{Lu}\\p{Lt}']))(Applicative|Bounded|Enum|Eq|Floating|Foldable|Fractional|Functor|Integral|Monad|Monoid|Num|Ord|Read|Real|RealFloat|RealFrac|Show|Traversable)(?:(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
-                },
-                {
-                  "name": "support.class.prelude.$1.haskell",
-                  "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?<![\\p{Ll}_\\p{Lu}\\p{Lt}']))(Either|FilePath|IO|IOError|Integer|Maybe|Ordering|Rational|ReadS|ShowS|String|Bool|Char|Double|Float|Int|Word)(?:(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
+          "name": "meta.import.haskell",
+          "begin": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\t]*)(import)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "end": "(?:^(?!\\1[ \\t]|[ \\t]*$)|(?=@-}))",
+          "patterns": [
+            {
+              "include": "#module_name"
+            },
+            {
+              "include": "#module_exports"
+            },
+            {
+              "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(qualified|as|hiding)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+              "captures": {
+                "1": {
+                  "name": "keyword.other.haskell"
                 }
-              ]
+              }
+            },
+            {
+              "include": "#comments"
+            }
+          ],
+          "beginCaptures": {
+            "2": {
+              "name": "keyword.other.haskell"
             }
           }
         }
       ]
     },
-    "type_ctor": {
+    "scoped_type": {
       "patterns": [
         {
-          "name": "entity.name.tag.haskell",
-          "match": "(?:(?=[\\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{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "match": "\\(((?\u003cparen\u003e(?:[^\\(\\)]|\\(\\g\u003cparen\u003e\\))*)(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?\u003cparen2\u003e(?:[^\\(\\)]|\\(\\g\u003cparen2\u003e\\))*))\\)",
           "captures": {
-            "0": {
+            "1": {
               "patterns": [
                 {
-                  "include": "#module_name_prefix"
-                },
-                {
-                  "name": "support.tag.prelude.$1.haskell",
-                  "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?<![\\p{Ll}_\\p{Lu}\\p{Lt}']))(EQ|GT|Just|LT|Left|Nothing|Right|True|False)(?:(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
+                  "include": "#haskell_expr"
                 }
               ]
             }
           }
-        }
-      ]
-    },
-    "where": {
-      "patterns": [
-        {
-          "match": "(?:(?=[\\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}']))",
-          "name": "keyword.other.haskell"
-        }
-      ]
-    },
-    "family_and_instance": {
-      "patterns": [
-        {
-          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?<![\\p{Ll}_\\p{Lu}\\p{Lt}']))(family|instance)(?:(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
-          "name": "keyword.other.haskell"
-        }
-      ]
-    },
-    "invalid": {
-      "patterns": [
-        {
-          "match": "\\S+",
-          "name": "invalid.illegal.character-not-allowed-here.haskell"
-        }
-      ]
-    },
-    "function_name": {
-      "patterns": [
-        {
-          "name": "entity.name.function.haskell",
-          "match": "(?:(?=[\\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{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
-        }
-      ]
-    },
-    "assignment_op": {
-      "patterns": [
+        },
         {
-          "match": "=",
+          "match": "((?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))))(.*?)(?=(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(\u003c-|=)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))|$)",
           "captures": {
-            "0": {
-              "name": "keyword.operator.assignment.haskell"
+            "1": {
+              "name": "keyword.other.double-colon.haskell"
+            },
+            "2": {
+              "name": "meta.type-signature.haskell",
+              "patterns": [
+                {
+                  "include": "#type_signature"
+                }
+              ]
             }
           }
         }
       ]
     },
-    "attribute_name": {
-      "patterns": [
-        {
-          "name": "entity.other.attribute-name.haskell",
-          "match": "(?:(?=[\\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{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
-        }
-      ]
-    },
-    "liquidhaskell_annotation": {
-      "patterns": [
-        {
-          "name": "block.liquidhaskell.haskell",
-          "contentName": "block.liquidhaskell.annotation.haskell",
-          "begin": "\\{-@(?!#)",
-          "end": "@-\\}",
-          "patterns": [
-            {
-              "include": "annotation.liquidhaskell.haskell"
-            }
-          ]
-        }
-      ]
-    },
-    "shebang": {
-      "patterns": [
-        {
-          "name": "comment.line.shebang.haskell",
-          "match": "^\\#\\!.*\\brunhaskell\\b.*$"
-        }
-      ]
-    },
-    "haskell_expr": {
+    "scoped_type_override": {
       "patterns": [
         {
-          "include": "#infix_function"
-        },
-        {
-          "include": "#unit"
-        },
-        {
-          "include": "#empty_list"
-        },
-        {
-          "include": "#quasi_quotes"
-        },
-        {
-          "include": "#keywords"
-        },
-        {
-          "include": "#pragma"
-        },
-        {
-          "include": "#string"
-        },
-        {
-          "include": "#newline_escape"
-        },
-        {
-          "include": "#quoted_character"
-        },
-        {
-          "include": "#comments"
-        },
-        {
-          "include": "#infix_op"
-        },
-        {
-          "include": "#comma"
-        },
-        {
-          "include": "#lit_num"
-        },
-        {
-          "include": "#scoped_type"
-        },
-        {
-          "include": "#operator"
-        },
-        {
-          "include": "#identifier"
-        },
-        {
-          "include": "#type_ctor"
+          "match": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\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{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\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{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\)))(?:(?:\\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{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\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{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\))))*)\\s*((?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))))))(.*)(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(\u003c-|=)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))",
+          "captures": {
+            "2": {
+              "patterns": [
+                {
+                  "include": "#identifier"
+                }
+              ]
+            },
+            "3": {
+              "name": "keyword.other.double-colon.haskell"
+            },
+            "4": {
+              "name": "meta.type-signature.haskell",
+              "patterns": [
+                {
+                  "include": "#type_signature"
+                }
+              ]
+            },
+            "5": {
+              "patterns": [
+                {
+                  "include": "#assignment_op"
+                },
+                {
+                  "include": "#operator"
+                }
+              ]
+            }
+          }
         }
       ]
     },
-    "common_toplevel": {
+    "shebang": {
       "patterns": [
         {
-          "include": "#class_decl"
-        },
-        {
-          "include": "#instance_decl"
-        },
-        {
-          "include": "#deriving_instance_decl"
-        },
-        {
-          "include": "#foreign_import"
-        },
-        {
-          "include": "#regular_import"
-        },
-        {
-          "include": "#data_decl"
-        },
-        {
-          "include": "#type_alias"
-        },
-        {
-          "include": "#c_preprocessor"
+          "name": "comment.line.shebang.haskell",
+          "match": "^\\#\\!.*\\brunhaskell\\b.*$"
         }
       ]
     },
-    "function_type_declaration_with_scoped_type": {
+    "string": {
       "patterns": [
         {
-          "include": "#scoped_type_override"
-        },
-        {
-          "include": "#function_type_declaration"
+          "name": "string.quoted.double.haskell",
+          "begin": "\"",
+          "end": "\"",
+          "patterns": [
+            {
+              "include": "#characters"
+            },
+            {
+              "begin": "\\\\\\s",
+              "end": "\\\\",
+              "patterns": [
+                {
+                  "include": "#invalid"
+                }
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "markup.other.escape.newline.begin.haskell"
+                }
+              },
+              "endCaptures": {
+                "0": {
+                  "name": "markup.other.escape.newline.end.haskell"
+                }
+              }
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.haskell"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.end.haskell"
+            }
+          }
         }
       ]
     },
-    "haskell_toplevel": {
+    "type_alias": {
       "patterns": [
         {
-          "include": "#liquidhaskell_annotation"
-        },
-        {
-          "include": "#common_toplevel"
-        },
-        {
-          "include": "#function_type_declaration_with_scoped_type"
-        },
-        {
-          "include": "#haskell_expr"
+          "name": "meta.declaration.type.type.haskell",
+          "contentName": "meta.type-signature.haskell",
+          "begin": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\t]*)(type)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "end": "(?:^(?!\\1[ \\t]|[ \\t]*$)|(?=@-}))",
+          "patterns": [
+            {
+              "include": "#comments"
+            },
+            {
+              "include": "#family_and_instance"
+            },
+            {
+              "include": "#where"
+            },
+            {
+              "include": "#assignment_op"
+            },
+            {
+              "include": "#type_signature"
+            }
+          ],
+          "beginCaptures": {
+            "2": {
+              "name": "keyword.other.type.haskell"
+            }
+          }
         }
       ]
     },
-    "hsig_toplevel": {
+    "type_ctor": {
       "patterns": [
         {
-          "include": "#common_toplevel"
-        },
-        {
-          "include": "#function_type_declaration"
-        },
-        {
-          "include": "#lazy_function_type_signature"
-        },
-        {
-          "include": "#comments"
+          "name": "entity.name.tag.haskell",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\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}']*)*(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "captures": {
+            "0": {
+              "patterns": [
+                {
+                  "include": "#module_name_prefix"
+                },
+                {
+                  "name": "support.tag.prelude.$1.haskell",
+                  "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(EQ|GT|LT|Left|Right|True|False)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
+                }
+              ]
+            }
+          }
         }
       ]
     },
-    "haskell_source": {
+    "type_name": {
       "patterns": [
         {
-          "include": "#shebang"
-        },
-        {
-          "include": "#module_decl"
-        },
-        {
-          "include": "#haskell_toplevel"
+          "name": "entity.name.type.haskell",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\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}']*)*(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "captures": {
+            "0": {
+              "patterns": [
+                {
+                  "include": "#module_name_prefix"
+                },
+                {
+                  "name": "entity.other.inherited-class.prelude.$1.haskell",
+                  "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(Applicative|Bounded|Enum|Eq|Floating|Foldable|Fractional|Functor|Integral|Monad|Monoid|Num|Ord|Read|Real|RealFloat|RealFrac|Show|Traversable)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
+                },
+                {
+                  "name": "support.class.prelude.$1.haskell",
+                  "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(Either|FilePath|IO|IOError|Integer|Ordering|Rational|ReadS|ShowS|String|Bool|Char|Double|Float|Int|Just|Maybe|Nothing|Word)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
+                }
+              ]
+            }
+          }
         }
       ]
     },
-    "hsig_source": {
+    "type_signature": {
       "patterns": [
         {
-          "include": "#hsig_decl"
+          "include": "#liquid_id"
         },
         {
-          "include": "#hsig_toplevel"
+          "include": "#liquid_type"
+        },
+        {
+          "include": "#type_signature_hs"
         }
       ]
     },
@@ -1368,11 +1446,37 @@
         },
         {
           "name": "keyword.other.forall.haskell",
-          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?<![\\p{Ll}_\\p{Lu}\\p{Lt}']))forall(?:(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))forall(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
+        },
+        {
+          "name": "constant.language.unit.promoted.haskell",
+          "match": "'(\\(\\))",
+          "captures": {
+            "1": {
+              "patterns": [
+                {
+                  "include": "#unit"
+                }
+              ]
+            }
+          }
         },
         {
           "include": "#unit"
         },
+        {
+          "name": "constant.language.empty-list.promoted.haskell",
+          "match": "'(\\[\\])",
+          "captures": {
+            "1": {
+              "patterns": [
+                {
+                  "include": "#empty_list"
+                }
+              ]
+            }
+          }
+        },
         {
           "include": "#empty_list"
         },
@@ -1381,65 +1485,68 @@
         },
         {
           "name": "keyword.other.arrow.haskell",
-          "match": "(?<!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))(->|→)(?!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))"
+          "match": "(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(-\u003e|→)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))"
         },
         {
           "name": "keyword.other.big-arrow.haskell",
-          "match": "(?<!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))(=>|⇒)(?!(?:[\\p{S}\\p{P}](?<![(),;\\[\\]`{}_\"'])))"
+          "match": "(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(=\u003e|⇒)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))"
+        },
+        {
+          "name": "keyword.operator.promoted.haskell",
+          "match": "'((?:(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\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{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+)",
+          "captures": {
+            "1": {
+              "patterns": [
+                {
+                  "include": "#operator"
+                }
+              ]
+            }
+          }
         },
         {
           "include": "#operator"
         },
         {
           "name": "variable.other.generic-type.haskell",
-          "match": "(?:(?=[\\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{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\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}']*(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
         },
         {
-          "include": "#type_name"
-        }
-      ]
-    },
-    "liquid_id": {
-      "patterns": [
-        {
-          "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}']*\\s*:",
+          "name": "entity.name.type.promoted.haskell",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}'])(?\u003c![\\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}']*)*)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
           "captures": {
-            "0": {
+            "1": {
               "patterns": [
                 {
-                  "include": "#identifier"
+                  "include": "#type_name"
                 }
               ]
             }
           }
+        },
+        {
+          "include": "#type_name"
+        },
+        {
+          "include": "#lit_num"
         }
       ]
     },
-    "liquid_type": {
+    "unit": {
       "patterns": [
         {
-          "begin": "\\{",
-          "end": "\\}",
-          "name": "liquid.type.haskell",
-          "patterns": [
-            {
-              "match": "\\G(.*?)\\|",
-              "captures": {
-                "1": {
-                  "patterns": [
-                    {
-                      "include": "#type_signature"
-                    }
-                  ]
-                }
-              }
-            },
-            {
-              "include": "#haskell_expr"
-            }
-          ]
+          "name": "constant.language.unit.haskell",
+          "match": "\\(\\)"
+        }
+      ]
+    },
+    "where": {
+      "patterns": [
+        {
+          "name": "keyword.other.haskell",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))where(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
         }
       ]
     }
   }
-}
+}