Skip to content

Commit c5f7de0

Browse files
authored
Allow Fourmolu 0.12 (#3565)
* Allow Fourmolu 0.12 * Bump index-state This allows us to pick up Fourmolu 0.12. * Enable Fourmolu plugin on GHC 9.6
1 parent 399d1a2 commit c5f7de0

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

cabal.project

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ package *
5555

5656
write-ghc-environment-files: never
5757

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

6060
constraints:
6161
-- For GHC 9.4, older versions of entropy fail to build on Windows

haskell-language-server.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ common floskell
334334
cpp-options: -Dhls_floskell
335335

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

plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal

+3-5
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ source-repository head
2323
location: git://github.com/haskell/haskell-language-server.git
2424

2525
library
26-
if impl(ghc >= 9.5)
27-
buildable: False
26+
buildable: True
2827
exposed-modules:
2928
Ide.Plugin.Fourmolu
3029
, Ide.Plugin.Fourmolu.Shim
@@ -33,7 +32,7 @@ library
3332
build-depends:
3433
, base >=4.12 && <5
3534
, filepath
36-
, fourmolu ^>=0.3 || ^>=0.4 || ^>= 0.6 || ^>= 0.7 || ^>= 0.8 || ^>= 0.9 || ^>= 0.10 || ^>= 0.11
35+
, fourmolu ^>=0.3 || ^>=0.4 || ^>= 0.6 || ^>= 0.7 || ^>= 0.8 || ^>= 0.9 || ^>= 0.10 || ^>= 0.11 || ^>= 0.12
3736
, ghc
3837
, ghc-boot-th
3938
, ghcide ^>= 1.9 || ^>= 1.10
@@ -49,8 +48,7 @@ library
4948
default-language: Haskell2010
5049

5150
test-suite tests
52-
if impl(ghc >= 9.5)
53-
buildable: False
51+
buildable: True
5452
type: exitcode-stdio-1.0
5553
default-language: Haskell2010
5654
hs-source-dirs: test

0 commit comments

Comments
 (0)