Skip to content

Commit 5eb7a78

Browse files
committed
Format cabal files with cabal guild version 1.5.0.1
1 parent 7bda10f commit 5eb7a78

File tree

3 files changed

+78
-77
lines changed

3 files changed

+78
-77
lines changed

haskell-language-server.cabal

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ common test-defaults
4747
-rtsopts
4848
-with-rtsopts=-N
4949

50-
if impl(ghc >= 9.8)
50+
if impl(ghc >=9.8)
5151
-- We allow using partial functions in tests
5252
ghc-options: -Wno-x-partial
5353

@@ -153,7 +153,7 @@ test-suite hls-cabal-fmt-plugin-tests
153153
haskell-language-server:hls-cabal-fmt-plugin,
154154
hls-test-utils ==2.8.0.0,
155155

156-
if flag(isolateCabalfmtTests)
156+
if flag(isolatecabalfmttests)
157157
build-tool-depends: cabal-fmt:cabal-fmt ^>=0.1.6
158158
cpp-options: -Dhls_isolate_cabalfmt_tests
159159

@@ -209,7 +209,7 @@ test-suite hls-cabal-gild-plugin-tests
209209
haskell-language-server:hls-cabal-gild-plugin,
210210
hls-test-utils ==2.8.0.0,
211211

212-
if flag(isolateCabalGildTests)
212+
if flag(isolatecabalgildtests)
213213
build-tool-depends: cabal-gild:cabal-gild ^>=1.1
214214
cpp-options: -Dhls_isolate_cabalgild_tests
215215

@@ -371,14 +371,14 @@ flag callHierarchy
371371
manual: True
372372

373373
common callHierarchy
374-
if flag(callHierarchy)
374+
if flag(callhierarchy)
375375
build-depends: haskell-language-server:hls-call-hierarchy-plugin
376376
cpp-options: -Dhls_callHierarchy
377377

378378
library hls-call-hierarchy-plugin
379379
import: defaults, pedantic, warnings
380380

381-
if !flag(callHierarchy)
381+
if !flag(callhierarchy)
382382
buildable: False
383383
exposed-modules: Ide.Plugin.CallHierarchy
384384
other-modules:
@@ -405,7 +405,7 @@ library hls-call-hierarchy-plugin
405405
test-suite hls-call-hierarchy-plugin-tests
406406
import: defaults, pedantic, test-defaults, warnings
407407

408-
if !flag(callHierarchy)
408+
if !flag(callhierarchy)
409409
buildable: False
410410
type: exitcode-stdio-1.0
411411
hs-source-dirs: plugins/hls-call-hierarchy-plugin/test
@@ -511,7 +511,7 @@ test-suite hls-eval-plugin-tests
511511
-- import lens plugin
512512
-----------------------------
513513
common importLens
514-
if flag(importLens)
514+
if flag(importlens)
515515
build-depends: haskell-language-server:hls-explicit-imports-plugin
516516
cpp-options: -Dhls_importLens
517517

@@ -778,14 +778,14 @@ flag stan
778778
manual: True
779779

780780
common stan
781-
if flag(stan)&&(impl(ghc > 8.8.1)&& impl(ghc <= 9.2.3)|| impl(ghc >= 9.4.0)&& impl(ghc < 9.10.0))
781+
if flag(stan) && (impl(ghc >8.8.1) && impl(ghc <=9.2.3) || impl(ghc >=9.4.0) && impl(ghc <9.10.0))
782782
build-depends: haskell-language-server:hls-stan-plugin
783783
cpp-options: -Dhls_stan
784784

785785
library hls-stan-plugin
786786
import: defaults, pedantic, warnings
787787

788-
if flag(stan)&&(impl(ghc > 8.8.1)&& impl(ghc <= 9.2.3)|| impl(ghc >= 9.4.0)&& impl(ghc < 9.10.0))
788+
if flag(stan) && (impl(ghc >8.8.1) && impl(ghc <=9.2.3) || impl(ghc >=9.4.0) && impl(ghc <9.10.0))
789789
buildable: True
790790
else
791791
buildable: False
@@ -815,7 +815,7 @@ library hls-stan-plugin
815815
test-suite hls-stan-plugin-tests
816816
import: defaults, pedantic, test-defaults, warnings
817817

