From 21b9c6baf870c8841fdec7159a6af37750f5cc03 Mon Sep 17 00:00:00 2001 From: George Thomas Date: Wed, 19 Apr 2023 13:01:46 +0100 Subject: [PATCH 1/6] Allow Fourmolu 0.12 --- plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal b/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal index 205dc27434..08b7cce61e 100644 --- a/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal +++ b/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal @@ -33,7 +33,7 @@ library build-depends: , base >=4.12 && <5 , filepath - , fourmolu ^>=0.3 || ^>=0.4 || ^>= 0.6 || ^>= 0.7 || ^>= 0.8 || ^>= 0.9 || ^>= 0.10 || ^>= 0.11 + , fourmolu ^>=0.3 || ^>=0.4 || ^>= 0.6 || ^>= 0.7 || ^>= 0.8 || ^>= 0.9 || ^>= 0.10 || ^>= 0.11 || ^>= 0.12 , ghc , ghc-boot-th , ghcide ^>= 1.9 || ^>= 1.10 From 9bb6bec30339ce465deba780dcd22dacdb3fda89 Mon Sep 17 00:00:00 2001 From: George Thomas Date: Wed, 19 Apr 2023 13:05:00 +0100 Subject: [PATCH 2/6] Bump index-state This allows us to pick up Fourmolu 0.12. --- cabal.project | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cabal.project b/cabal.project index 00bd552741..4ee7ec18d4 100644 --- a/cabal.project +++ b/cabal.project @@ -55,7 +55,7 @@ package * write-ghc-environment-files: never -index-state: 2023-03-30T00:00:00Z +index-state: 2023-04-19T12:00:00Z constraints: -- For GHC 9.4, older versions of entropy fail to build on Windows From 8179207f2c076c00fd7974e993c759d52de30343 Mon Sep 17 00:00:00 2001 From: Ian-Woo Kim Date: Mon, 3 Apr 2023 10:03:38 -0700 Subject: [PATCH 3/6] remove impl(ghc) constraints for hlint, fourmolu --- 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 cccc2529d5..f1a11634f4 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -267,7 +267,7 @@ common tactic cpp-options: -Dhls_tactic common hlint - if flag(hlint) && impl(ghc < 9.5) + if flag(hlint) build-depends: hls-hlint-plugin ^>= 1.1 cpp-options: -Dhls_hlint @@ -334,7 +334,7 @@ common floskell cpp-options: -Dhls_floskell common fourmolu - if flag(fourmolu) && impl(ghc < 9.5) + if flag(fourmolu) build-depends: hls-fourmolu-plugin ^>= 1.1 cpp-options: -Dhls_fourmolu From e1a77823ea2566981abcb638f9cb8cd4daf7afbf Mon Sep 17 00:00:00 2001 From: Ian-Woo Kim Date: Mon, 3 Apr 2023 10:28:44 -0700 Subject: [PATCH 4/6] lift up buildable: False for fourmolu and hlint --- plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal | 6 ++---- plugins/hls-hlint-plugin/hls-hlint-plugin.cabal | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal b/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal index 205dc27434..262b767509 100644 --- a/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal +++ b/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal @@ -23,8 +23,7 @@ source-repository head location: git://github.com/haskell/haskell-language-server.git library - if impl(ghc >= 9.5) - buildable: False + buildable: True exposed-modules: Ide.Plugin.Fourmolu , Ide.Plugin.Fourmolu.Shim @@ -49,8 +48,7 @@ library default-language: Haskell2010 test-suite tests - if impl(ghc >= 9.5) - buildable: False + buildable: True type: exitcode-stdio-1.0 default-language: Haskell2010 hs-source-dirs: test diff --git a/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal b/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal index 11e686cc5f..d7d2df5894 100644 --- a/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal +++ b/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal @@ -30,8 +30,7 @@ flag pedantic manual: True library - if impl(ghc >= 9.5) - buildable: False + buildable: True exposed-modules: Ide.Plugin.Hlint hs-source-dirs: src build-depends: @@ -78,8 +77,7 @@ library TypeOperators test-suite tests - if impl(ghc >= 9.5) - buildable: False + buildable: True type: exitcode-stdio-1.0 default-language: Haskell2010 hs-source-dirs: test From 4cb5b768abf2e3344d0a80da4fb1cff111781593 Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Wed, 19 Apr 2023 15:33:02 -0700 Subject: [PATCH 5/6] Support Fourmolu 0.12 --- plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal b/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal index 262b767509..b1e9c46908 100644 --- a/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal +++ b/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal @@ -32,7 +32,7 @@ library build-depends: , base >=4.12 && <5 , filepath - , fourmolu ^>=0.3 || ^>=0.4 || ^>= 0.6 || ^>= 0.7 || ^>= 0.8 || ^>= 0.9 || ^>= 0.10 || ^>= 0.11 + , fourmolu ^>=0.3 || ^>=0.4 || ^>= 0.6 || ^>= 0.7 || ^>= 0.8 || ^>= 0.9 || ^>= 0.10 || ^>= 0.11 || ^>= 0.12 , ghc , ghc-boot-th , ghcide ^>= 1.9 || ^>= 1.10 From f8f2f59e1d02f137caab1eadb9bf51d935ea4a23 Mon Sep 17 00:00:00 2001 From: George Thomas Date: Fri, 21 Apr 2023 20:48:20 +0100 Subject: [PATCH 6/6] Enable Fourmolu plugin on GHC 9.6 --- haskell-language-server.cabal | 2 +- plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index cccc2529d5..fe9a3e7144 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -334,7 +334,7 @@ common floskell cpp-options: -Dhls_floskell common fourmolu - if flag(fourmolu) && impl(ghc < 9.5) + if flag(fourmolu) build-depends: hls-fourmolu-plugin ^>= 1.1 cpp-options: -Dhls_fourmolu diff --git a/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal b/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal index 08b7cce61e..b1e9c46908 100644 --- a/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal +++ b/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal @@ -23,8 +23,7 @@ source-repository head location: git://github.com/haskell/haskell-language-server.git library - if impl(ghc >= 9.5) - buildable: False + buildable: True exposed-modules: Ide.Plugin.Fourmolu , Ide.Plugin.Fourmolu.Shim @@ -49,8 +48,7 @@ library default-language: Haskell2010 test-suite tests - if impl(ghc >= 9.5) - buildable: False + buildable: True type: exitcode-stdio-1.0 default-language: Haskell2010 hs-source-dirs: test