Skip to content

Toplevel indentation bugfixes for data, newtype, instance #919

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

Toplevel indentation bugfixes for data, newtype, instance #919

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
7216483
Parse data, newtype and type with special parsers
gracjan Oct 8, 2015
d4ab793
Mark data indentation test as passing
gracjan Oct 8, 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
12 changes: 3 additions & 9 deletions haskell-indentation.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,15 +679,9 @@ the current buffer."

(defconst haskell-indentation-toplevel-list
`(("module" . haskell-indentation-module)
("data" .
,(apply-partially 'haskell-indentation-statement-right
'haskell-indentation-data))
("type" .
,(apply-partially 'haskell-indentation-statement-right
'haskell-indentation-data))
("newtype" .
,(apply-partially 'haskell-indentation-statement-right
'haskell-indentation-data))
("data" . haskell-indentation-data)
("type" . haskell-indentation-data)
("newtype" . haskell-indentation-data)
("class" . haskell-indentation-class-declaration)
("instance" . haskell-indentation-class-declaration))
"Alist of toplevel keywords with associated parsers.")
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 @@ -613,7 +613,7 @@ class Foo a where
instance Bar Int
"
((2 0) 0))
(hindent-test "32* allow type operators" "
(hindent-test "32 allow type operators" "
data (:.) a b = a :. b
"
((2 0) 0 16))
Expand Down