From 90d1b892481827b724f5ac43af4177d26765478c Mon Sep 17 00:00:00 2001 From: Lei Zhu Date: Fri, 15 Apr 2022 13:44:24 +0800 Subject: [PATCH 1/7] Enable hls-stylish-haskell-plugin on ghc-9.2 --- .../hls-stylish-haskell-plugin.cabal | 2 +- stack-9.2.yaml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal b/plugins/hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal index f89cf48af8..28d25087bb 100644 --- a/plugins/hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal +++ b/plugins/hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal @@ -27,7 +27,7 @@ library , ghcide ^>=1.6 , hls-plugin-api ^>=1.3 , lsp-types - , stylish-haskell ^>=0.12 || ^>=0.13 + , stylish-haskell ^>=0.12 || ^>=0.13 || ^>=0.14 , text default-language: Haskell2010 diff --git a/stack-9.2.yaml b/stack-9.2.yaml index 36efddfd62..2186c173c3 100644 --- a/stack-9.2.yaml +++ b/stack-9.2.yaml @@ -22,7 +22,7 @@ packages: # - ./plugins/hls-splice-plugin # - ./plugins/hls-tactics-plugin # - ./plugins/hls-brittany-plugin -# - ./plugins/hls-stylish-haskell-plugin +- ./plugins/hls-stylish-haskell-plugin - ./plugins/hls-floskell-plugin - ./plugins/hls-fourmolu-plugin - ./plugins/hls-pragmas-plugin @@ -94,6 +94,8 @@ extra-deps: - unix-2.7.2.2 - Win32-2.12.0.1 +- stylish-haskell-0.14.1.0@sha256:cc11b0cb18e7378493dca325e2a1f7c06003fb3387cb28f1c1f8f22630a00cc4,4152 + # currently needed for ghcide>extra, etc. allow-newer: true @@ -120,7 +122,6 @@ flags: hlint: false retrie: false splice: false - stylishhaskell: false tactic: false retrie: From 2f15c2afef8305894c5a56705bd17849735eb58d Mon Sep 17 00:00:00 2001 From: Lei Zhu Date: Mon, 18 Apr 2022 18:49:25 +0800 Subject: [PATCH 2/7] Remove sha256 notation --- stack-9.2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack-9.2.yaml b/stack-9.2.yaml index 2186c173c3..c4025c1949 100644 --- a/stack-9.2.yaml +++ b/stack-9.2.yaml @@ -94,7 +94,7 @@ extra-deps: - unix-2.7.2.2 - Win32-2.12.0.1 -- stylish-haskell-0.14.1.0@sha256:cc11b0cb18e7378493dca325e2a1f7c06003fb3387cb28f1c1f8f22630a00cc4,4152 +- stylish-haskell-0.14.1.0 # currently needed for ghcide>extra, etc. allow-newer: true From 07ebb9598201b072e75f4a925cdcf478a582a623 Mon Sep 17 00:00:00 2001 From: Lei Zhu Date: Mon, 18 Apr 2022 20:16:30 +0800 Subject: [PATCH 3/7] Update project file --- cabal-ghc92.project | 6 ------ 1 file changed, 6 deletions(-) diff --git a/cabal-ghc92.project b/cabal-ghc92.project index 0bcf835755..089c0a0836 100644 --- a/cabal-ghc92.project +++ b/cabal-ghc92.project @@ -50,7 +50,6 @@ constraints: -hlint -retrie -splice - -stylishhaskell -tactic, allow-newer: @@ -74,11 +73,6 @@ allow-newer: -- https://github.com/lspitzner/butcher/pull/8 butcher:base, - stylish-haskell:ghc-lib-parser, - stylish-haskell:Cabal, - stylish-haskell:bytestring, - stylish-haskell:aeson, - ormolu:ghc-lib-parser, fourmolu:ghc-lib-parser, From fe37d98c4229a20d17426be97cb9beda81cb2ae6 Mon Sep 17 00:00:00 2001 From: Lei Zhu Date: Mon, 18 Apr 2022 20:17:04 +0800 Subject: [PATCH 4/7] Update nix file --- configuration-ghc-921.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/configuration-ghc-921.nix b/configuration-ghc-921.nix index fbb3bee780..d8660da1d9 100644 --- a/configuration-ghc-921.nix +++ b/configuration-ghc-921.nix @@ -4,7 +4,6 @@ let disabledPlugins = [ "hls-brittany-plugin" - "hls-stylish-haskell-plugin" "hls-hlint-plugin" "hls-haddock-comments-plugin" "hls-tactics-plugin" @@ -34,7 +33,6 @@ let hself.callCabal2nixWithOptions "haskell-language-server" ./. (pkgs.lib.concatStringsSep " " [ "-f-brittany" - "-f-stylishHaskell" "-f-hlint" "-f-haddockComments" "-f-tactics" From 9f70e759f9712a50ee3597952a138329d70ab80c Mon Sep 17 00:00:00 2001 From: Lei Zhu Date: Mon, 18 Apr 2022 20:18:12 +0800 Subject: [PATCH 5/7] Enable tests --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b525941d2c..43777bec95 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -190,7 +190,7 @@ jobs: name: Test hls-splice-plugin run: cabal test hls-splice-plugin --test-options="$TEST_OPTS" || cabal test hls-splice-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-splice-plugin --test-options="$TEST_OPTS" - - if: matrix.test && matrix.ghc != '9.0.1' && matrix.ghc != '9.0.2' && matrix.ghc != '9.2.2' + - if: matrix.test && matrix.ghc != '9.0.1' && matrix.ghc != '9.0.2' name: Test hls-stylish-haskell-plugin run: cabal test hls-stylish-haskell-plugin --test-options="$TEST_OPTS" || cabal test hls-stylish-haskell-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-stylish-haskell-plugin --test-options="$TEST_OPTS" From 30ae5802e8238bbbd005b0c88144731dbb2675be Mon Sep 17 00:00:00 2001 From: Lei Zhu Date: Tue, 19 Apr 2022 15:54:22 +0800 Subject: [PATCH 6/7] update index-state --- cabal-ghc92.project | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cabal-ghc92.project b/cabal-ghc92.project index 089c0a0836..305132547f 100644 --- a/cabal-ghc92.project +++ b/cabal-ghc92.project @@ -39,7 +39,7 @@ package * write-ghc-environment-files: never -index-state: 2022-03-08T10:53:01Z +index-state: 2022-04-19T07:18:40Z constraints: -- These plugins don't build/work on GHC92 yet From 9ef3dee0b2906aa5ca053a0a2fd45834fb589f70 Mon Sep 17 00:00:00 2001 From: Lei Zhu Date: Tue, 19 Apr 2022 19:50:26 +0800 Subject: [PATCH 7/7] Rerun ci