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 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) ]