Skip to content

Align data declaration contructors in indentation #1130

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
Feb 5, 2016
Merged

Align data declaration contructors in indentation #1130

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
48e4ccc
Align | with = in data declarations
gracjan Feb 4, 2016
dfb3afb
Align | with = in data declarations tests
gracjan Feb 4, 2016
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
6 changes: 4 additions & 2 deletions haskell-indentation.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,8 +648,10 @@ For example
(haskell-indentation-add-indentation current-indent)
(throw 'parse-end nil)))
((string= current-token "=")
(haskell-indentation-separated
#'haskell-indentation-expression "|" "deriving"))
(haskell-indentation-with-starter
(lambda ()
(haskell-indentation-separated
#'haskell-indentation-expression "|" "deriving"))))
((string= current-token "where")
(haskell-indentation-with-starter
#'haskell-indentation-expression-layout nil))))
Expand Down
10 changes: 5 additions & 5 deletions tests/haskell-indentation-tests.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@ instance Bar Int
(hindent-test "32 allow type operators" "
data (:.) a b = a :. b
"
(2 0 2))
(2 0 16))

(hindent-test "33* parse #else in CPP" "
#ifdef FLAG
Expand All @@ -681,7 +681,7 @@ data T = T {
}

"
(5 0 2))
(5 0 9))

(hindent-test "35 baroque construct which causes parse error" "
az = Projection
Expand Down Expand Up @@ -854,7 +854,7 @@ newtype instance T Char = TC Bool"
(1 0)
(2 0)
(3 0)
(4 0 2))
(4 0 26))

(hindent-test "52a* module simplest case two lines" "
module A.B
Expand Down Expand Up @@ -896,13 +896,13 @@ foo x
(2 2)
(3 2))

(hindent-test "55* data constructor on separate line" "
(hindent-test "55 data constructor on separate line" "
data Foo = Bar
| Baz"
(1 0)
(2 9))

(hindent-test "55a* deriving below aligned data constructors" "
(hindent-test "55a deriving below aligned data constructors" "
data Foo = Bar
| Baz
deriving (Show)"
Expand Down