Skip to content

Deriving alignment for enums #424

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 4 commits into from
Nov 6, 2022
Merged

Deriving alignment for enums #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5eb19e0
Failing test added
Lev135 Nov 6, 2022
374cf24
Haddoc comment added
Lev135 Nov 6, 2022
bcaeeec
Deriving alignment behavior changed & tests updated
Lev135 Nov 6, 2022
290745b
Test data name changed (just to look prettier)
Lev135 Nov 6, 2022
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 lib/Language/Haskell/Stylish/Step/Data.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,9 @@ putDataDecl cfg@Config {..} decl = do
let derivingComments = deepAnnComments (GHC.dd_derivs defn)

when (hasDeriving decl) do
if onelineEnum && null derivingComments then
space
if onelineEnum && null derivingComments then do
newline
spaces cDeriving
else do
forM_ derivingComments $ \lc -> do
newline
Expand Down
18 changes: 16 additions & 2 deletions tests/Language/Haskell/Stylish/Step/Data/Tests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ tests = testGroup "Language.Haskell.Stylish.Step.Data.Tests"
, testCase "case 63 (issue #338)" case63
, testCase "case 64" case64
, testCase "case 65" case65
, testCase "case 66 (issue #411)" case66
]

case00 :: Assertion
Expand Down Expand Up @@ -424,7 +425,8 @@ case20 = assertSnippet (step indentIndentStyle) input input
input =
[ "module Herp where"
, ""
, "data Tag = Title | Text deriving (Eq, Show)"
, "data Tag = Title | Text"
, " deriving (Eq, Show)"
]

case21 :: Assertion
Expand Down Expand Up @@ -1161,7 +1163,8 @@ case55 :: Assertion
case55 = assertSnippet (step sameSameNoSortStyle) input expected
where
input =
[ "data Foo = Foo deriving (Z, Y, X, Bar, Abcd)"
[ "data Foo = Foo"
, " deriving (Z, Y, X, Bar, Abcd)"
]

expected = input
Expand Down Expand Up @@ -1367,6 +1370,17 @@ case65 = assertSnippet (step indentIndentStyle) input input
, " deriving (Show)"
]

-- | Deriving alignment for enums
--
-- Regression test for https://github.com/haskell/stylish-haskell/issues/411
case66 :: Assertion
case66 = assertSnippet (step indentIndentStyle) input input
where
input =
[ "data Foo = A | B | C"
, " deriving (Eq, Show)"
]

sameSameStyle :: Config
sameSameStyle = Config SameLine SameLine 2 2 False True SameLine False True NoMaxColumns

Expand Down