Use latest fourmolu

plugins/default/src/Ide/Plugin/Fourmolu.hs

@@ -3,6 +3,7 @@
 {-# LANGUAGE RecordWildCards     #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeApplications    #-}
+{-# LANGUAGE LambdaCase           #-}
 
 module Ide.Plugin.Fourmolu
   (
@@ -13,6 +14,7 @@ where
 
 import           Control.Exception
 import qualified Data.Text                         as T
+import           Data.Maybe                        (fromMaybe)
 import           Development.IDE                   as D
 import qualified DynFlags                          as D
 import qualified EnumSet                           as S
@@ -61,23 +63,39 @@ provider lf ideState typ contents fp _ = withIndefiniteProgress lf title Cancell
   let
     fullRegion = RegionIndices Nothing Nothing
     rangeRegion s e = RegionIndices (Just $ s + 1) (Just $ e + 1)
+
+    mkConf :: [DynOption] -> region -> IO (Config region)
     mkConf o region = do
-      printerOpts <- loadConfigFile True (Just fp') defaultPrinterOpts
-      return $ defaultConfig
+      printerOpts <- do
+        filePrinterOpts <-
+          loadConfigFile fp' >>= \case
+            ConfigLoaded _ po -> pure $ Just po
+            _ -> pure Nothing
+
+        pure $
+          fillMissingPrinterOpts
+            (fromMaybe mempty filePrinterOpts)
+            defaultPrinterOpts
+
+
+      pure $ defaultConfig
         { cfgDynOptions = o
         , cfgRegion = region
         , cfgDebug = True
         , cfgPrinterOpts = printerOpts
         }
+
     fmt :: T.Text -> Config RegionIndices -> IO (Either OrmoluException T.Text)
     fmt cont conf =
       try @OrmoluException (ormolu conf fp' $ T.unpack cont)
     fp' = fromNormalizedFilePath fp
 
+    formatRegion region = ret <$> (fmt contents =<< mkConf fileOpts region)
+
   case typ of
-    FormatText -> ret <$> (fmt contents =<< mkConf fileOpts fullRegion)
+    FormatText -> formatRegion fullRegion
     FormatRange (Range (Position sl _) (Position el _)) ->
-      ret <$> (fmt contents =<< mkConf fileOpts (rangeRegion sl el))
+      formatRegion $ rangeRegion sl el
  where
   title = T.pack $ "Formatting " <> takeFileName (fromNormalizedFilePath fp)
   ret :: Either OrmoluException T.Text -> Either ResponseError (List TextEdit)

stack-8.10.1.yaml

@@ -16,7 +16,8 @@ extra-deps:
 - clock-0.7.2
 - data-tree-print-0.1.0.2
 - floskell-0.10.4
-- fourmolu-0.1.0.0@rev:1
+- github: parsonsmatt/fourmolu
+  commit: 93ff2c108da8955fd6cf72d7cdc07696a72e9cfb
 - HsYAML-aeson-0.2.0.0@rev:2
 - monad-dijkstra-0.1.1.2
 - opentelemetry-0.4.2

stack-8.10.2.yaml

@@ -17,7 +17,8 @@ extra-deps:
 - clock-0.7.2
 - data-tree-print-0.1.0.2
 - floskell-0.10.4
-- fourmolu-0.1.0.0@rev:1
+- github: parsonsmatt/fourmolu
+  commit: 93ff2c108da8955fd6cf72d7cdc07696a72e9cfb
 - HsYAML-aeson-0.2.0.0@rev:2
 - monad-dijkstra-0.1.1.2
 - opentelemetry-0.4.2

stack-8.6.4.yaml

@@ -21,7 +21,8 @@ extra-deps:
 - clock-0.7.2
 - extra-1.7.3
 - floskell-0.10.4
-- fourmolu-0.1.0.0@rev:1
+- github: parsonsmatt/fourmolu
+  commit: 93ff2c108da8955fd6cf72d7cdc07696a72e9cfb
 - fuzzy-0.1.0.0
 # - ghcide-0.1.0
 - ghc-check-0.5.0.1

stack-8.6.5.yaml

@@ -20,7 +20,8 @@ extra-deps:
 - clock-0.7.2
 - extra-1.7.3
 - floskell-0.10.4
-- fourmolu-0.1.0.0@rev:1
+- github: parsonsmatt/fourmolu
+  commit: 93ff2c108da8955fd6cf72d7cdc07696a72e9cfb
 - fuzzy-0.1.0.0
 # - ghcide-0.1.0
 - ghc-check-0.5.0.1

stack-8.8.2.yaml

@@ -19,7 +19,8 @@ extra-deps:
 - constrained-dynamic-0.1.0.0
 - extra-1.7.3
 - floskell-0.10.4
-- fourmolu-0.1.0.0@rev:1
+- github: parsonsmatt/fourmolu
+  commit: 93ff2c108da8955fd6cf72d7cdc07696a72e9cfb
 # - ghcide-0.1.0
 - ghc-check-0.5.0.1
 - ghc-lib-parser-8.10.1.20200523

stack-8.8.3.yaml

@@ -19,7 +19,8 @@ extra-deps:
 - constrained-dynamic-0.1.0.0
 - extra-1.7.3
 - floskell-0.10.4
-- fourmolu-0.1.0.0@rev:1
+- github: parsonsmatt/fourmolu
+  commit: 93ff2c108da8955fd6cf72d7cdc07696a72e9cfb
 # - ghcide-0.1.0
 - haskell-src-exts-1.21.1
 - hlint-2.2.8

stack-8.8.4.yaml

@@ -21,7 +21,8 @@ extra-deps:
 - constrained-dynamic-0.1.0.0
 - extra-1.7.3
 - floskell-0.10.4
-- fourmolu-0.1.0.0@rev:1
+- github: parsonsmatt/fourmolu
+  commit: 93ff2c108da8955fd6cf72d7cdc07696a72e9cfb
 # - ghcide-0.1.0
 - haskell-src-exts-1.21.1
 - hie-bios-0.7.1

stack.yaml

@@ -20,7 +20,8 @@ extra-deps:
 - clock-0.7.2
 - extra-1.7.3
 - floskell-0.10.4
-- fourmolu-0.1.0.0@rev:1
+- github: parsonsmatt/fourmolu
+  commit: 93ff2c108da8955fd6cf72d7cdc07696a72e9cfb
 - fuzzy-0.1.0.0
 # - ghcide-0.1.0
 - ghc-check-0.5.0.1