Skip to content

Commit 7e875ec

Browse files
committed
enable a bunch of plugins that build with ghc 9.4
1 parent 5b229b6 commit 7e875ec

File tree

10 files changed

+32
-80
lines changed

10 files changed

+32
-80
lines changed

.github/workflows/test.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ jobs:
180180
name: Test hls-class-plugin
181181
run: cabal test hls-class-plugin --test-options="$TEST_OPTS" || cabal test hls-class-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-class-plugin --test-options="$TEST_OPTS"
182182

183-
- if: matrix.test && matrix.ghc != '9.4.2'
183+
- if: matrix.test
184184
name: Test hls-pragmas-plugin
185185
run: cabal test hls-pragmas-plugin --test-options="$TEST_OPTS" || cabal test hls-pragmas-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-pragmas-plugin --test-options="$TEST_OPTS"
186186

@@ -212,15 +212,15 @@ jobs:
212212
name: Test hls-tactics-plugin test suite
213213
run: cabal test hls-tactics-plugin --test-options="$TEST_OPTS" || cabal test hls-tactics-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-tactics-plugin --test-options="$TEST_OPTS"
214214

215-
- if: matrix.test && matrix.ghc != '9.4.2'
215+
- if: matrix.test
216216
name: Test hls-refine-imports-plugin test suite
217217
run: cabal test hls-refine-imports-plugin --test-options="$TEST_OPTS" || cabal test hls-refine-imports-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-refine-imports-plugin --test-options="$TEST_OPTS"
218218

219-
- if: matrix.test && matrix.ghc != '9.4.2'
219+
- if: matrix.test
220220
name: Test hls-explicit-imports-plugin test suite
221221
run: cabal test hls-explicit-imports-plugin --test-options="$TEST_OPTS" || cabal test hls-explicit-imports-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-explicit-imports-plugin --test-options="$TEST_OPTS"
222222

223-
- if: matrix.test && matrix.ghc != '9.4.2'
223+
- if: matrix.test
224224
name: Test hls-call-hierarchy-plugin test suite
225225
run: cabal test hls-call-hierarchy-plugin --test-options="$TEST_OPTS" || cabal test hls-call-hierarchy-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-call-hierarchy-plugin --test-options="$TEST_OPTS"
226226

@@ -236,31 +236,31 @@ jobs:
236236
name: Test hls-stan-plugin test suite
237237
run: cabal test hls-stan-plugin --test-options="$TEST_OPTS" || cabal test hls-hlint-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-stan-plugin --test-options="$TEST_OPTS"
238238

239-
- if: matrix.test && matrix.ghc != '9.4.2'
239+
- if: matrix.test
240240
name: Test hls-module-name-plugin test suite
241241
run: cabal test hls-module-name-plugin --test-options="$TEST_OPTS" || cabal test hls-module-name-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-module-name-plugin --test-options="$TEST_OPTS"
242242

243243
- if: matrix.test && matrix.ghc != '9.4.2'
244244
name: Test hls-alternate-number-format-plugin test suite
245245
run: cabal test hls-alternate-number-format-plugin --test-options="$TEST_OPTS" || cabal test hls-alternate-number-format-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-alternate-number-format-plugin --test-options="$TEST_OPTS"
246246

247-
- if: matrix.test && matrix.ghc != '9.4.2'
247+
- if: matrix.test
248248
name: Test hls-qualify-imported-names-plugin test suite
249249
run: cabal test hls-qualify-imported-names-plugin --test-options="$TEST_OPTS" || cabal test hls-qualify-imported-names-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-qualify-imported-names-plugin --test-options="$TEST_OPTS"
250250

251251
- if: matrix.test && matrix.ghc != '9.4.2'
252252
name: Test hls-code-range-plugin test suite
253253
run: cabal test hls-code-range-plugin --test-options="$TEST_OPTS" || cabal test hls-code-range-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-code-range-plugin --test-options="$TEST_OPTS"
254254

255-
- if: matrix.test && matrix.ghc != '9.4.2'
255+
- if: matrix.test
256256
name: Test hls-change-type-signature test suite
257257
run: cabal test hls-change-type-signature-plugin --test-options="$TEST_OPTS" || cabal test hls-change-type-signature-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-change-type-signature-plugin --test-options="$TEST_OPTS"
258258

259259
- if: matrix.test && matrix.ghc != '9.4.2'
260260
name: Test hls-gadt-plugin test suit
261261
run: cabal test hls-gadt-plugin --test-options="$TEST_OPTS" || cabal test hls-gadt-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-gadt-plugin --test-options="$TEST_OPTS"
262262

