Merge branch 'record-fields' of github.com:sheaf/language-haskell

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 - Enable highlighting for `.hs-boot` files ([#117](https://github.com/JustusAdam/language-haskell/issues/117)).
 - Highlighting for data families and instances ([#72](https://github.com/JustusAdam/language-haskell/issues/72)).
+- Fix regression: allow extra spaces between record field and type signature
+  ([#118](https://github.com/JustusAdam/language-haskell/issues/118))
 
 ## 3.0.0 - 26.04.2020
 

syntaxes/haskell.YAML-tmLanguage

@@ -509,7 +509,7 @@ repository:
           (?x)
           ([\p{Ll}_][\p{Ll}_\p{Lu}\p{Lt}\p{Nd}']*)
           (?:\s*,\s*([\p{Ll}_][\p{Ll}_\p{Lu}\p{Lt}\p{Nd}']*))*
-          \s(::|∷)
+          \s+(::|∷)
         end: ',|(?=})'
         beginCaptures:
           '1': {name: variable.other.definition.field.haskell}

test/syntax-examples/test.hs

@@ -221,15 +221,16 @@ then' = 0
 
 data Data = Data { foo :: Int, bar :: Int }
 data Data = Data { 
-    foo :: Int, bar :: Int 
+    foo :: Int, bar :: Int -- comment
   }
 data Data = Data { 
-    foo :: Int, 
-    bar :: Int
+    foo :: Int, -- comment1
+    bar :: Int  -- comment2
     }
 data Data = Data { 
-      foo :: Int
-    , bar :: Int
+      foos :: Int -- comment1
+    , bars :: Int -- comment2
+    , baz  :: Int -- comment3
     }
 
 -- GADT's