From 26cd0657c2e201598563440126c84dbebc075e31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Hr=C4=8Dek?= Date: Sat, 9 Mar 2024 10:07:09 +0100 Subject: [PATCH 1/3] Enable stylish-haskell with ghc 9.8 --- haskell-language-server.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index 3b615e18d2..c7ed478e2f 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -1416,7 +1416,7 @@ flag stylishHaskell manual: True common stylishHaskell - if flag(stylishHaskell) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds)) + if flag(stylishHaskell) build-depends: haskell-language-server:hls-stylish-haskell-plugin cpp-options: -Dhls_stylishHaskell @@ -1433,7 +1433,7 @@ library hls-stylish-haskell-plugin , hls-plugin-api == 2.7.0.0 , lsp-types , mtl - , stylish-haskell ^>=0.12 || ^>=0.13 || ^>=0.14.2 + , stylish-haskell ^>=0.12 || ^>=0.13 || ^>=0.14.2 || ^>=0.14.6 , text From 4b098ef95ce21fcb199b2a7b65d7c4c66239cbb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Hr=C4=8Dek?= Date: Sat, 9 Mar 2024 10:12:38 +0100 Subject: [PATCH 2/3] Fix index-state warnings --- cabal.project | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cabal.project b/cabal.project index eeed43c90d..85abe2914e 100644 --- a/cabal.project +++ b/cabal.project @@ -8,7 +8,7 @@ packages: ./hls-plugin-api ./hls-test-utils -index-state: 2024-02-25T00:00:00Z +index-state: 2024-03-09T08:17:00Z tests: True test-show-details: direct From ecc4d921db240c4bba638cbca7d4317b2f6aa5da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Hr=C4=8Dek?= Date: Sat, 9 Mar 2024 13:08:40 +0100 Subject: [PATCH 3/3] Simplify --- haskell-language-server.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index c7ed478e2f..574f86f2ef 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -1433,7 +1433,7 @@ library hls-stylish-haskell-plugin , hls-plugin-api == 2.7.0.0 , lsp-types , mtl - , stylish-haskell ^>=0.12 || ^>=0.13 || ^>=0.14.2 || ^>=0.14.6 + , stylish-haskell ^>=0.12 || ^>=0.13 || ^>=0.14 , text