From 514f07753143b9b5b86e79500a61d7c1d77a1a3d Mon Sep 17 00:00:00 2001
From: nhatanh <blackheron02@gmail.com>
Date: Sat, 20 Nov 2021 01:02:36 +0700
Subject: [PATCH] Fixed broken character literal highlighting (#132)

  (See #132)
  When a character literal contains a "region" start pattern
  ('(','[','{','"'), everything after the start pattern is interpreted as
  a contained region, and consequently breaks syntax highlighting. After
  further investigation, the regex used to match character literal is
  actually incorrect according to the Haskell 2010 language specification
  (https://www.haskell.org/onlinereport/haskell2010/haskellch2.html#x7-200002.6),
  which means most valid character literals aren't highlighted at all,
  and the \u<code> pattern while not being a legal character in Haskell,
  is correctly highlighted.

  This commit tries to remedy the above issues.
---
 syntax/haskell.vim | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/syntax/haskell.vim b/syntax/haskell.vim
index 15e9d26..19a39fa 100644
--- a/syntax/haskell.vim
+++ b/syntax/haskell.vim
@@ -96,7 +96,30 @@ syn match haskellBacktick "`[A-Za-z_][A-Za-z0-9_\.']*#\?`"
 syn region haskellString start=+"+ skip=+\\\\\|\\"+ end=+"+
   \ contains=@Spell
 syn match haskellIdentifier "[_a-z][a-zA-Z0-9_']*" contained
-syn match haskellChar "\<'[^'\\]'\|'\\.'\|'\\u[0-9a-fA-F]\{4}'\>"
+
+" Haskell character literal match
+" https://www.haskell.org/onlinereport/haskell2010/haskellch2.html#x7-200002.6
+" http://book.realworldhaskell.org/read/characters-strings-and-escaping-rules.html
+syn match haskellCharPrintable           "[:print:]" contained
+syn match haskellCharSingleCharEsc       "\\[0abfnrtv"&'\\]" contained
+syn match haskellCharAsciiControlCodeEsc "\\\(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\)" contained
+syn match haskellCharAsciiControlCharEsc "\\\^[@A-Z\[\]\\\^_]" contained
+syn match haskellCharDeciEsc             "\\[0-9]\{1,7}" contained
+syn match haskellCharOctalEsc            "\\o[0-7]\{1,7}" contained
+syn match haskellCharHexEsc              "\\x[0-9a-fa-f]\{1,6}" contained
+
+syn cluster haskellCharGroup 
+  \ contains=
+  \ haskellCharPrintable,
+  \ haskellCharSingleCharEsc,
+  \ haskellCharAsciiControlCodeEsc,
+  \ haskellCharAsciiControlCharEsc,
+  \ haskellCharDeciEsc,
+  \ haskellCharOctalEsc,
+  \ haskellCharHexEsc
+syn region haskellChar start=+'+ end=+'+
+  \ contains=@haskellCharGroup
+
 syn match haskellType "\<[A-Z][a-zA-Z0-9_']*\>"
 syn region haskellBlockComment start="{-" end="-}"
   \ contains=
@@ -156,6 +179,13 @@ highlight def link haskellPragma SpecialComment
 highlight def link haskellLiquid SpecialComment
 highlight def link haskellString String
 highlight def link haskellChar String
+highlight def link haskellCharPrintable String
+highlight def link haskellCharSingleCharEsc SpecialChar
+highlight def link haskellCharAsciiControlCodeEsc SpecialChar
+highlight def link haskellCharAsciiControlCharEsc SpecialChar
+highlight def link haskellCharDeciEsc SpecialChar
+highlight def link haskellCharOctalEsc SpecialChar
+highlight def link haskellCharHexEsc SpecialChar
 highlight def link haskellBacktick Operator
 highlight def link haskellQuasiQuoted String
 highlight def link haskellTodo Todo