From 892244980234b1409d13d059ffb9f0a6aacf7fa4 Mon Sep 17 00:00:00 2001 From: jneira Date: Fri, 14 Jan 2022 10:52:48 +0100 Subject: [PATCH 1/5] Enable class-hierarchy for 9.2.1 --- cabal-ghc921.project | 1 - haskell-language-server.cabal | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cabal-ghc921.project b/cabal-ghc921.project index df3c6e44f1..e51bc3a1f5 100644 --- a/cabal-ghc921.project +++ b/cabal-ghc921.project @@ -55,7 +55,6 @@ constraints: +ignore-plugins-ghc-bounds -alternateNumberFormat -brittany - -callhierarchy -class -eval -haddockComments diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index fe4585f33d..9d7e342670 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -211,7 +211,7 @@ common class cpp-options: -Dclass common callHierarchy - if flag(callHierarchy) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds)) + if flag(callHierarchy) build-depends: hls-call-hierarchy-plugin ^>=1.0.0.0 cpp-options: -DcallHierarchy From 8d5c15a90e00a1628efbdc9c5ee6accae737d1b0 Mon Sep 17 00:00:00 2001 From: jneira Date: Fri, 14 Jan 2022 10:55:36 +0100 Subject: [PATCH 2/5] Add module-name plugin to tests --- .github/workflows/test.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9b3ed24357..eaf1da11d0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -210,6 +210,10 @@ jobs: name: Test hls-hlint-plugin test suite 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" + - if: matrix.test + name: Test hls-module-name-plugin test suite + 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" + - if: matrix.test && matrix.ghc != '9.2.1' name: Test hls-alternate-number-format-plugin test suite 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" From b5b7538ca017f128af57cbef5e7f78f06fb29d6b Mon Sep 17 00:00:00 2001 From: jneira Date: Fri, 14 Jan 2022 11:00:25 +0100 Subject: [PATCH 3/5] Update docs status --- docs/supported-versions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/supported-versions.md b/docs/supported-versions.md index 2485d94f4f..303a3d330f 100644 --- a/docs/supported-versions.md +++ b/docs/supported-versions.md @@ -6,7 +6,7 @@ The current support for different GHC versions is given in the following table. | GHC version | Last supporting HLS version | Deprecation status | | ----------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------- | -| 9.2.0 | [not supported](https://github.com/haskell/haskell-language-server/issues/2179) yet | | +| 9.2.0 | incoming [partial](https://github.com/haskell/haskell-language-server/issues/2179) | | | 9.0.1 | [current](https://github.com/haskell/haskell-language-server/releases/latest) ([partial](https://github.com/haskell/haskell-language-server/issues/297)) | | | 8.10.7 | [current](https://github.com/haskell/haskell-language-server/releases/latest) | | | 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 | From 8c366d689629a25c48b44d74d697a9cfedce2cce Mon Sep 17 00:00:00 2001 From: jneira Date: Fri, 14 Jan 2022 11:22:47 +0100 Subject: [PATCH 4/5] Include module plugin via flags --- cabal-ghc921.project | 1 - 1 file changed, 1 deletion(-) diff --git a/cabal-ghc921.project b/cabal-ghc921.project index e51bc3a1f5..4c18f7ef9e 100644 --- a/cabal-ghc921.project +++ b/cabal-ghc921.project @@ -59,7 +59,6 @@ constraints: -eval -haddockComments -hlint - -moduleName -qualifyImportedNames -refineImports -retrie From a7a9b096ca042aeca12c9e002ad45a8b51ccae30 Mon Sep 17 00:00:00 2001 From: jneira Date: Fri, 14 Jan 2022 14:25:54 +0100 Subject: [PATCH 5/5] Module name does not compile for ghc-9.2.1 --- .github/workflows/test.yml | 2 +- cabal-ghc921.project | 1 + haskell-language-server.cabal | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index eaf1da11d0..59578a98a0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -210,7 +210,7 @@ jobs: name: Test hls-hlint-plugin test suite 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" - - if: matrix.test + - if: matrix.test && matrix.ghc != '9.2.1' name: Test hls-module-name-plugin test suite 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" diff --git a/cabal-ghc921.project b/cabal-ghc921.project index 4c18f7ef9e..e51bc3a1f5 100644 --- a/cabal-ghc921.project +++ b/cabal-ghc921.project @@ -59,6 +59,7 @@ constraints: -eval -haddockComments -hlint + -moduleName -qualifyImportedNames -refineImports -retrie diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index 9d7e342670..4dc41b4d09 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -256,7 +256,7 @@ common hlint cpp-options: -Dhlint common moduleName - if flag(moduleName) + if flag(moduleName) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds)) build-depends: hls-module-name-plugin ^>=1.0.0.0 cpp-options: -DmoduleName