Merge branch 'master' into dependabot/github_actions/fkirc/skip-duplicate-actions-5.3.1

Author: mergify[bot]

plugins/hls-fourmolu-plugin/src/Ide/Plugin/Fourmolu.hs

@@ -1,29 +1,26 @@
-{-# LANGUAGE CPP #-}
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE DisambiguateRecordFields #-}
-{-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE OverloadedLabels #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RecordWildCards #-}
-{-# LANGUAGE TypeApplications #-}
-{-# LANGUAGE TypeOperators #-}
+{-# LANGUAGE CPP #-}
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE LambdaCase #-}
+{-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE OverloadedLabels #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE TypeApplications #-}
+{-# LANGUAGE TypeOperators #-}
 
 module Ide.Plugin.Fourmolu (
  descriptor,
  provider,
  LogEvent,
 ) where
 
-import Control.Exception (IOException, handle, try)
+import Control.Exception
 import Control.Lens ((^.))
 import Control.Monad (guard)
 import Control.Monad.Error.Class (MonadError (throwError))
-import Control.Monad.Trans.Except (ExceptT (..), mapExceptT,
- runExceptT)
-
 import Control.Monad.IO.Class (MonadIO (liftIO))
 import Control.Monad.Trans.Class (MonadTrans (lift))
+import Control.Monad.Trans.Except (ExceptT (..), runExceptT)
 import Data.Bifunctor (bimap)
 import Data.List (intercalate)
 import Data.Maybe (catMaybes)
@@ -96,6 +93,9 @@ provider recorder plId ideState typ contents fp fo = ExceptT $ withIndefinitePro
  errorMessage = "Failed to load " <> T.pack f <> ": " <> T.pack (show err)
 
  let config =
+#if MIN_VERSION_fourmolu(0,13,0)
+ refineConfig ModuleSource Nothing Nothing Nothing
+#endif
  defaultConfig
  { cfgDynOptions = map DynOption fileOpts
  , cfgFixityOverrides = cfgFileFixities

plugins/hls-fourmolu-plugin/test/Main.hs

@@ -4,6 +4,7 @@ module Main
  ) where
 
 import Data.Aeson
+import qualified Data.Aeson.KeyMap as KM
 import Data.Functor
 import Ide.Plugin.Config
 import qualified Ide.Plugin.Fourmolu as Fourmolu
@@ -28,12 +29,14 @@ tests =
  formatDoc doc (FormattingOptions 4 True Nothing Nothing Nothing)
  , goldenWithFourmolu cli "formats imports correctly" "Fourmolu2" "formatted" $ \doc -> do
  formatDoc doc (FormattingOptions 4 True Nothing Nothing Nothing)
+ , goldenWithFourmolu cli "uses correct operator fixities" "Fourmolu3" "formatted" $ \doc -> do
+ formatDoc doc (FormattingOptions 4 True Nothing Nothing Nothing)
  ]
 
 goldenWithFourmolu :: Bool -> TestName -> FilePath -> FilePath -> (TextDocumentIdentifier -> Session ()) -> TestTree
 goldenWithFourmolu cli title path desc = goldenWithHaskellDocFormatter def fourmoluPlugin "fourmolu" conf title testDataDir path desc "hs"
  where
- conf = def{plcConfig = (\(Object obj) -> obj) $ object ["external" .= cli]}
+ conf = def{plcConfig = KM.fromList ["external" .= cli]}
 
 testDataDir :: FilePath
 testDataDir = "test" </> "testdata"

plugins/hls-fourmolu-plugin/test/testdata/Fourmolu3.formatted.hs

@@ -0,0 +1,7 @@
+b :: Bool
+b =
+ id $
+ id $
+ case True && True of
+ True -> True
+ False -> False

plugins/hls-fourmolu-plugin/test/testdata/Fourmolu3.hs

@@ -0,0 +1,6 @@
+b :: Bool
+b =
+ id $ id $
+ case True && True of
+ True -> True
+ False -> False