Skip to content

Allow Fourmolu 0.12 #3565

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 3 commits into from
Apr 22, 2023
Merged

Allow Fourmolu 0.12 #3565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21b9c6b
Allow Fourmolu 0.12
georgefst Apr 19, 2023
9bb6bec
Bump index-state
georgefst Apr 19, 2023
f8f2f59
Enable Fourmolu plugin on GHC 9.6
georgefst Apr 21, 2023
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
2 changes: 1 addition & 1 deletion cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ package *

write-ghc-environment-files: never

index-state: 2023-03-30T00:00:00Z
index-state: 2023-04-19T12:00:00Z

constraints:
-- For GHC 9.4, older versions of entropy fail to build on Windows
Expand Down
2 changes: 1 addition & 1 deletion haskell-language-server.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ common floskell
cpp-options: -Dhls_floskell

common fourmolu
if flag(fourmolu) && impl(ghc < 9.5)
if flag(fourmolu)
build-depends: hls-fourmolu-plugin ^>= 1.1
cpp-options: -Dhls_fourmolu

Expand Down
8 changes: 3 additions & 5 deletions plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ source-repository head
location: git://github.com/haskell/haskell-language-server.git

library
if impl(ghc >= 9.5)
buildable: False
buildable: True
exposed-modules:
Ide.Plugin.Fourmolu
, Ide.Plugin.Fourmolu.Shim
Expand All @@ -33,7 +32,7 @@ library
build-depends:
, base >=4.12 && <5
, filepath
, fourmolu ^>=0.3 || ^>=0.4 || ^>= 0.6 || ^>= 0.7 || ^>= 0.8 || ^>= 0.9 || ^>= 0.10 || ^>= 0.11
, fourmolu ^>=0.3 || ^>=0.4 || ^>= 0.6 || ^>= 0.7 || ^>= 0.8 || ^>= 0.9 || ^>= 0.10 || ^>= 0.11 || ^>= 0.12
, ghc
, ghc-boot-th
, ghcide ^>= 1.9 || ^>= 1.10
Expand All @@ -49,8 +48,7 @@ library
default-language: Haskell2010

test-suite tests
if impl(ghc >= 9.5)
buildable: False
buildable: True
type: exitcode-stdio-1.0
default-language: Haskell2010
hs-source-dirs: test
Expand Down