818-
if flag(stan)&&(impl(ghc > 8.8.1)&& impl(ghc <= 9.2.3)|| impl(ghc >= 9.4.0)&& impl(ghc < 9.10.0))
818+
if flag(stan) && (impl(ghc >8.8.1) && impl(ghc <=9.2.3) || impl(ghc >=9.4.0) && impl(ghc <9.10.0))
819819
buildable: True
820820
else
821821
buildable: False
@@ -845,7 +845,7 @@ flag moduleName
845845
manual: True
846846

847847
common moduleName
848-
if flag(moduleName)
848+
if flag(modulename)
849849
build-depends: haskell-language-server:hls-module-name-plugin
850850
cpp-options: -Dhls_moduleName
851851

@@ -1000,14 +1000,14 @@ flag alternateNumberFormat
10001000
manual: True
10011001

10021002
common alternateNumberFormat
1003-
if flag(alternateNumberFormat)
1003+
if flag(alternatenumberformat)
10041004
build-depends: haskell-language-server:hls-alternate-number-format-plugin
10051005
cpp-options: -Dhls_alternateNumberFormat
10061006

10071007
library hls-alternate-number-format-plugin
10081008
import: defaults, pedantic, warnings
10091009

1010-
if !flag(alternateNumberFormat)
1010+
if !flag(alternatenumberformat)
10111011
buildable: False
10121012
exposed-modules:
10131013
Ide.Plugin.AlternateNumberFormat
@@ -1038,7 +1038,7 @@ library hls-alternate-number-format-plugin
10381038
test-suite hls-alternate-number-format-plugin-tests
10391039
import: defaults, pedantic, test-defaults, warnings
10401040

1041-
if !flag(alternateNumberFormat)
1041+
if !flag(alternatenumberformat)
10421042
buildable: False
10431043
type: exitcode-stdio-1.0
10441044
hs-source-dirs: plugins/hls-alternate-number-format-plugin/test
@@ -1068,14 +1068,14 @@ flag qualifyImportedNames
10681068
manual: True
10691069

10701070
common qualifyImportedNames
1071-
if flag(qualifyImportedNames)
1071+
if flag(qualifyimportednames)
10721072
build-depends: haskell-language-server:hls-qualify-imported-names-plugin
10731073
cpp-options: -Dhls_qualifyImportedNames
10741074

10751075
library hls-qualify-imported-names-plugin
10761076
import: defaults, pedantic, warnings
10771077

1078-
if !flag(qualifyImportedNames)
1078+
if !flag(qualifyimportednames)
10791079
buildable: False
10801080
exposed-modules: Ide.Plugin.QualifyImportedNames
10811081
hs-source-dirs: plugins/hls-qualify-imported-names-plugin/src
@@ -1096,7 +1096,7 @@ library hls-qualify-imported-names-plugin
10961096
test-suite hls-qualify-imported-names-plugin-tests
10971097
import: defaults, pedantic, test-defaults, warnings
10981098

1099-
if !flag(qualifyImportedNames)
1099+
if !flag(qualifyimportednames)
11001100
buildable: False
11011101
type: exitcode-stdio-1.0
11021102
hs-source-dirs: plugins/hls-qualify-imported-names-plugin/test
@@ -1117,14 +1117,14 @@ flag codeRange
11171117
manual: True
11181118

11191119
common codeRange
1120-
if flag(codeRange)
1120+
if flag(coderange)
11211121
build-depends: haskell-language-server:hls-code-range-plugin
11221122
cpp-options: -Dhls_codeRange
11231123

11241124
library hls-code-range-plugin
11251125
import: defaults, pedantic, warnings
11261126

1127-
if !flag(codeRange)
1127+
if !flag(coderange)
11281128
buildable: False
11291129
exposed-modules:
11301130
Ide.Plugin.CodeRange
@@ -1152,7 +1152,7 @@ library hls-code-range-plugin
11521152
test-suite hls-code-range-plugin-tests
11531153
import: defaults, pedantic, test-defaults, warnings
11541154

1155-
if !flag(codeRange)
1155+
if !flag(coderange)
11561156
buildable: False
11571157
type: exitcode-stdio-1.0
11581158
hs-source-dirs: plugins/hls-code-range-plugin/test
@@ -1182,14 +1182,14 @@ flag changeTypeSignature
11821182
manual: True
11831183

