address LiquidHaskell regression (fixes #131)

CHANGELOG.md

@@ -20,6 +20,7 @@
 - Allow unparenthesised `via` clauses, and highlight the derived instance code as usual.
 - Improve support for promotion ticks ([#136](https://github.com/JustusAdam/language-haskell/issues/136)).
 - Support record syntax in GADTs.
+- Address regression in LiquidHaskell highlighting ([#131](https://github.com/JustusAdam/language-haskell/issues/136)).
 
 ## 3.0.0 - 26.04.2020
 

syntaxes/haskell.YAML-tmLanguage

@@ -6,10 +6,10 @@ keyEquivalent: ^~H
 name: Haskell
 patterns:
   - name: block.liquidhaskell.haskell
-    contentName: block.liquidhaskell.haskell
     begin: '\{-@'
     end: '@-\}'
-    patterns: {include: $self}
+    patterns:
+      - include: '$self'
   - captures:
       '1': {name: punctuation.backtick.haskell}
       '2': {name: entity.name.namespace.haskell}

test/test.sh

@@ -31,7 +31,6 @@ ticketsBroken=(
   "T0073.hs"
   "T0091.hs"
   "T0121.hs"
-  "T0131.hs"
   "T0132.hs"
 )
 

test/tickets/T0002.hs

@@ -7,8 +7,8 @@ module Module
 --     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ comment.line.double-dash.haskell
     foo
 --  ^^^ meta.declaration.exports.haskell entity.name.function.haskell
-    {- | disable, too
---     ^^^^^^^^^^^^^^^ comment.block.haskell
+    {- disable, too
+--     ^^^^^^^^^^^^ comment.block.haskell
     -}
   , bar, bar
 --  ^^^ meta.declaration.exports.haskell entity.name.function.haskell

test/tickets/T0131.hs

@@ -2,5 +2,8 @@
 
 {-@ incr :: x:Nat -> {v:Nat | v > x} @-}
 -- <--------------------------------------- block.liquidhaskell.haskell
+--       ^^ keyword.other.double-colon.haskell
+--                ^^ keyword.operator.haskell
+--  -------------------------------- - comment.block.haskell
 incr :: Int -> Int 
 incr x = x + 1