Improve Haskell syntax highlighting (#1745)

diff --git a/internal/config/runtime.go b/internal/config/runtime.go
index c1e06beb492dfb4c0e533261b6878b6cca4b5e21..cbd354000558bc052fbe9324fb59a1272c09137b 100644 (file)
--- a/internal/config/runtime.go
+++ b/internal/config/runtime.go
@@ -3303,7 +3303,7 @@ func runtimeSyntaxHaskellHdr() (*asset, error) {
        return a, nil
 }
 
-var _runtimeSyntaxHaskellYaml = "\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xa4\x94\x6d\x6f\xdb\xb6\x17\xc5\xdf\xfb\x53\xe8\xaf\x3f\x51\xc4\xc0\xec\xbd\xf7\xe2\xec\xa1\x8d\x87\x6e\x6d\xb3\xa5\xc6\x10\x2c\x37\x1a\x68\xf1\xca\x22\x4a\x91\x2e\x49\x35\x0b\x7a\xba\xcf\x3e\x90\x92\x1d\xcf\xd9\x13\xb0\x20\x20\x71\x2f\xc9\x7b\x0e\x7f\xba\x74\xa3\x0d\xc7\x87\x1d\x2f\x8a\x56\x86\x77\x6c\xcc\x64\xa2\x38\x72\x1d\x17\x93\xa2\x28\x8a\xb4\x6c\x65\xc7\x8b\xa2\x24\x9a\xb7\x41\x94\x93\x89\xef\x0d\x87\x61\xf9\xff\xc5\xf7\xfc\x70\xef\xbc\x0a\x39\x9c\x15\x21\xca\xc8\x1d\xdb\xb8\x28\xca\xdb\xe2\xee\x4c\x06\xd4\x32\x30\x5c\x83\xda\xc8\x10\xa0\x64\x94\x50\xdc\xc8\xde\x44\x28\xf6\xfa\x83\xb6\x5b\x28\x87\xc6\x79\x69\x4c\x9a\x58\x6f\x2d\x5a\xad\xd2\x82\x6e\x10\x5b\xb6\x60\x13\x18\xba\xdb\x39\x1f\xa1\x6d\xa3\x7f\x1d\x46\x33\x4c\x1e\xda\x86\x28\x6d\xcd\x30\x9c\x36\xa0\x53\x0e\x9d\x53\xbd\x61\x58\xbe\x4f\x17\xc4\xfb\x5e\x1a\xdd\x68\x56\xc8\xe1\x7d\xcb\x9e\xa7\xb7\xc5\x5d\xf9\x27\xd6\xcf\xaa\xec\xb3\xda\xbb\xa9\x46\xe9\x6a\xd0\xae\x46\xf1\x6a\x54\xaf\x0e\xf2\xd5\x28\x5a\xed\x55\xab\x34\xfe\x95\xcc\x40\x48\x64\x44\x02\xae\x11\x03\x24\x91\x29\x89\x3d\x26\x71\xe0\x24\xa0\x9c\x18\x49\x89\x3d\x2a\x31\xb2\x12\xd0\x8d\xc8\xb4\x44\xc6\x25\x46\x5e\x62\x60\x34\x4e\x66\x9c\xbd\x38\x30\x13\x09\x5a\x0a\x45\xc2\x26\x46\x6e\x62\x0f\x4e\x3c\x92\x13\x18\x12\x99\x9d\x98\x96\x93\x7c\xa7\xd4\x06\x3f\x49\xaf\x5d\x1f\x8a\xf0\xd0\x6d\x9c\x39\x74\x43\x8e\x12\x4f\x22\xe0\x2b\xfc\x0f\x0b\xfc\x82\xdf\xb0\x04\x11\x11\xbe\x00\xd1\x19\xd1\x14\x9f\x81\xe8\x16\x44\x77\x20\xfa\x08\xa2\x4f\xc7\xa5\xaf\x76\xec\x65\x74\xfe\x8f\x45\xe7\x6e\x4c\xa7\xea\xcb\x25\x3e\x5f\xe2\xd9\x33\x10\xa5\x7f\x9c\xe3\x02\xe7\x4b\x5c\x2c\xff\x85\xc5\x1d\xd7\x5a\x66\x8f\xb3\x0b\x9c\xcf\xa6\xe5\xa9\x77\xa2\x39\x88\xc4\x51\xa5\x17\x32\xca\xa2\x76\x36\x44\xdf\xd7\x47\xce\x72\x4a\xda\x38\xdf\xb8\xf1\xe4\xe6\x6c\xed\x7b\xc6\x4a\x9a\xc0\x53\xa2\x4d\x79\xb2\x73\xdc\xf4\xc6\xc5\x36\x75\xfb\x77\x7d\x88\x78\xc5\x4d\xc4\xb5\xde\xb6\x11\xaf\xd6\xb8\xfc\x11\xdf\xae\x87\xa3\x27\xfa\xa9\x53\x78\x2f\xad\x15\xdb\x98\xbe\x91\x9f\xe7\x85\xb1\xf0\x35\x4b\x85\xb7\xad\xbb\xc7\xa5\xed\x3b\x5c\xbe\xc7\x95\x57\x48\xe7\xf1\x8d\xeb\xad\x62\x85\xf5\xc3\x8e\xe5\xc6\x30\xde\xf4\x1d\xae\x59\x1a\xac\xbc\xac\xa3\x76\x56\x1a\xbc\xb4\x91\xb7\x5e\x9a\xbc\x90\xf2\x58\x19\x27\x63\xf2\x9a\x33\x29\xc0\x6b\x67\xa5\x1a\xc6\x1f\x4c\x1f\xb0\xea\x6d\xa2\x82\x95\x33\x2a\x57\xfe\x5a\x29\x1d\xf5\x07\xc6\xcf\x7a\x37\x3c\x85\xc3\x55\xde\x46\xaf\xed\xf6\x09\xc0\x90\xd3\x8b\x71\x5b\x91\x1e\x8d\xcf\xb0\xca\xf2\x90\x63\xab\x4e\x32\xe1\x9d\xde\xe5\x8b\x13\xcd\x1f\xb3\x47\x3f\x57\xfb\xbf\x63\xa5\xe1\xfb\x3f\x6f\xa5\x7f\x3c\x7a\xb0\xf7\xdc\x75\xe9\xa9\x3e\xfa\xcb\xe1\x53\x5f\xb3\xd9\xa9\x2f\xf1\x0f\x06\xa2\x53\x2e\x35\xdd\xfa\xea\xc5\x15\x6e\x6e\x6e\xb0\x7a\x79\xf3\xfa\x72\xba\xf8\x72\x54\xff\x1b\x31\xa2\x8f\x4f\xe4\x66\x44\x9f\xfe\xb3\xe2\x51\x13\x75\xba\xf6\x69\x77\xea\x91\x46\x5b\x56\xe5\xe4\xf7\x00\x00\x00\xff\xff\x01\xe4\xeb\x5e\x2a\x06\x00\x00"
+var _runtimeSyntaxHaskellYaml = "\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xa4\x53\xef\x4f\x1b\x39\x10\xfd\x9e\xbf\x62\x6f\x0f\xa1\x44\xba\xe4\xbe\xe7\x08\x77\x57\x48\x2a\x5a\x20\x2d\x44\x55\x54\x06\x55\xce\x7a\x36\x6b\xe1\xb5\x83\xed\x25\x8d\x78\xf4\x6f\xaf\xec\x04\x08\x41\x2a\x1f\x1a\x45\x6b\xcd\x9b\x1f\xef\xcd\x78\x5c\x2a\xcd\x61\xb5\xe0\x7e\x56\x09\x7f\xc3\x5a\xb7\x5a\x92\x03\x17\xa1\xdf\xca\xb2\x2c\x8b\x6e\x23\x6a\xee\x67\x39\x51\xaf\xf2\x7b\x79\xab\xe5\x1a\xcd\x7e\xed\xfe\x33\xfb\xc8\xab\xa5\x75\xd2\x27\xb3\x9b\xf9\x20\x02\xd7\x6c\x42\x4a\x98\xb5\x85\x47\x21\x3c\xc3\x96\x28\xb4\xf0\x1e\x52\x04\x01\xc9\xa5\x68\x74\x80\x64\xa7\xee\x94\x99\x43\x5a\x94\xd6\x09\xad\xe3\xc1\x6a\x6e\x50\x29\x19\x1d\xaa\x44\xa8\xd8\x80\xb5\x67\xa8\x7a\x61\x5d\x80\x32\xa5\xfa\xbe\xfe\xea\xf5\xe1\xa0\x8c\x0f\xc2\x14\x0c\xcd\x31\x00\xb5\xb4\xa8\xad\x6c\x34\xc3\xf0\x32\x36\x88\xdb\x46\x68\x55\x2a\x96\x48\xe6\xb2\x62\xc7\x1d\xa2\x59\xde\x4a\xda\x63\x33\x5f\x84\x53\xb6\xf1\x99\x5f\xd5\x33\xab\x9f\x7a\x4a\x56\x3f\xcb\xdb\x44\xc0\x7f\xf8\x03\x7d\x7c\xc3\x0f\x0c\x40\x44\x84\x7f\x40\xd4\x26\xea\xe0\x2f\x10\x5d\x81\xe8\x1a\x44\xf7\x20\x7a\xe8\x6c\x95\x1e\x2f\xd8\x89\x60\xdd\xcb\xa2\x3d\xbb\x81\x63\xf5\xc1\x00\x7f\x0f\xb0\xbf\x0f\xa2\xf8\xc7\x01\x0e\x71\x30\xc0\xe1\xa0\xf3\xb6\xc4\x05\x17\x4a\x24\x8d\xdd\x43\x1c\x74\x3b\xf9\xae\x76\xa2\x1e\x88\xf6\xb6\x2a\x1d\x8b\x20\xb2\xc2\x1a\x1f\x5c\x53\x6c\x29\x4b\x90\x30\xa1\x37\xb3\x9b\xcc\x59\x7b\xe2\x1a\xc6\x48\x68\xbf\x99\xd8\xcb\xc8\x4d\xd0\xb9\x0d\x55\xbc\xb3\x0f\x8d\x0f\x38\xe5\x32\xe0\x42\xcd\xab\x80\xd3\x09\x86\x9f\xf1\x7e\xb2\x33\xec\x35\x7f\x5c\x0a\x7e\xa4\x56\x92\x4d\x88\x77\xe4\x7a\xc9\xb1\x29\x7c\xc1\x42\xe2\xb2\xb2\x4b\x0c\x4d\x53\x63\x78\x8b\xb1\x93\x88\xf9\x78\x67\x1b\x23\x59\x62\xb2\x5a\xb0\x98\x69\xc6\x79\x53\xe3\x82\x85\xc6\xc8\x89\x22\x28\x6b\x84\xc6\x89\x09\x3c\x77\x42\x27\x47\xc4\x31\xd2\x56\x84\xa8\x35\x21\xd1\xc0\x99\x35\x42\xae\xbf\x9f\x74\xe3\x31\x6a\x4c\x9c\x0a\x46\x56\xcb\x54\xf9\x7f\x29\x55\x50\x77\x8c\xaf\x6a\xd1\xb9\xca\xae\xb7\x5a\xb9\x0c\x4e\x99\xf9\xab\x01\xfa\x04\xf7\x37\x61\x59\x7c\x1c\x2e\x0d\x2b\xcf\x9f\x30\x36\x72\x07\xf1\x37\x6a\x91\x1a\x27\xea\x3d\xa3\x5b\x8f\xee\xf1\xb7\xcd\xb4\xbe\xff\xa3\x4a\xb8\xe7\xd4\x27\x79\x47\xb6\x8e\x4f\xf2\x59\x5f\x32\x5f\xeb\xea\x76\x77\x75\xed\xbd\x21\x20\x58\x69\xe3\xd2\x4d\xc6\xc7\x63\x4c\xa7\x53\x8c\x4e\xa6\x67\xc3\x4e\xff\xdf\x0d\xfb\x2f\xc8\x88\xee\x5f\xd1\x75\x89\x1e\x7e\x9b\x71\x6b\x89\x6a\x55\xb8\x18\x1d\x77\xa4\x54\x86\x65\xde\xfa\x19\x00\x00\xff\xff\xff\xf1\xc5\x3b\xf0\x04\x00\x00"
 
 func runtimeSyntaxHaskellYamlBytes() ([]byte, error) {
        return bindataRead(

diff --git a/runtime/syntax/haskell.yaml b/runtime/syntax/haskell.yaml
index bea37bf42d61063befff2794bb8c1d338a983ef1..6a308b7a283916d6f6dafd10985045211c9784d3 100644 (file)
--- a/runtime/syntax/haskell.yaml
+++ b/runtime/syntax/haskell.yaml
@@ -5,9 +5,7 @@ detect:
 
 rules:
     # Keywords
-    - statement: "[ ](as|case|of|class|data|default|deriving|do|forall|foreign|hiding|if|then|else|import|infix|infixl|infixr|instance|let|in|mdo|module|newtype|qualified|type|where)[ ]"
-    - statement: "(^data|^foreign|^import|^infix|^infixl|^infixr|^instance|^module|^newtype|^type)[ ]"
-    - statement: "[ ](as$|case$|of$|class$|data$|default$|deriving$|do$|forall$|foreign$|hiding$|if$|then$|else$|import$|infix$|infixl$|infixr$|instance$|let$|in$|mdo$|module$|newtype$|qualified$|type$|where$)"
+    - statement: "\\b(as|case|of|class|data|default|deriving|do|forall|foreign|hiding|if|then|else|import|infix|infixl|infixr|instance|let|in|mdo|module|newtype|qualified|type|where)\\b"
 
       # Various symbols
     - symbol: "(\\||@|!|:|_|~|=|\\\\|;|\\(\\)|,|\\[|\\]|\\{|\\})"