11841184
common changeTypeSignature
1185-
if flag(changeTypeSignature)
1185+
if flag(changetypesignature)
11861186
build-depends: haskell-language-server:hls-change-type-signature-plugin
11871187
cpp-options: -Dhls_changeTypeSignature
11881188

11891189
library hls-change-type-signature-plugin
11901190
import: defaults, pedantic, warnings
11911191

1192-
if !flag(changeTypeSignature)
1192+
if !flag(changetypesignature)
11931193
buildable: False
11941194
exposed-modules: Ide.Plugin.ChangeTypeSignature
11951195
hs-source-dirs: plugins/hls-change-type-signature-plugin/src
@@ -1213,7 +1213,7 @@ library hls-change-type-signature-plugin
12131213
test-suite hls-change-type-signature-plugin-tests
12141214
import: defaults, pedantic, test-defaults, warnings
12151215

1216-
if !flag(changeTypeSignature)
1216+
if !flag(changetypesignature)
12171217
buildable: False
12181218
type: exitcode-stdio-1.0
12191219
hs-source-dirs: plugins/hls-change-type-signature-plugin/test
@@ -1293,14 +1293,14 @@ flag explicitFixity
12931293
manual: True
12941294

12951295
common explicitFixity
1296-
if flag(explicitFixity)
1296+
if flag(explicitfixity)
12971297
build-depends: haskell-language-server:hls-explicit-fixity-plugin
12981298
cpp-options: -DexplicitFixity
12991299

13001300
library hls-explicit-fixity-plugin
13011301
import: defaults, pedantic, warnings
13021302

1303-
if !flag(explicitFixity)
1303+
if !flag(explicitfixity)
13041304
buildable: False
13051305
exposed-modules: Ide.Plugin.ExplicitFixity
13061306
hs-source-dirs: plugins/hls-explicit-fixity-plugin/src
@@ -1320,7 +1320,7 @@ library hls-explicit-fixity-plugin
13201320
test-suite hls-explicit-fixity-plugin-tests
13211321
import: defaults, pedantic, test-defaults, warnings
13221322

1323-
if !flag(explicitFixity)
1323+
if !flag(explicitfixity)
13241324
buildable: False
13251325
type: exitcode-stdio-1.0
13261326
hs-source-dirs: plugins/hls-explicit-fixity-plugin/test
@@ -1341,14 +1341,14 @@ flag explicitFields
13411341
manual: True
13421342

13431343
common explicitFields
1344-
if flag(explicitFields)
1344+
if flag(explicitfields)
13451345
build-depends: haskell-language-server:hls-explicit-record-fields-plugin
13461346
cpp-options: -DexplicitFields
13471347

13481348
library hls-explicit-record-fields-plugin
13491349
import: defaults, pedantic, warnings
13501350

1351-
if !flag(explicitFields)
1351+
if !flag(explicitfields)
13521352
buildable: False
13531353
exposed-modules: Ide.Plugin.ExplicitFields
13541354
build-depends:
@@ -1372,7 +1372,7 @@ library hls-explicit-record-fields-plugin
13721372
test-suite hls-explicit-record-fields-plugin-tests
13731373
import: defaults, pedantic, test-defaults, warnings
13741374

1375-
if !flag(explicitFields)
1375+
if !flag(explicitfields)
13761376
buildable: False
13771377
type: exitcode-stdio-1.0
13781378
hs-source-dirs: plugins/hls-explicit-record-fields-plugin/test
@@ -1393,14 +1393,14 @@ flag overloadedRecordDot
13931393
manual: True
13941394

13951395
common overloadedRecordDot
1396-
if flag(overloadedRecordDot)
1396+
if flag(overloadedrecorddot)
13971397
build-depends: haskell-language-server:hls-overloaded-record-dot-plugin
13981398
cpp-options: -Dhls_overloaded_record_dot
13991399

14001400
library hls-overloaded-record-dot-plugin
14011401
import: defaults, pedantic, warnings
14021402

1403-
if !flag(overloadedRecordDot)
1403+
if !flag(overloadedrecorddot)
14041404
buildable: False
14051405
exposed-modules: Ide.Plugin.OverloadedRecordDot
14061406
build-depends:
@@ -1422,7 +1422,7 @@ library hls-overloaded-record-dot-plugin
14221422
test-suite hls-overloaded-record-dot-plugin-tests
14231423
import: defaults, pedantic, test-defaults, warnings
14241424

