Skip to content

Fix nested layout 1 #930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 14, 2015
Merged

Fix nested layout 1 #930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
905ff6f
Fix layout list issue
gracjan Oct 13, 2015
228e463
Mark test as passing
gracjan Oct 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions haskell-indentation.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/haskell-indentation-tests.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
]
Expand Down