Skip to content

Commit c5e1f4b

Browse files
committed
Merge branch 'master' into ghc-9.0.2
2 parents e3c41d9 + 4ffdf45 commit c5e1f4b

File tree

5 files changed

+9
-11
lines changed

5 files changed

+9
-11
lines changed

.github/workflows/test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -186,11 +186,11 @@ jobs:
186186
name: Test hls-stylish-haskell-plugin
187187
run: cabal test hls-stylish-haskell-plugin --test-options="$TEST_OPTS" || cabal test hls-stylish-haskell-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-stylish-haskell-plugin --test-options="$TEST_OPTS"
188188

189-
- if: matrix.test && matrix.ghc != '9.2.1'
189+
- if: matrix.test
190190
name: Test hls-ormolu-plugin
191191
run: cabal test hls-ormolu-plugin --test-options="$TEST_OPTS" || cabal test hls-ormolu-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-ormolu-plugin --test-options="$TEST_OPTS"
192192

193-
- if: matrix.test && matrix.ghc != '9.2.1'
193+
- if: matrix.test
194194
name: Test hls-fourmolu-plugin
195195
run: cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS" || cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS"
196196

cabal-ghc921.project

+3-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ packages:
99
-- ./plugins/hls-tactics-plugin
1010
-- ./plugins/hls-brittany-plugin
1111
-- ./plugins/hls-stylish-haskell-plugin
12-
-- ./plugins/hls-fourmolu-plugin
12+
./plugins/hls-fourmolu-plugin
1313
./plugins/hls-class-plugin
1414
-- ./plugins/hls-eval-plugin
1515
./plugins/hls-explicit-imports-plugin
@@ -23,7 +23,7 @@ packages:
2323
-- ./plugins/hls-floskell-plugin
2424
./plugins/hls-pragmas-plugin
2525
./plugins/hls-module-name-plugin
26-
-- ./plugins/hls-ormolu-plugin
26+
./plugins/hls-ormolu-plugin
2727
./plugins/hls-call-hierarchy-plugin
2828
-- ./plugins/hls-alternate-number-format-plugin
2929

@@ -66,11 +66,9 @@ constraints:
6666
-class
6767
-eval
6868
-floskell
69-
-fourmolu
7069
-haddockComments
7170
-hlint
7271
-moduleName
73-
-ormolu
7472
-qualifyImportedNames
7573
-refineImports
7674
-retrie
@@ -112,7 +110,7 @@ allow-newer:
112110
SVGFonts:diagrams-core,
113111

114112
-- for head.hackage
115-
primitive-unlifted:base
113+
primitive-unlifted:base,
116114

117115
allow-older:
118116
primitive-extras:primitive-unlifted

haskell-language-server.cabal

+2-2
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ common floskell
288288
cpp-options: -Dfloskell
289289

290290
common fourmolu
291-
if flag(fourmolu) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
291+
if flag(fourmolu) && flag(ignore-plugins-ghc-bounds)
292292
build-depends: hls-fourmolu-plugin ^>=1.0.0.0
293293
cpp-options: -Dfourmolu
294294

@@ -475,7 +475,7 @@ test-suite func-test
475475
-- formatters
476476
if flag(floskell) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
477477
cpp-options: -Dfloskell
478-
if flag(fourmolu) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
478+
if flag(fourmolu) && flag(ignore-plugins-ghc-bounds)
479479
cpp-options: -Dfourmolu
480480
if flag(ormolu)
481481
cpp-options: -Dormolu

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ library
2323
build-depends:
2424
, base >=4.12 && <5
2525
, filepath
26-
, fourmolu ^>=0.3 || ^>=0.4
26+
, fourmolu ^>=0.3 || ^>=0.4 || ^>= 0.5
2727
, ghc
2828
, ghc-boot-th
2929
, ghcide ^>=1.5.0

plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ library
2828
, hls-plugin-api >=1.1 && <1.3
2929
, lens
3030
, lsp
31-
, ormolu ^>=0.1.2 || ^>= 0.2 || ^>= 0.3
31+
, ormolu ^>=0.1.2 || ^>= 0.2 || ^>= 0.3 || ^>= 0.4
3232
, text
3333

3434
default-language: Haskell2010

0 commit comments

Comments
 (0)