Highlight improvements

CHANGELOG.md

@@ -5,6 +5,7 @@
 **Improvements:**
 
 - Improve syntax highlighting for escaped backticks in interpolated strings ([#55](https://github.com/rescript-lang/vim-rescript/pull/55)) 
+- Highlight improvements ([#69](https://github.com/rescript-lang/vim-rescript/pull/69))
 
 ## 2.1.0
 

syntax/rescript.vim

@@ -11,14 +11,16 @@ syntax keyword resBoolean true false
 " Keywords
 syntax keyword resKeyword let rec type external mutable lazy private of with
 syntax keyword resKeyword if else switch when
-syntax keyword resKeyword and as open include module in constraint import export
-syntax keyword resKeyword for to downto while
-syntax keyword resKeyword try catch exception assert
+syntax keyword resKeyword and as module constraint import export
+syntax keyword resInclude open include
+syntax keyword resRepeat for to downto while in
+syntax keyword resException try catch exception assert
 syntax keyword resKeyword async await
 
 " Types
-syntax keyword resType bool int float char string unit
-syntax keyword resType list array option ref exn format
+syntax keyword resType bool int float char string unit promise
+syntax keyword resType array option ref exn format
+syntax match resType "list{\@!"
 
 " Operators
 syntax keyword resOperator mod land lor lxor lsl lsr asr
@@ -44,9 +46,11 @@ syntax match resOperator "\v\>\="
 syntax match resOperator "\v\@"
 
 syntax match resOperator "\v\!"
-syntax match resOperator "\v\|"
 syntax match resOperator "\v\&"
 
+" Delimiter
+syntax match resDelimiter "\v\|"
+
 " Refs
 syntax match resOperator "\v\:\="
 
@@ -56,6 +60,9 @@ syntax match resArrowPipe "\v\-\>"
 syntax match resArrowPipe "\v\|\>"
 syntax match resArrowPipe "\v\@\@"
 
+" Builtin functions
+syntax match resFunction "list{\@="
+
 " Comment
 syntax region resSingleLineComment start="//" end="$" contains=resTodo,@Spell
 syntax region resMultiLineComment start="/\*\s*" end="\*/" contains=@Spell,resTodo,resMultiLineComment
@@ -76,7 +83,10 @@ syntax match resModuleOrVariant "\v<[A-Z][A-Za-z0-9_'$]*"
 syntax match resModuleChain "\v<[A-Z][A-Za-z0-9_'$]*\."
 
 " Attribute
-syntax match resAttribute "\v\@([a-zA-z][A-Za-z0-9_']*)(\.([a-zA-z])[A-Za-z0-9_']*)*"
+syntax match resAttribute "\v(\@|\@\@)([a-zA-z][A-Za-z0-9_']*)(\.([a-zA-z])[A-Za-z0-9_']*)*"
+
+" Extension
+syntax match resExtension "\v(\%|\%\%)([a-zA-z][A-Za-z0-9_']*)(\.([a-zA-z])[A-Za-z0-9_']*)*"
 
 " String
 syntax match resUnicodeChar "\v\\u[A-Fa-f0-9]\{4}" contained
@@ -85,6 +95,9 @@ syntax match resInterpolatedStringEscapeSeq "\v\\[\\`ntbrf]" contained
 
 syntax region resString start="\v\"" end="\v\"" contains=resStringEscapeSeq,resUnicodeChar
 
+" Custom Operator
+syntax region resCustomOperator start="\v\\\"" end="\v\""
+
 " Interpolation
 syntax match resInterpolationVariable "\v\$[a-z_][A-Za-z0-0_'$]*" contained
 syntax region resInterpolationBlock matchgroup=resInterpolationDelimiters start="\v\$\{" end="\v\}" contained contains=TOP
@@ -97,11 +110,27 @@ syntax match resPolyVariant "\v#[0-9]+"
 syntax match resPolyVariant "\v#\".*\""
 syntax match resPolyVariant "\v#\\\".*\""
 
+" Errors
+syn match    resBraceErr   "}"
+syn match    resBrackErr   "\]"
+syn match    resParenErr   ")"
+syn match    resArrErr     "|]"
+
+" Enclosing delimiters
+syn region   resNone transparent matchgroup=resEncl start="(" matchgroup=resEncl end=")" contains=ALLBUT,resParenErr
+syn region   resNone transparent matchgroup=resEncl start="{" matchgroup=resEncl end="}"  contains=ALLBUT,resBraceErr
+syn region   resNone transparent matchgroup=resEncl start="\[" matchgroup=resEncl end="\]" contains=ALLBUT,resBrackErr
+syn region   resNone transparent matchgroup=resEncl start="\[|" matchgroup=resEncl end="|\]" contains=ALLBUT,resArrErr
+
 highlight default link resBoolean Boolean
 highlight default link resKeyword Keyword
+highlight default link resInclude Include
+highlight default link resException Exception
+highlight default link resRepeat Repeat
 highlight default link resType Type
 highlight default link resOperator Operator
 highlight default link resArrowPipe Operator
+highlight default link resDelimiter Operator
 highlight default link resSingleLineComment Comment
 highlight default link resMultiLineComment Comment
 highlight default link resTodo TODO
@@ -118,5 +147,9 @@ highlight default link resString String
 highlight default link resInterpolationDelimiters Macro
 highlight default link resInterpolationVariable Macro
 highlight default link resAttribute PreProc
+highlight default link resExtension PreProc
+highlight default link resEncl Keyword
+highlight default link resFunction Function
+highlight default link resCustomOperator String
 
 let b:current_syntax = "rescript"

test/syntax/expected/highlight.res.txt

@@ -2,13 +2,16 @@
     col = 1,
     row = 0,
     syntax = { {
-        hl_group = "resArrowPipe",
-        hl_group_link = "Statement"
+        hl_group = "resAttribute",
+        hl_group_link = "PreProc"
       } }
   }, {
     col = 1,
     row = 3,
-    syntax = {}
+    syntax = { {
+        hl_group = "resExtension",
+        hl_group_link = "PreProc"
+      } }
   }, {
     col = 1,
     row = 6,
@@ -19,7 +22,10 @@
   }, {
     col = 9,
     row = 8,
-    syntax = {}
+    syntax = { {
+        hl_group = "resExtension",
+        hl_group_link = "PreProc"
+      } }
   }, {
     col = 1,
     row = 11,
@@ -76,7 +82,10 @@
   }, {
     col = 8,
     row = 32,
-    syntax = {}
+    syntax = { {
+        hl_group = "resExtension",
+        hl_group_link = "PreProc"
+      } }
   }, {
     col = 12,
     row = 34,
@@ -112,24 +121,36 @@
     col = 7,
     row = 56,
     syntax = { {
+        hl_group = "resNone",
+        hl_group_link = "resNone"
+      }, {
         hl_group = "resType",
         hl_group_link = "Type"
       } }
   }, {
     col = 7,
     row = 61,
-    syntax = {}
+    syntax = { {
+        hl_group = "resNone",
+        hl_group_link = "resNone"
+      }, {
+        hl_group = "resType",
+        hl_group_link = "Type"
+      } }
   }, {
     col = 9,
     row = 65,
     syntax = { {
-        hl_group = "resType",
-        hl_group_link = "Type"
+        hl_group = "resFunction",
+        hl_group_link = "Identifier"
       } }
   }, {
     col = 11,
     row = 68,
-    syntax = {}
+    syntax = { {
+        hl_group = "resNone",
+        hl_group_link = "resNone"
+      } }
   }, {
     col = 9,
     row = 71,
@@ -159,64 +180,70 @@
     col = 1,
     row = 85,
     syntax = { {
-        hl_group = "resKeyword",
+        hl_group = "resRepeat",
         hl_group_link = "Statement"
       } }
   }, {
     col = 2,
     row = 87,
     syntax = { {
+        hl_group = "resNone",
+        hl_group_link = "resNone"
+      }, {
         hl_group = "resModuleChain",
         hl_group_link = "PreProc"
       } }
   }, {
     col = 1,
     row = 91,
     syntax = { {
-        hl_group = "resKeyword",
+        hl_group = "resRepeat",
         hl_group_link = "Statement"
       } }
   }, {
     col = 1,
     row = 96,
     syntax = { {
-        hl_group = "resKeyword",
+        hl_group = "resException",
         hl_group_link = "Statement"
       } }
   }, {
     col = 1,
     row = 100,
     syntax = { {
-        hl_group = "resKeyword",
+        hl_group = "resException",
         hl_group_link = "Statement"
       } }
   }, {
     col = 3,
     row = 103,
     syntax = { {
-        hl_group = "resKeyword",
+        hl_group = "resException",
         hl_group_link = "Statement"
       } }
   }, {
     col = 17,
     row = 105,
     syntax = { {
-        hl_group = "resKeyword",
+        hl_group = "resNone",
+        hl_group_link = "resNone"
+      }, {
+        hl_group = "resException",
         hl_group_link = "Statement"
       } }
   }, {
     col = 1,
     row = 109,
     syntax = { {
-        hl_group = "resKeyword",
-        hl_group_link = "Statement"
+        hl_group = "resInclude",
+        hl_group_link = "PreProc"
       } }
   }, {
     col = 1,
     row = 112,
     syntax = { {
-        hl_group = "resKeyword",
-        hl_group_link = "Statement"
+        hl_group = "resInclude",
+        hl_group_link = "PreProc"
       } }
   }, {
     col = 1,
@@ -228,11 +255,17 @@
   }, {
     col = 1,
     row = 118,
-    syntax = {}
+    syntax = { {
+        hl_group = "resNone",
+        hl_group_link = "resNone"
+      } }
   }, {
     col = 5,
     row = 120,
-    syntax = {}
+    syntax = { {
+        hl_group = "resNone",
+        hl_group_link = "resNone"
+      } }
   }, {
     col = 5,
     row = 124,
@@ -251,7 +284,7 @@
     col = 5,
     row = 128,
     syntax = { {
-        hl_group = "resKeyword",
+        hl_group = "resException",
         hl_group_link = "Statement"
       } }
   }, {