diff --git a/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal b/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal index c1b4ed1974d..aec7882f28e 100644 --- a/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal +++ b/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal @@ -26,13 +26,12 @@ library buildable: True exposed-modules: Ide.Plugin.Fourmolu - , Ide.Plugin.Fourmolu.Shim hs-source-dirs: src ghc-options: -Wall 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.9 || ^>= 0.10 || ^>= 0.11 || ^>= 0.12 || ^>= 0.13 , ghc , ghc-boot-th , ghcide == 2.1.0.0 diff --git a/plugins/hls-fourmolu-plugin/src/Ide/Plugin/Fourmolu.hs b/plugins/hls-fourmolu-plugin/src/Ide/Plugin/Fourmolu.hs index 3ae5baf1bc5..7ee11784656 100644 --- a/plugins/hls-fourmolu-plugin/src/Ide/Plugin/Fourmolu.hs +++ b/plugins/hls-fourmolu-plugin/src/Ide/Plugin/Fourmolu.hs @@ -34,7 +34,6 @@ import Development.IDE.GHC.Compat as Compat hiding (Cpp, Warning, import qualified Development.IDE.GHC.Compat.Util as S import GHC.LanguageExtensions.Type (Extension (Cpp)) import Ide.Plugin.Error -import Ide.Plugin.Fourmolu.Shim import Ide.Plugin.Properties import Ide.PluginUtils (makeDiffTextEdit) import Ide.Types @@ -43,6 +42,7 @@ import Language.LSP.Protocol.Message import Language.LSP.Protocol.Types import Language.LSP.Server hiding (defaultConfig) import Ormolu +import Ormolu.Config import System.Exit import System.FilePath import System.Process.Run (cwd, proc) @@ -87,9 +87,9 @@ provider recorder plId ideState typ contents fp fo = ExceptT $ withIndefinitePro where printerOpts = cfgFilePrinterOpts fourmoluConfig config = - addFixityOverrides (cfgFileFixities fourmoluConfig) $ defaultConfig { cfgDynOptions = map DynOption fileOpts + , cfgFixityOverrides = cfgFileFixities fourmoluConfig , cfgRegion = region , cfgDebug = False , cfgPrinterOpts = @@ -112,7 +112,7 @@ provider recorder plId ideState typ contents fp fo = ExceptT $ withIndefinitePro } throwError $ PluginInternalError errorMessage where - errorMessage = "Failed to load " <> T.pack f <> ": " <> T.pack (showParseError err) + errorMessage = "Failed to load " <> T.pack f <> ": " <> T.pack (show err) where fp' = fromNormalizedFilePath fp title = "Formatting " <> T.pack (takeFileName fp') diff --git a/plugins/hls-fourmolu-plugin/src/Ide/Plugin/Fourmolu/Shim.hs b/plugins/hls-fourmolu-plugin/src/Ide/Plugin/Fourmolu/Shim.hs deleted file mode 100644 index a97327cd7ed..00000000000 --- a/plugins/hls-fourmolu-plugin/src/Ide/Plugin/Fourmolu/Shim.hs +++ /dev/null @@ -1,75 +0,0 @@ -{-# LANGUAGE CPP #-} - -module Ide.Plugin.Fourmolu.Shim ( - -- * FourmoluConfig - cfgFilePrinterOpts, - cfgFileFixities, - emptyConfig, - - -- * FixityMap - addFixityOverrides, - - -- * ConfigParseError - showParseError, -) where - -import Ormolu.Config - -#if MIN_VERSION_fourmolu(0,7,0) -import Ormolu.Fixity -#endif - -{-- Backport FourmoluConfig --} - -#if MIN_VERSION_fourmolu(0,7,0) --- these functions are now defined -#else -type FourmoluConfig = PrinterOptsPartial - -cfgFilePrinterOpts :: FourmoluConfig -> PrinterOptsPartial -cfgFilePrinterOpts = id - -cfgFileFixities :: FourmoluConfig -> FixityOverrides -cfgFileFixities _ = mempty -#endif - -#if MIN_VERSION_fourmolu(0,8,1) --- emptyConfig now provided -#elif MIN_VERSION_fourmolu(0,7,0) -emptyConfig :: FourmoluConfig -emptyConfig = - FourmoluConfig - { cfgFilePrinterOpts = mempty - , cfgFileFixities = mempty - } -#else -emptyConfig :: FourmoluConfig -emptyConfig = mempty -#endif - -{-- Backport FixityOverrides --} - -#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 FixityOverrides = () - -addFixityOverrides :: FixityOverrides -> Config region -> Config region -addFixityOverrides _ = id -#endif - -{-- Backport ConfigParseError --} - -#if MIN_VERSION_fourmolu(0,7,0) -showParseError :: Show parseException => parseException -> String -showParseError = show -#else -showParseError :: (pos, String) -> String -showParseError = snd -#endif