263-
- if: matrix.test && matrix.ghc != '9.4.2'
263+
- if: matrix.test
264264
name: Test hls-explicit-fixity-plugin test suite
265265
run: cabal test hls-explicit-fixity-plugin --test-options="$TEST_OPTS" || cabal test hls-explicit-fixity-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-explicit-fixity-plugin --test-options="$TEST_OPTS"
266266

haskell-language-server.cabal

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ common class
244244
cpp-options: -Dhls_class
245245

246246
common callHierarchy
247-
if flag(callHierarchy) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
247+
if flag(callHierarchy)
248248
build-depends: hls-call-hierarchy-plugin ^>= 1.0
249249
cpp-options: -Dhls_callHierarchy
250250

@@ -259,12 +259,12 @@ common eval
259259
cpp-options: -Dhls_eval
260260

261261
common importLens
262-
if flag(importLens) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
262+
if flag(importLens)
263263
build-depends: hls-explicit-imports-plugin ^>= 1.1
264264
cpp-options: -Dhls_importLens
265265

266266
common refineImports
267-
if flag(refineImports) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
267+
if flag(refineImports)
268268
build-depends: hls-refine-imports-plugin ^>=1.0
269269
cpp-options: -Dhls_refineImports
270270

@@ -294,12 +294,12 @@ common stan
294294
cpp-options: -Dhls_stan
295295

296296
common moduleName
297-
if flag(moduleName) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
297+
if flag(moduleName)
298298
build-depends: hls-module-name-plugin ^>= 1.0
299299
cpp-options: -Dhls_moduleName
300300

301301
common pragmas
302-
if flag(pragmas) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
302+
if flag(pragmas)
303303
build-depends: hls-pragmas-plugin ^>= 1.0
304304
cpp-options: -Dhls_pragmas
305305

@@ -314,7 +314,7 @@ common alternateNumberFormat
314314
cpp-options: -Dhls_alternateNumberFormat
315315

316316
common qualifyImportedNames
317-
if flag(qualifyImportedNames) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
317+
if flag(qualifyImportedNames)
318318
build-depends: hls-qualify-imported-names-plugin ^>=1.0
319319
cpp-options: -Dhls_qualifyImportedNames
320320

@@ -324,7 +324,7 @@ common codeRange
324324
cpp-options: -Dhls_codeRange
325325

326326
common changeTypeSignature
327-
if flag(changeTypeSignature) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
327+
if flag(changeTypeSignature)
328328
build-depends: hls-change-type-signature-plugin ^>= 1.0
329329
cpp-options: -Dhls_changeTypeSignature
330330

@@ -334,7 +334,7 @@ common gadt
334334
cpp-options: -Dhls_gadt
335335

336336
common explicitFixity
337-
if flag(explicitFixity) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
337+
if flag(explicitFixity)
338338
build-depends: hls-explicit-fixity-plugin ^>= 1.0
339339
cpp-options: -DexplicitFixity
340340

