Clean up fourmolu plugin

Author: Ailrun

plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal

@@ -20,17 +20,15 @@ library
   exposed-modules:  Ide.Plugin.Fourmolu
   hs-source-dirs:   src
   build-depends:
-    , base            >=4.12     && <5
-    , extra
-    , fourmolu        ^>=0.3
+    , base            >=4.12 && <5
     , filepath
+    , fourmolu        ^>=0.3
     , ghc
     , ghc-boot-th
-    , ghcide           >=1.2 && <1.4
+    , ghcide          >=1.2  && <1.4
     , hls-plugin-api  ^>=1.1
     , lens
     , lsp
-    , lsp-types
     , text
 
   default-language: Haskell2010
@@ -43,18 +41,7 @@ test-suite tests
   ghc-options:      -threaded -rtsopts -with-rtsopts=-N
   build-depends:
     , base
-    , bytestring
-    , hls-fourmolu-plugin
-    , text
-    , data-default
-    , hspec-expectations
-    , lens
-    , ghcide
     , filepath
-    , hls-test-utils ^>= 1.0
-    , lsp-types
-    , aeson
-    , hls-plugin-api
+    , hls-fourmolu-plugin
+    , hls-test-utils        ^>=1.0
     , lsp-test
-    , containers
-    , unordered-containers

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

@@ -9,26 +9,24 @@ module Ide.Plugin.Fourmolu (
     provider,
 ) where
 
-import           Control.Exception
-import           Data.Either.Extra
-import           System.FilePath
-
+import           Control.Exception           (try)
 import           Control.Lens                ((^.))
+import           Control.Monad.IO.Class
+import           Data.Bifunctor              (first)
 import qualified Data.Text                   as T
-import           Development.IDE             as D hiding (pluginHandlers)
+import           Development.IDE             hiding (pluginHandlers)
+import           Development.IDE.GHC.Compat  (moduleNameString)
 import qualified DynFlags                    as D
 import qualified EnumSet                     as S
-import           GHC                         (DynFlags, moduleNameString)
 import           GHC.LanguageExtensions.Type (Extension (Cpp))
 import           GhcPlugins                  (HscEnv (hsc_dflags))
 import           Ide.PluginUtils             (makeDiffTextEdit)
-
-import           Control.Monad.IO.Class
 import           Ide.Types
 import           Language.LSP.Server         hiding (defaultConfig)
 import           Language.LSP.Types
 import           Language.LSP.Types.Lens
 import           "fourmolu" Ormolu
+import           System.FilePath
 
 -- ---------------------------------------------------------------------
 
@@ -48,7 +46,7 @@ provider ideState typ contents fp fo = withIndefiniteProgress title Cancellable
         Just df -> liftIO $ convertDynFlags df
 
     let format printerOpts =
-            mapLeft (responseError . ("Fourmolu: " <>) . T.pack . show)
+            first (responseError . ("Fourmolu: " <>) . T.pack . show)
                 <$> try @OrmoluException (makeDiffTextEdit contents <$> ormolu config fp' (T.unpack contents))
           where
             config =
@@ -91,7 +89,7 @@ provider ideState typ contents fp fo = withIndefiniteProgress title Cancellable
         FormatRange (Range (Position sl _) (Position el _)) ->
             RegionIndices (Just $ sl + 1) (Just $ el + 1)
 
-convertDynFlags :: DynFlags -> IO [DynOption]
+convertDynFlags :: D.DynFlags -> IO [DynOption]
 convertDynFlags df =
     let pp = ["-pgmF=" <> p | not (null p)]
         p = D.sPgm_F $ D.settings df

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

@@ -1,36 +1,30 @@
 {-# LANGUAGE OverloadedStrings #-}
-module Main(main) where
+module Main
+  ( main
+  ) where
 
-import           Control.Monad.IO.Class
-import           Data.Aeson
-import qualified Data.ByteString.Lazy         as BS
-import qualified Data.Text.Encoding           as T
-import qualified Data.Text.IO                 as T
+import qualified Ide.Plugin.Fourmolu as Fourmolu
 import           Language.LSP.Test
 import           Language.LSP.Types
-import           Test.Hls
-import qualified Ide.Plugin.Fourmolu  as Fourmolu
 import           System.FilePath
+import           Test.Hls
 
 main :: IO ()
 main = defaultTestRunner tests
 
-plugin :: PluginDescriptor IdeState
-plugin = Fourmolu.descriptor "fourmolu"
-
-testDataDir :: FilePath
-testDataDir = "test/testdata/"
+fourmoluPlugin :: PluginDescriptor IdeState
+fourmoluPlugin = Fourmolu.descriptor "fourmolu"
 
 tests :: TestTree
 tests = testGroup "fourmolu"
-  [ goldenGitDiff "formats correctly" (testDataDir </> "Format.fourmolu.formatted.hs") $
-    runSessionWithServerFormatter plugin "fourmolu" testDataDir $ do
-        doc <- openDoc "Format.hs" "haskell"
-        formatDoc doc (FormattingOptions 4 True Nothing Nothing Nothing)
-        BS.fromStrict . T.encodeUtf8 <$> documentContents doc
-  , goldenGitDiff "formats imports correctly" (testDataDir </> "Format2.fourmolu.formatted.hs") $
-    runSessionWithServerFormatter plugin "fourmolu" testDataDir $ do
-        doc <- openDoc "Format2.hs" "haskell"
-        formatDoc doc (FormattingOptions 4 True Nothing Nothing Nothing)
-        BS.fromStrict . T.encodeUtf8 <$> documentContents doc
+  [ goldenWithFourmolu "formats correctly" "Fourmolu" "formatted" $ \doc -> do
+      formatDoc doc (FormattingOptions 4 True Nothing Nothing Nothing)
+  , goldenWithFourmolu "formats imports correctly" "Fourmolu" "formatted" $ \doc -> do
+      formatDoc doc (FormattingOptions 4 True Nothing Nothing Nothing)
   ]
+
+goldenWithFourmolu :: TestName -> FilePath -> FilePath -> (TextDocumentIdentifier -> Session ()) -> TestTree
+goldenWithFourmolu title path desc = goldenWithHaskellDoc fourmoluPlugin title testDataDir path desc "hs"
+
+testDataDir :: FilePath
+testDataDir = "test" </> "testdata"

plugins/hls-fourmolu-plugin/test/testdata/Format.fourmolu.formatted.hs renamed to plugins/hls-fourmolu-plugin/test/testdata/Fourmolu.formatted.hs

@@ -1,4 +1,4 @@
-module    Format where
+module    Fourmolu where
 import Data.List
 
 import Prelude

plugins/hls-fourmolu-plugin/test/testdata/Format.hs renamed to plugins/hls-fourmolu-plugin/test/testdata/Fourmolu.hs

@@ -0,0 +1,2 @@
+cradle:
+  direct: