Skip to content

Commit 7142686

Browse files
committed
Try enabling fourmolu now
1 parent efad46c commit 7142686

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

.github/workflows/test.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,7 @@ jobs:
177177
name: Test hls-ormolu-plugin
178178
run: cabal test hls-ormolu-plugin-tests || cabal test hls-ormolu-plugin-tests
179179

180-
# TODO enable when it supports 9.10
181-
- if: matrix.test && matrix.ghc != '9.10'
180+
- if: matrix.test
182181
name: Test hls-fourmolu-plugin
183182
run: cabal test hls-fourmolu-plugin-tests || cabal test hls-fourmolu-plugin-tests
184183

cabal.project

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ packages:
77
./hls-plugin-api
88
./hls-test-utils
99

10-
index-state: 2024-06-10T12:08:58Z
10+
index-state: 2024-06-13T00:00:00Z
1111

1212
tests: True
1313
test-show-details: direct
@@ -49,10 +49,9 @@ if impl(ghc >= 9.9)
4949
lens >= 5.3.2,
5050
-- See
5151
-- https://github.com/haskell/stylish-haskell/issues/479
52-
-- https://github.com/fourmolu/fourmolu/issues/412
5352
-- https://github.com/ennocramer/floskell/pull/82
5453
-- https://github.com/ndmitchell/hlint/pull/1594
55-
haskell-language-server -stylishHaskell -fourmolu -hlint -retrie -splice -floskell,
54+
haskell-language-server -stylishHaskell -hlint -retrie -splice -floskell,
5655
allow-newer:
5756
entropy:base,
5857
entropy:directory,

haskell-language-server.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -1461,7 +1461,7 @@ library hls-fourmolu-plugin
14611461
build-depends:
14621462
, base >=4.12 && <5
14631463
, filepath
1464-
, fourmolu ^>= 0.14 || ^>= 0.15
1464+
, fourmolu ^>= 0.14 || ^>= 0.15 || ^>= 0.16
14651465
, ghc-boot-th
14661466
, ghcide == 2.8.0.0
14671467
, hls-plugin-api == 2.8.0.0

0 commit comments

Comments
 (0)