Skip to content

Support where keyword after any expression #897

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 2, 2015
Merged

Support where keyword after any expression #897

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
dc4efd3
Support 'where' after any expression
gracjan Sep 30, 2015
819de34
Mark indentation test as passing
gracjan Sep 30, 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: 4 additions & 1 deletion haskell-indentation.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -987,7 +987,10 @@ parser. If parsing ends here, set indentation to left-indent."
(haskell-indentation-add-indentation current-indent)
(throw 'parse-end nil))
(let ((current-indent (current-column)))
(funcall parser)))
(funcall parser)
(when (equal current-token "where")
(haskell-indentation-with-starter
#'haskell-indentation-expression-layout nil))))

(defun haskell-indentation-guard ()
"Parse \"guard\" statement."
Expand Down
2 changes: 1 addition & 1 deletion tests/haskell-indentation-tests.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ foo = let
((3 0) 6 9)
((4 0) 4))

(hindent-test "26* should parse unindented where-clause properly" "
(hindent-test "26 should parse unindented where-clause properly" "
foo = do
return ()
where
Expand Down