From d92e3d99ec206bd78832251283a62b7e05d80cbb Mon Sep 17 00:00:00 2001 From: Nathan Maxson Date: Thu, 15 Jun 2023 00:37:12 +0300 Subject: [PATCH 1/3] Revert "Support fourmolu 0.13.0.0 (#3631)" This reverts commit c126332850d27abc8efa519f8437ff7ea28d4049. --- 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 ef7fe6d2dc..e60d6702f2 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 || ^>= 0.12 || ^>= 0.13 + , fourmolu ^>=0.3 || ^>=0.4 || ^>= 0.6 || ^>= 0.7 || ^>= 0.8 || ^>= 0.9 || ^>= 0.10 || ^>= 0.11 || ^>= 0.12 , ghc , ghc-boot-th , ghcide == 2.0.0.0 From adb6a5a83a0015a57b60576a10144b8f1089db4c Mon Sep 17 00:00:00 2001 From: Brandon Chinn Date: Wed, 14 Jun 2023 19:23:41 -0700 Subject: [PATCH 2/3] Support fourmolu 0.13 --- .../hls-fourmolu-plugin.cabal | 2 +- .../src/Ide/Plugin/Fourmolu/Shim.hs | 21 ++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal b/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal index e60d6702f2..ef7fe6d2dc 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 || ^>= 0.12 + , fourmolu ^>=0.3 || ^>=0.4 || ^>= 0.6 || ^>= 0.7 || ^>= 0.8 || ^>= 0.9 || ^>= 0.10 || ^>= 0.11 || ^>= 0.12 || ^>= 0.13 , ghc , ghc-boot-th , ghcide == 2.0.0.0 diff --git a/plugins/hls-fourmolu-plugin/src/Ide/Plugin/Fourmolu/Shim.hs b/plugins/hls-fourmolu-plugin/src/Ide/Plugin/Fourmolu/Shim.hs index fcb6099ad8..a97327cd7e 100644 --- a/plugins/hls-fourmolu-plugin/src/Ide/Plugin/Fourmolu/Shim.hs +++ b/plugins/hls-fourmolu-plugin/src/Ide/Plugin/Fourmolu/Shim.hs @@ -21,13 +21,15 @@ import Ormolu.Fixity {-- Backport FourmoluConfig --} -#if !MIN_VERSION_fourmolu(0,7,0) +#if MIN_VERSION_fourmolu(0,7,0) +-- these functions are now defined +#else type FourmoluConfig = PrinterOptsPartial cfgFilePrinterOpts :: FourmoluConfig -> PrinterOptsPartial cfgFilePrinterOpts = id -cfgFileFixities :: FourmoluConfig -> FixityMap +cfgFileFixities :: FourmoluConfig -> FixityOverrides cfgFileFixities _ = mempty #endif @@ -45,15 +47,20 @@ emptyConfig :: FourmoluConfig emptyConfig = mempty #endif -{-- Backport FixityMap --} +{-- Backport FixityOverrides --} -#if MIN_VERSION_fourmolu(0,7,0) -addFixityOverrides :: FixityMap -> Config region -> Config region +#if MIN_VERSION_fourmolu(0,13,0) +addFixityOverrides :: FixityOverrides -> Config region -> Config region +addFixityOverrides fixities cfg = cfg{cfgFixityOverrides = fixities} +#elif MIN_VERSION_fourmolu(0,7,0) +type FixityOverrides = FixityMap + +addFixityOverrides :: FixityOverrides -> Config region -> Config region addFixityOverrides fixities cfg = cfg{cfgFixityOverrides = fixities} #else -type FixityMap = () +type FixityOverrides = () -addFixityOverrides :: FixityMap -> Config region -> Config region +addFixityOverrides :: FixityOverrides -> Config region -> Config region addFixityOverrides _ = id #endif From 81fec64338d9da21b2436ffa0cd0803ad865e30a Mon Sep 17 00:00:00 2001 From: Brandon Chinn Date: Wed, 14 Jun 2023 20:07:26 -0700 Subject: [PATCH 3/3] Fix test --- plugins/hls-fourmolu-plugin/test/Main.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hls-fourmolu-plugin/test/Main.hs b/plugins/hls-fourmolu-plugin/test/Main.hs index 056003cc7e..fea8e86427 100644 --- a/plugins/hls-fourmolu-plugin/test/Main.hs +++ b/plugins/hls-fourmolu-plugin/test/Main.hs @@ -26,7 +26,7 @@ tests = (if cli then "cli" else "lib") [ goldenWithFourmolu cli "formats correctly" "Fourmolu" "formatted" $ \doc -> do formatDoc doc (FormattingOptions 4 True Nothing Nothing Nothing) - , goldenWithFourmolu cli "formats imports correctly" "Fourmolu" "formatted" $ \doc -> do + , goldenWithFourmolu cli "formats imports correctly" "Fourmolu2" "formatted" $ \doc -> do formatDoc doc (FormattingOptions 4 True Nothing Nothing Nothing) ]