@@ -269,31 +269,31 @@ import DEF"
269269 (2 0 )
270270 (3 0 2 7 ))
271271
272- (hindent-test " 7b* declaration after declaration" "
272+ (hindent-test " 7b declaration after declaration" "
273273fun1 = undefined
274274fun2 = undefined"
275275 (1 0 )
276- (2 0 ))
276+ (2 0 2 7 ))
277277
278- (hindent-test " 8* Guards in function definition" "
278+ (hindent-test " 8 Guards in function definition" "
279279resolve (amount, max) number
280280 | number > max = (1, number)
281281 | number == max = (amount + 1, number)"
282282 (1 0 )
283283 (2 2 )
284- (3 0 2 )
285- (4 0 2 ))
284+ (3 2 )
285+ (4 0 2 4 20 ))
286286
287287(hindent-test " 9* Operator last on line" "
288288fun = x ++"
289289 (1 0 )
290290 (2 6 ))
291291
292- (hindent-test " 10 Operator first on line" "
292+ (hindent-test " 10* Operator first on line" "
293293fun = x
294294 ++ z"
295295 (1 0 )
296- (2 0 2 6 ))
296+ (2 2 6 ))
297297
298298(hindent-test " 11 Guards with commas" "
299299clunky env var1 var2
@@ -387,19 +387,19 @@ fun = \\x →"
387387 (1 0 )
388388 (2 2 8 ))
389389
390- (hindent-test " 17a* A type for a function" "
390+ (hindent-test " 17a A type for a function" "
391391fun :: Int
392392 -> Int"
393393 (1 0 )
394- (2 4 )
395- (3 0 4 ))
394+ (2 2 4 )
395+ (3 0 2 4 ))
396396
397- (hindent-test " 17au* A type for a function" "
397+ (hindent-test " 17au A type for a function" "
398398fun :: Int
399399 → Int"
400400 (1 0 )
401- (2 4 )
402- (3 0 4 ))
401+ (2 2 4 )
402+ (3 0 2 4 ))
403403
404404(hindent-test " 17b* A type for a function with context" "
405405fun :: Monad m
@@ -508,12 +508,12 @@ x = do
508508 (6 4 )
509509 (7 0 2 4 ))
510510
511- (hindent-test " 19a* \" let\" and \" in\" " "
511+ (hindent-test " 19a \" let\" and \" in\" " "
512512x = let
513513 y"
514514 (1 0 )
515515 (2 2 )
516- (3 2 ))
516+ (3 0 2 4 ))
517517
518518(hindent-test " 19b \" let\" and \" in\" " "
519519x = let y
@@ -523,36 +523,36 @@ x = let y
523523 (2 2 4 )
524524 (3 2 6 ))
525525
526- (hindent-test " 19c* \" let\" in a \" do\" " "
526+ (hindent-test " 19c \" let\" in a \" do\" " "
527527x = do
528528 thing
529529 let
530530 z = 5"
531531 (1 0 )
532532 (2 2 )
533- (3 2 )
533+ (3 0 2 4 )
534534 (4 4 ))
535535
536- (hindent-test " 20a* \" instance\" declaration" "
536+ (hindent-test " 20a \" instance\" declaration" "
537537instance C a where
538538 c = undefined"
539539 (1 0 )
540540 (2 2 )
541- (3 0 2 ))
541+ (3 0 2 4 6 ))
542542
543- (hindent-test " 20b* \" instance\" declaration" "
543+ (hindent-test " 20b \" instance\" declaration" "
544544instance (Monad m) => C m a where
545545 c = undefined"
546546 (1 0 )
547547 (2 2 )
548- (3 0 2 ))
548+ (3 0 2 4 6 ))
549549
550- (hindent-test " 20bu* \" instance\" declaration" "
550+ (hindent-test " 20bu \" instance\" declaration" "
551551instance (Monad m) ⇒ C m a where
552552 c = undefined"
553553 (1 0 )
554554 (2 2 )
555- (3 0 2 ))
555+ (3 0 2 4 6 ))
556556
557557(hindent-test " 21a fix \" let\" statement in \" do\" block" "
558558main :: IO ()
@@ -597,11 +597,11 @@ func = 1234
597597 (4 0 4 6 11 )
598598 (5 6 ))
599599
600- (hindent-test " 23* should not fail when seeing comments" "
600+ (hindent-test " 23 should not fail when seeing comments" "
601601-- important non-empty line
602602{-
603603-}"
604- (( 3 2 ) 0 ))
604+ (3 0 ))
605605
606606(hindent-test " 24 should parse inline type signatures properly" "
607607foo = do
@@ -709,10 +709,10 @@ foo = [|forever $ do
709709"
710710 (2 10 ))
711711
712- (hindent-test " 30* parse '[] identifier correctly" "
713- instance Callable '[]
712+ (hindent-test " 30 parse '[] identifier correctly" "
713+ instance Callable '[] where
714714"
715- (1 2 ))
715+ (2 2 ))
716716
717717(hindent-test " 31* allow type class declaration without methods" "
718718class Foo a where
@@ -776,10 +776,10 @@ tokOpenTag =
776776 ]
777777"
778778 (4 7 ))
779- (hindent-test " 37* Indent continuation lines in multiline string literal" "
779+ (hindent-test " 37 Indent continuation lines in multiline string literal" "
780780a = \" multiline\\
781781"
782- (2 4 ))
782+ (2 0 4 ))
783783
784784(hindent-test " 38 Indent in do block after multiline string literal" "
785785s = do
@@ -1002,8 +1002,8 @@ module X
10021002data X = X |
10031003 Y"
10041004 (1 0 )
1005- (2 9 )
1006- (3 0 9 ))
1005+ (2 2 9 )
1006+ (3 0 7 9 ))
10071007
10081008
10091009(ert-deftest haskell-indentation-ret-indents ()
0 commit comments