1425-
if !flag(overloadedRecordDot)
1425+
if !flag(overloadedrecorddot)
14261426
buildable: False
14271427
type: exitcode-stdio-1.0
14281428
hs-source-dirs: plugins/hls-overloaded-record-dot-plugin/test
@@ -1595,14 +1595,14 @@ flag stylishHaskell
15951595
manual: True
15961596

15971597
common stylishHaskell
1598-
if flag(stylishHaskell)
1598+
if flag(stylishhaskell)
15991599
build-depends: haskell-language-server:hls-stylish-haskell-plugin
16001600
cpp-options: -Dhls_stylishHaskell
16011601

16021602
library hls-stylish-haskell-plugin
16031603
import: defaults, pedantic, warnings
16041604

1605-
if !flag(stylishHaskell)
1605+
if !flag(stylishhaskell)
16061606
buildable: False
16071607
exposed-modules: Ide.Plugin.StylishHaskell
16081608
hs-source-dirs: plugins/hls-stylish-haskell-plugin/src
@@ -1621,7 +1621,7 @@ library hls-stylish-haskell-plugin
16211621
test-suite hls-stylish-haskell-plugin-tests
16221622
import: defaults, pedantic, test-defaults, warnings
16231623

1624-
if !flag(stylishHaskell)
1624+
if !flag(stylishhaskell)
16251625
buildable: False
16261626
type: exitcode-stdio-1.0
16271627
hs-source-dirs: plugins/hls-stylish-haskell-plugin/test
@@ -1749,14 +1749,14 @@ flag semanticTokens
17491749
manual: True
17501750

17511751
common semanticTokens
1752-
if flag(semanticTokens)
1752+
if flag(semantictokens)
17531753
build-depends: haskell-language-server:hls-semantic-tokens-plugin
17541754
cpp-options: -Dhls_semanticTokens
17551755

17561756
library hls-semantic-tokens-plugin
17571757
import: defaults, pedantic, warnings
17581758

1759-
if !flag(semanticTokens)
1759+
if !flag(semantictokens)
17601760
buildable: False
17611761
exposed-modules:
17621762
Ide.Plugin.SemanticTokens
@@ -1799,7 +1799,7 @@ library hls-semantic-tokens-plugin
17991799
test-suite hls-semantic-tokens-plugin-tests
18001800
import: defaults, pedantic, test-defaults, warnings
18011801

1802-
if !flag(semanticTokens)
1802+
if !flag(semantictokens)
18031803
buildable: False
18041804
type: exitcode-stdio-1.0
18051805
hs-source-dirs: plugins/hls-semantic-tokens-plugin/test
@@ -1888,10 +1888,10 @@ test-suite hls-notes-plugin-tests
18881888
----------------------------
18891889
library
18901890
import:
1891+
-- plugins
18911892
defaults
18921893
, warnings
18931894
, pedantic
1894-
-- plugins
18951895
, cabal
18961896
, callHierarchy
18971897
, cabalfmt
@@ -1971,7 +1971,7 @@ executable haskell-language-server
19711971
if flag(pedantic)
19721972
ghc-options: -Werror
19731973

1974-
if !os(windows)&& flag(dynamic)
1974+
if !os(windows) && flag(dynamic)
19751975
-- We want to link against the dyn rts just like official GHC binaries do;
19761976
-- the linked rts determines how external libs are loaded dynamically by TH.
19771977
-- The standard way of doing this is via the --enable-dynamic-executables Cabal option
@@ -2196,7 +2196,7 @@ test-suite ghcide-tests
21962196
text-rope,
21972197
unordered-containers,
21982198

2199-
if impl(ghc < 9.3)
2199+
if impl(ghc <9.3)
22002200
build-depends: ghc-typelits-knownnat
22012201
hs-source-dirs: ghcide/test/exe
22022202
ghc-options:

hie-compat/hie-compat.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ library
5050
Compat.HieTypes
5151
Compat.HieUtils
5252

53-
if (impl(ghc >= 9.2)&& impl(ghc < 9.3))
53+
if (impl(ghc >=9.2) && impl(ghc <9.3))
5454
hs-source-dirs:
5555
src-ghc92
5656
src-reexport-ghc9
5757

58-
if (impl(ghc >= 9.4))
58+
if (impl(ghc >=9.4))
5959
hs-source-dirs: src-reexport-ghc92

0 commit comments

Comments
 (0)