Skip to content
This repository was archived by the owner on Oct 7, 2020. It is now read-only.

Allow newer optparse-applicative for ormolu (stack version) #1586

Merged
merged 2 commits into from
Jan 22, 2020
Merged

Allow newer optparse-applicative for ormolu (stack version) #1586

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
d5ffea7
Add ormolu to stack-8.8.1 including allow-newer
jneira Jan 21, 2020
f143685
Update ormolu test for 8.8
Avi-D-coder Jan 21, 2020
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 stack-8.8.1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,17 @@ extra-deps:
- haskell-src-exts-1.21.1
- ilist-0.3.1.0
- monad-dijkstra-0.1.1.2
- ormolu-0.0.3.0
- optparse-applicative-0.15.1.0

flags:
haskell-ide-engine:
pedantic: true
hie-plugin-api:
pedantic: true


# allow-newer: true
# Required to build ormolu with optparse-applicative-0.15.1.0
allow-newer: true

nix:
packages: [ icu libcxx zlib ]
Expand Down
4 changes: 3 additions & 1 deletion test/functional/FormatSpec.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,10 @@ spec = do
doc <- openDoc "Format.hs" "haskell"
formatDoc doc (FormattingOptions 2 True)
docContent <- documentContents doc
let formatted = liftIO $ docContent `shouldBe` formattedOrmolu
case ghcVersion of
GHC86 -> liftIO $ docContent `shouldBe` formattedOrmolu
GHC88 -> formatted
GHC86 -> formatted
_ -> liftIO $ docContent `shouldBe` unchangedOrmolu


Expand Down