Skip to content

Commit 32f7800

Browse files
GuillaumedeVolpianoGuillaumedeVolpiano
authored
reinstating ignore-plugins-ghc-bounds (#4532)
1 parent a154cd6 commit 32f7800

File tree

1 file changed

+39
-39
lines changed

1 file changed

+39
-39
lines changed

‎haskell-language-server.cabal

+39-39
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ flag cabalgild
174174
manual: True
175175

176176
common cabalgild
177-
if flag(cabalgild) && impl(ghc < 9.11)
177+
if flag(cabalgild) && (impl(ghc < 9.11) || flag(ignore-plugins-ghc-bounds))
178178
build-depends: haskell-language-server:hls-cabal-gild-plugin
179179
cpp-options: -Dhls_cabalgild
180180

@@ -186,7 +186,7 @@ flag isolateCabalGildTests
186186

187187
library hls-cabal-gild-plugin
188188
import: defaults, pedantic, warnings
189-
if !flag(cabalgild) || impl(ghc > 9.11)
189+
if !flag(cabalgild) || (impl(ghc > 9.11) && !flag(ignore-plugins-ghc-bounds))
190190
buildable: False
191191
exposed-modules: Ide.Plugin.CabalGild
192192
hs-source-dirs: plugins/hls-cabal-gild-plugin/src
@@ -203,7 +203,7 @@ library hls-cabal-gild-plugin
203203
-- The `hls-cabal-plugin` is needed for tests, as we need to install notification handlers
204204
test-suite hls-cabal-gild-plugin-tests
205205
import: defaults, pedantic, test-defaults, warnings
206-
if !flag(cabalgild) || !flag(cabal) || impl(ghc > 9.11)
206+
if !flag(cabalgild) || !flag(cabal) || (impl(ghc > 9.11) && !flag(ignore-plugins-ghc-bounds))
207207
buildable: False
208208
type: exitcode-stdio-1.0
209209
hs-source-dirs: plugins/hls-cabal-gild-plugin/test
@@ -580,13 +580,13 @@ flag rename
580580
manual: True
581581

582582
common rename
583-
if flag(rename) && impl(ghc < 9.11)
583+
if flag(rename) && (impl(ghc < 9.11) || flag(ignore-plugins-ghc-bounds))
584584
build-depends: haskell-language-server:hls-rename-plugin
585585
cpp-options: -Dhls_rename
586586

587587
library hls-rename-plugin
588588
import: defaults, pedantic, warnings
589-
if !flag(rename) || impl(ghc > 9.11)
589+
if !flag(rename) || (impl(ghc > 9.11) && !flag(ignore-plugins-ghc-bounds))
590590
buildable: False
591591
exposed-modules: Ide.Plugin.Rename
592592
hs-source-dirs: plugins/hls-rename-plugin/src
@@ -610,7 +610,7 @@ library hls-rename-plugin
610610

611611
test-suite hls-rename-plugin-tests
612612
import: defaults, pedantic, test-defaults, warnings
613-
if !flag(rename) || impl(ghc > 9.11)
613+
if !flag(rename) || (impl(ghc > 9.11) && !flag(ignore-plugins-ghc-bounds))
614614
buildable: False
615615
type: exitcode-stdio-1.0
616616
hs-source-dirs: plugins/hls-rename-plugin/test
@@ -636,13 +636,13 @@ flag retrie
636636
manual: True
637637

638638
common retrie
639-
if flag(retrie) && impl(ghc < 9.10)
639+
if flag(retrie) && (impl(ghc < 9.10) || flag(ignore-plugins-ghc-bounds))
640640
build-depends: haskell-language-server:hls-retrie-plugin
641641
cpp-options: -Dhls_retrie
642642

643643
library hls-retrie-plugin
644644
import: defaults, pedantic, warnings
645-
if !(flag(retrie) && impl(ghc < 9.10))
645+
if !(flag(retrie) && (impl(ghc < 9.10) || flag(ignore-plugins-ghc-bounds)))
646646
buildable: False
647647
exposed-modules: Ide.Plugin.Retrie
648648
hs-source-dirs: plugins/hls-retrie-plugin/src
@@ -673,7 +673,7 @@ library hls-retrie-plugin
673673

674674
test-suite hls-retrie-plugin-tests
675675
import: defaults, pedantic, test-defaults, warnings
676-
if !(flag(retrie) && impl(ghc < 9.10))
676+
if !(flag(retrie) && (impl(ghc < 9.10) || flag(ignore-plugins-ghc-bounds)))
677677
buildable: False
678678
type: exitcode-stdio-1.0
679679
hs-source-dirs: plugins/hls-retrie-plugin/test
@@ -703,14 +703,14 @@ flag hlint
703703
manual: True
704704

705705
common hlint
706-
if flag(hlint) && impl(ghc < 9.10)
706+
if flag(hlint) && (impl(ghc < 9.10) || flag(ignore-plugins-ghc-bounds))
707707
build-depends: haskell-language-server:hls-hlint-plugin
708708
cpp-options: -Dhls_hlint
709709

710710
library hls-hlint-plugin
711711
import: defaults, pedantic, warnings
712712
-- https://github.com/ndmitchell/hlint/pull/1594
713-
if !(flag(hlint)) || impl(ghc > 9.10)
713+
if !(flag(hlint)) || (impl(ghc > 9.10) && !flag(ignore-plugins-ghc-bounds))
714714
buildable: False
715715
exposed-modules: Ide.Plugin.Hlint
716716
hs-source-dirs: plugins/hls-hlint-plugin/src
@@ -753,7 +753,7 @@ library hls-hlint-plugin
753753

754754
test-suite hls-hlint-plugin-tests
755755
import: defaults, pedantic, test-defaults, warnings
756-
if (!flag(hlint)) || impl(ghc > 9.10)
756+
if (!flag(hlint)) || (impl(ghc > 9.10) && !flag(ignore-plugins-ghc-bounds))
757757
buildable: False
758758
type: exitcode-stdio-1.0
759759
hs-source-dirs: plugins/hls-hlint-plugin/test
@@ -782,13 +782,13 @@ flag stan
782782
manual: True
783783

784784
common stan
785-
if flag(stan) && impl(ghc < 9.11)
785+
if flag(stan) && (impl(ghc < 9.11) || flag(ignore-plugins-ghc-bounds))
786786
build-depends: haskell-language-server:hls-stan-plugin
787787
cpp-options: -Dhls_stan
788788

789789
library hls-stan-plugin
790790
import: defaults, pedantic, warnings
791-
if !flag(stan) || impl(ghc > 9.11)
791+
if !flag(stan) || (impl(ghc > 9.11) && !flag(ignore-plugins-ghc-bounds))
792792
buildable: False
793793
exposed-modules: Ide.Plugin.Stan
794794
hs-source-dirs: plugins/hls-stan-plugin/src
@@ -813,7 +813,7 @@ library hls-stan-plugin
813813

814814
test-suite hls-stan-plugin-tests
815815
import: defaults, pedantic, test-defaults, warnings
816-
if !flag(stan) || impl(ghc > 9.11)
816+
if !flag(stan) || (impl(ghc > 9.11) && !flag(ignore-plugins-ghc-bounds))
817817
buildable: False
818818
type: exitcode-stdio-1.0
819819
hs-source-dirs: plugins/hls-stan-plugin/test
@@ -932,13 +932,13 @@ flag splice
932932
manual: True
933933

934934
common splice
935-
if flag(splice) && impl(ghc < 9.10)
935+
if flag(splice) && (impl(ghc < 9.10) || flag(ignore-plugins-ghc-bounds))
936936
build-depends: haskell-language-server:hls-splice-plugin
937937
cpp-options: -Dhls_splice
938938

939939
library hls-splice-plugin
940940
import: defaults, pedantic, warnings
941-
if !(flag(splice) && impl(ghc < 9.10))
941+
if !(flag(splice) && (impl(ghc < 9.10) || flag(ignore-plugins-ghc-bounds)))
942942
buildable: False
943943
exposed-modules:
944944
Ide.Plugin.Splice
@@ -966,7 +966,7 @@ library hls-splice-plugin
966966

967967
test-suite hls-splice-plugin-tests
968968
import: defaults, pedantic, test-defaults, warnings
969-
if !(flag(splice) && impl(ghc < 9.10))
969+
if !(flag(splice) && (impl(ghc < 9.10) || flag(ignore-plugins-ghc-bounds)))
970970
buildable: False
971971
type: exitcode-stdio-1.0
972972
hs-source-dirs: plugins/hls-splice-plugin/test
@@ -1208,13 +1208,13 @@ flag gadt
12081208
manual: True
12091209

12101210
common gadt
1211-
if flag(gadt) && impl(ghc < 9.11)
1211+
if flag(gadt) && (impl(ghc < 9.11) || flag(ignore-plugins-ghc-bounds))
12121212
build-depends: haskell-language-server:hls-gadt-plugin
12131213
cpp-options: -Dhls_gadt
12141214

12151215
library hls-gadt-plugin
12161216
import: defaults, pedantic, warnings
1217-
if !flag(gadt) || impl(ghc > 9.11)
1217+
if !flag(gadt) || (impl(ghc > 9.11) && !flag(ignore-plugins-ghc-bounds))
12181218
buildable: False
12191219
exposed-modules: Ide.Plugin.GADT
12201220
other-modules: Ide.Plugin.GHC
@@ -1238,7 +1238,7 @@ library hls-gadt-plugin
12381238

12391239
test-suite hls-gadt-plugin-tests
12401240
import: defaults, pedantic, test-defaults, warnings
1241-
if !flag(gadt) || impl(ghc > 9.11)
1241+
if !flag(gadt) || (impl(ghc > 9.11) && !flag(ignore-plugins-ghc-bounds))
12421242
buildable: False
12431243
type: exitcode-stdio-1.0
12441244
hs-source-dirs: plugins/hls-gadt-plugin/test
@@ -1400,14 +1400,14 @@ flag floskell
14001400
manual: True
14011401

14021402
common floskell
1403-
if flag(floskell) && impl(ghc < 9.10)
1403+
if flag(floskell) && (impl(ghc < 9.10) || flag(ignore-plugins-ghc-bounds))
14041404
build-depends: haskell-language-server:hls-floskell-plugin
14051405
cpp-options: -Dhls_floskell
14061406

14071407
library hls-floskell-plugin
14081408
import: defaults, pedantic, warnings
14091409
-- https://github.com/ennocramer/floskell/pull/82
1410-
if !(flag(floskell) && impl(ghc < 9.10))
1410+
if !(flag(floskell) && (impl(ghc < 9.10) || flag(ignore-plugins-ghc-bounds)))
14111411
buildable: False
14121412
exposed-modules: Ide.Plugin.Floskell
14131413
hs-source-dirs: plugins/hls-floskell-plugin/src
@@ -1422,7 +1422,7 @@ library hls-floskell-plugin
14221422

14231423
test-suite hls-floskell-plugin-tests
14241424
import: defaults, pedantic, test-defaults, warnings
1425-
if !(flag(floskell) && impl(ghc < 9.10))
1425+
if !(flag(floskell) && (impl(ghc < 9.10) || flag(ignore-plugins-ghc-bounds)))
14261426
buildable: False
14271427
type: exitcode-stdio-1.0
14281428
hs-source-dirs: plugins/hls-floskell-plugin/test
@@ -1442,13 +1442,13 @@ flag fourmolu
14421442
manual: True
14431443

14441444
common fourmolu
1445-
if flag(fourmolu) && impl(ghc < 9.11)
1445+
if flag(fourmolu) && (impl(ghc < 9.11) || flag(ignore-plugins-ghc-bounds))
14461446
build-depends: haskell-language-server:hls-fourmolu-plugin
14471447
cpp-options: -Dhls_fourmolu
14481448

14491449
library hls-fourmolu-plugin
14501450
import: defaults, pedantic, warnings
1451-
if !flag(fourmolu) || impl(ghc > 9.11)
1451+
if !flag(fourmolu) || (impl(ghc > 9.11) && !flag(ignore-plugins-ghc-bounds))
14521452
buildable: False
14531453
exposed-modules: Ide.Plugin.Fourmolu
14541454
hs-source-dirs: plugins/hls-fourmolu-plugin/src
@@ -1468,7 +1468,7 @@ library hls-fourmolu-plugin
14681468

14691469
test-suite hls-fourmolu-plugin-tests
14701470
import: defaults, pedantic, test-defaults, warnings
1471-
if !flag(fourmolu) || impl(ghc > 9.11)
1471+
if !flag(fourmolu) || (impl(ghc > 9.11) && !flag(ignore-plugins-ghc-bounds))
14721472
buildable: False
14731473
type: exitcode-stdio-1.0
14741474
hs-source-dirs: plugins/hls-fourmolu-plugin/test
@@ -1496,13 +1496,13 @@ flag ormolu
14961496
manual: True
14971497

14981498
common ormolu
1499-
if flag(ormolu) && impl(ghc < 9.11)
1499+
if flag(ormolu) && (impl(ghc < 9.11) || flag(ignore-plugins-ghc-bounds))
15001500
build-depends: haskell-language-server:hls-ormolu-plugin
15011501
cpp-options: -Dhls_ormolu
15021502

15031503
library hls-ormolu-plugin
15041504
import: defaults, pedantic, warnings
1505-
if !flag(ormolu) || impl(ghc > 9.11)
1505+
if !flag(ormolu) || (impl(ghc > 9.11) && !flag(ignore-plugins-ghc-bounds))
15061506
buildable: False
15071507
exposed-modules: Ide.Plugin.Ormolu
15081508
hs-source-dirs: plugins/hls-ormolu-plugin/src
@@ -1522,7 +1522,7 @@ library hls-ormolu-plugin
15221522

15231523
test-suite hls-ormolu-plugin-tests
15241524
import: defaults, pedantic, test-defaults, warnings
1525-
if !flag(ormolu) || impl(ghc > 9.11)
1525+
if !flag(ormolu) || (impl(ghc > 9.11) && !flag(ignore-plugins-ghc-bounds))
15261526
buildable: False
15271527
type: exitcode-stdio-1.0
15281528
hs-source-dirs: plugins/hls-ormolu-plugin/test
@@ -1551,14 +1551,14 @@ flag stylishHaskell
15511551
manual: True
15521552

15531553
common stylishHaskell
1554-
if flag(stylishHaskell) && impl(ghc < 9.10)
1554+
if flag(stylishHaskell) && (impl(ghc < 9.10) || flag(ignore-plugins-ghc-bounds))
15551555
build-depends: haskell-language-server:hls-stylish-haskell-plugin
15561556
cpp-options: -Dhls_stylishHaskell
15571557

15581558
library hls-stylish-haskell-plugin
15591559
import: defaults, pedantic, warnings
15601560
-- https://github.com/haskell/stylish-haskell/issues/479
1561-
if !(flag(stylishHaskell) && impl(ghc < 9.10))
1561+
if !(flag(stylishHaskell) && (impl(ghc < 9.10) || flag(ignore-plugins-ghc-bounds)))
15621562
buildable: False
15631563
exposed-modules: Ide.Plugin.StylishHaskell
15641564
hs-source-dirs: plugins/hls-stylish-haskell-plugin/src
@@ -1576,7 +1576,7 @@ library hls-stylish-haskell-plugin
15761576

15771577
test-suite hls-stylish-haskell-plugin-tests
15781578
import: defaults, pedantic, test-defaults, warnings
1579-
if !(flag(stylishHaskell) && impl(ghc < 9.10))
1579+
if !(flag(stylishHaskell) && (impl(ghc < 9.10) || flag(ignore-plugins-ghc-bounds)))
15801580
buildable: False
15811581
type: exitcode-stdio-1.0
15821582
hs-source-dirs: plugins/hls-stylish-haskell-plugin/test
@@ -1596,13 +1596,13 @@ flag refactor
15961596
manual: True
15971597

15981598
common refactor
1599-
if flag(refactor) && impl(ghc < 9.11)
1599+
if flag(refactor) && (impl(ghc < 9.11) || flag(ignore-plugins-ghc-bounds))
16001600
build-depends: haskell-language-server:hls-refactor-plugin
16011601
cpp-options: -Dhls_refactor
16021602

16031603
library hls-refactor-plugin
16041604
import: defaults, pedantic, warnings
1605-
if !flag(refactor) || impl(ghc > 9.11)
1605+
if !flag(refactor) || (impl(ghc > 9.11) && !flag(ignore-plugins-ghc-bounds))
16061606
buildable: False
16071607
exposed-modules: Development.IDE.GHC.ExactPrint
16081608
Development.IDE.GHC.Compat.ExactPrint
@@ -1661,7 +1661,7 @@ library hls-refactor-plugin
16611661

16621662
test-suite hls-refactor-plugin-tests
16631663
import: defaults, pedantic, test-defaults, warnings
1664-
if !flag(refactor) || impl(ghc > 9.11)
1664+
if !flag(refactor) || (impl(ghc > 9.11) && !flag(ignore-plugins-ghc-bounds))
16651665
buildable: False
16661666
type: exitcode-stdio-1.0
16671667
hs-source-dirs: plugins/hls-refactor-plugin/test
@@ -2007,11 +2007,11 @@ test-suite func-test
20072007
if flag(eval)
20082008
cpp-options: -Dhls_eval
20092009
-- formatters
2010-
if flag(floskell) && impl(ghc < 9.10)
2010+
if flag(floskell) && (impl(ghc < 9.10) || flag(ignore-plugins-ghc-bounds))
20112011
cpp-options: -Dhls_floskell
2012-
if flag(fourmolu) && impl(ghc < 9.11)
2012+
if flag(fourmolu) && (impl(ghc < 9.11) || flag(ignore-plugins-ghc-bounds))
20132013
cpp-options: -Dhls_fourmolu
2014-
if flag(ormolu) && impl(ghc < 9.11)
2014+
if flag(ormolu) && (impl(ghc < 9.11) || flag(ignore-plugins-ghc-bounds))
20152015
cpp-options: -Dhls_ormolu
20162016

20172017
test-suite wrapper-test

0 commit comments

Comments
 (0)