plugins/hls-call-hierarchy-plugin/hls-call-hierarchy-plugin.cabal

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ extra-source-files:
1616
test/testdata/*.hs
1717

1818
library
19-
if impl(ghc >= 9.3)
20-
buildable: False
21-
else
22-
buildable: True
19+
buildable: True
2320
exposed-modules: Ide.Plugin.CallHierarchy
2421
other-modules:
2522
Ide.Plugin.CallHierarchy.Internal
@@ -47,10 +44,7 @@ library
4744
default-extensions: DataKinds
4845

4946
test-suite tests
50-
if impl(ghc >= 9.3)
51-
buildable: False
52-
else
53-
buildable: True
47+
buildable: True
5448
type: exitcode-stdio-1.0
5549
default-language: Haskell2010
5650
hs-source-dirs: test

plugins/hls-change-type-signature-plugin/hls-change-type-signature-plugin.cabal

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@ extra-source-files:
1919
test/testdata/*.yaml
2020

2121
library
22-
if impl(ghc >= 9.3)
23-
buildable: False
24-
else
25-
buildable: True
22+
buildable: True
2623
exposed-modules: Ide.Plugin.ChangeTypeSignature
2724
hs-source-dirs: src
2825
build-depends:
@@ -50,10 +47,7 @@ library
5047

5148

5249
test-suite tests
53-
if impl(ghc >= 9.3)
54-
buildable: False
55-
else
56-
buildable: True
50+
buildable: True
5751
type: exitcode-stdio-1.0
5852
default-language: Haskell2010
5953
hs-source-dirs: test

plugins/hls-explicit-fixity-plugin/hls-explicit-fixity-plugin.cabal

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ extra-source-files:
1616
test/testdata/*.hs
1717

1818
library
19-
if impl(ghc >= 9.3)
20-
buildable: False
21-
else
22-
buildable: True
19+
buildable: True
2320
exposed-modules: Ide.Plugin.ExplicitFixity
2421

2522
hs-source-dirs: src
@@ -43,10 +40,7 @@ library
4340
default-extensions: DataKinds
4441

4542
test-suite tests
46-
if impl(ghc >= 9.3)
47-
buildable: False
48-
else
49-
buildable: True
43+
buildable: True
5044
type: exitcode-stdio-1.0
5145
default-language: Haskell2010
5246
hs-source-dirs: test

plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ extra-source-files:
1616
test/testdata/*.yaml
1717

1818
library
19-
if impl(ghc >= 9.3)
20-
buildable: False
21-
else
22-
buildable: True
19+
buildable: True
2320
exposed-modules: Ide.Plugin.ExplicitImports
2421
hs-source-dirs: src
2522
build-depends:
@@ -41,10 +38,7 @@ library
4138
TypeOperators
4239

4340
test-suite tests
44-
if impl(ghc >= 9.3)
45-
buildable: False
46-
else
47-
buildable: True
41+
buildable: True
4842
type: exitcode-stdio-1.0
4943
default-language: Haskell2010
5044
hs-source-dirs: test

plugins/hls-module-name-plugin/hls-module-name-plugin.cabal

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@ extra-source-files:
2020
test/testdata/**/*.project
2121

2222
library
23-
if impl(ghc >= 9.3)
24-
buildable: False
25-
else
26-
buildable: True
23+
buildable: True
2724
exposed-modules: Ide.Plugin.ModuleName
2825
hs-source-dirs: src
2926
build-depends:
@@ -41,10 +38,7 @@ library
4138
default-language: Haskell2010
4239

4340
test-suite tests
44-
if impl(ghc >= 9.3)
45-
buildable: False
46-
else
47-
buildable: True
41+
buildable: True
4842
type: exitcode-stdio-1.0
4943
default-language: Haskell2010
5044
hs-source-dirs: test

plugins/hls-pragmas-plugin/hls-pragmas-plugin.cabal

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ extra-source-files:
1818
test/testdata/*.yaml
1919

2020
library
21-
if impl(ghc >= 9.3)
22-
buildable: False
23-
else
24-
buildable: True
21+
buildable: True
2522
exposed-modules: Ide.Plugin.Pragmas
2623
hs-source-dirs: src
2724
build-depends:
@@ -41,10 +38,7 @@ library
4138
default-language: Haskell2010
4239

4340
test-suite tests
44-
if impl(ghc >= 9.3)
45-
buildable: False
46-
else
47-
buildable: True
41+
buildable: True
4842
type: exitcode-stdio-1.0
4943
default-language: Haskell2010
5044
hs-source-dirs: test

plugins/hls-qualify-imported-names-plugin/hls-qualify-imported-names-plugin.cabal

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ extra-source-files:
1818
test/data/*.yaml
1919

2020
library
21-
if impl(ghc >= 9.3)
22-
buildable: False
23-
else
24-
buildable: True
21+
buildable: True
2522
exposed-modules: Ide.Plugin.QualifyImportedNames
2623
hs-source-dirs: src
2724
build-depends:
@@ -45,10 +42,7 @@ library
4542
TypeOperators
4643

4744
test-suite tests
48-
if impl(ghc >= 9.3)
49-
buildable: False
50-
else
51-
buildable: True
45+
buildable: True
5246
type: exitcode-stdio-1.0
5347
default-language: Haskell2010
5448
hs-source-dirs: test

plugins/hls-refine-imports-plugin/hls-refine-imports-plugin.cabal

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ extra-source-files:
1616
test/testdata/*.yaml
1717

1818
library
19-
if impl(ghc >= 9.3)
20-
buildable: False
21-
else
22-
buildable: True
19+
buildable: True
2320
exposed-modules: Ide.Plugin.RefineImports
2421
hs-source-dirs: src
2522
build-depends:
@@ -42,10 +39,7 @@ library
4239
TypeOperators
4340

4441
test-suite tests
45-
if impl(ghc >= 9.3)
46-
buildable: False
47-
else
48-
buildable: True
42+
buildable: True
4943
type: exitcode-stdio-1.0
5044
default-language: Haskell2010
5145
hs-source-dirs: test

0 commit comments

Comments
 (0)