From 905ff6f0aff1c103a601c5bcf058c54e34ca6622 Mon Sep 17 00:00:00 2001 From: Gracjan Polak Date: Tue, 13 Oct 2015 23:12:35 +0200 Subject: [PATCH 1/2] Fix layout list issue --- haskell-indentation.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/haskell-indentation.el b/haskell-indentation.el index 3f5c52889..601b6d4f8 100644 --- a/haskell-indentation.el +++ b/haskell-indentation.el @@ -1152,8 +1152,9 @@ layout starts." ;; put `haskell-indentation-read-next-token' outside the current-indent ;; definition so it will not return 'layout-end again (when (eq current-token 'layout-end) - ;; leave layout at 'layout-end or illegal token - (haskell-indentation-read-next-token))) + (let ((implicit-layout-active t)) + ;; leave layout at 'layout-end or illegal token + (haskell-indentation-read-next-token)))) (defun haskell-indentation-if () "" ; FIXME From 228e463e36a1677b0539e28e1b12da66eb6cea8a Mon Sep 17 00:00:00 2001 From: Gracjan Polak Date: Wed, 14 Oct 2015 14:53:31 +0200 Subject: [PATCH 2/2] Mark test as passing --- tests/haskell-indentation-tests.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/haskell-indentation-tests.el b/tests/haskell-indentation-tests.el index ee4992e6a..23b0ae795 100644 --- a/tests/haskell-indentation-tests.el +++ b/tests/haskell-indentation-tests.el @@ -646,8 +646,8 @@ az = Projection " ((6 0) 2)) -(hindent-test "36* yet another parser failure" " -tokOpenTag = +(hindent-test "36 yet another parser failure" " +tokOpenTag = asum [ do void , return ]