Skip to content

Commit 9c2bc32

Browse files
authored
More work around next ghc-9.2.1 support (#2587)
* Enable class-hierarchy for 9.2.1 * Add module-name plugin to tests * Update docs status * Include module plugin via flags * Module name does not compile for ghc-9.2.1
1 parent 8804cbd commit 9c2bc32

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

.github/workflows/test.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,10 @@ jobs:
210210
name: Test hls-hlint-plugin test suite
211211
run: cabal test hls-hlint-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-hlint-plugin --test-options="$TEST_OPTS"
212212

213+
- if: matrix.test && matrix.ghc != '9.2.1'
214+
name: Test hls-module-name-plugin test suite
215+
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"
216+
213217
- if: matrix.test && matrix.ghc != '9.2.1'
214218
name: Test hls-alternate-number-format-plugin test suite
215219
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"

cabal-ghc921.project

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ constraints:
5555
+ignore-plugins-ghc-bounds
5656
-alternateNumberFormat
5757
-brittany
58-
-callhierarchy
5958
-class
6059
-eval
6160
-haddockComments

docs/supported-versions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The current support for different GHC versions is given in the following table.
66

77
| GHC version | Last supporting HLS version | Deprecation status |
88
| ----------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------- |
9-
| 9.2.0 | [not supported](https://github.com/haskell/haskell-language-server/issues/2179) yet | |
9+
| 9.2.0 | incoming [partial](https://github.com/haskell/haskell-language-server/issues/2179) | |
1010
| 9.0.1 | [current](https://github.com/haskell/haskell-language-server/releases/latest) ([partial](https://github.com/haskell/haskell-language-server/issues/297)) | |
1111
| 8.10.7 | [current](https://github.com/haskell/haskell-language-server/releases/latest) | |
1212
| 8.10.6 | [current](https://github.com/haskell/haskell-language-server/releases/latest) | will be deprecated after LTS and HLS full support for ghc-9.0 |

haskell-language-server.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ common class
211211
cpp-options: -Dclass
212212

213213
common callHierarchy
214-
if flag(callHierarchy) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
214+
if flag(callHierarchy)
215215
build-depends: hls-call-hierarchy-plugin ^>=1.0.0.0
216216
cpp-options: -DcallHierarchy
217217

@@ -256,7 +256,7 @@ common hlint
256256
cpp-options: -Dhlint
257257

258258
common moduleName
259-
if flag(moduleName)
259+
if flag(moduleName) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
260260
build-depends: hls-module-name-plugin ^>=1.0.0.0
261261
cpp-options: -DmoduleName
262262

0 commit comments

Comments
 (0)