Clean up floskell plugin

Author: Ailrun

plugins/hls-floskell-plugin/hls-floskell-plugin.cabal

@@ -20,9 +20,9 @@ library
   exposed-modules:  Ide.Plugin.Floskell
   hs-source-dirs:   src
   build-depends:
-    , base            >=4.12     && <5
-    , floskell       ^>=0.10
-    , ghcide           >=1.2 && <1.4
+    , base            >=4.12 && <5
+    , floskell        ^>=0.10
+    , ghcide          >=1.2  && <1.4
     , hls-plugin-api  ^>=1.1
     , lsp-types
     , text
@@ -38,6 +38,6 @@ test-suite tests
   ghc-options:      -threaded -rtsopts -with-rtsopts=-N
   build-depends:
     , base
+    , filepath
     , hls-floskell-plugin
     , hls-test-utils       ^>=1.0
-    , text

plugins/hls-floskell-plugin/src/Ide/Plugin/Floskell.hs

@@ -1,18 +1,15 @@
-{-# LANGUAGE OverloadedStrings   #-}
-{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE OverloadedStrings #-}
 
 module Ide.Plugin.Floskell
-  (
-    descriptor
+  ( descriptor
   , provider
-  )
-where
+  ) where
 
 import           Control.Monad.IO.Class
 import qualified Data.Text               as T
 import qualified Data.Text.Lazy          as TL
 import qualified Data.Text.Lazy.Encoding as TL
-import           Development.IDE         as D hiding (pluginHandlers)
+import           Development.IDE         hiding (pluginHandlers)
 import           Floskell
 import           Ide.PluginUtils
 import           Ide.Types
@@ -37,10 +34,10 @@ provider _ideState typ contents fp _ = liftIO $ do
     let (range, selectedContents) = case typ of
           FormatText    -> (fullRange contents, contents)
           FormatRange r -> (r, extractRange r contents)
-        result = reformat config (Just file) (TL.encodeUtf8 (TL.fromStrict selectedContents))
+        result = reformat config (Just file) . TL.encodeUtf8 $ TL.fromStrict selectedContents
     case result of
-      Left  err -> return $ Left $ responseError (T.pack $  "floskellCmd: " ++ err)
-      Right new -> return $ Right $ List [TextEdit range . TL.toStrict $ TL.decodeUtf8 new]
+      Left  err -> pure $ Left $ responseError $ T.pack $ "floskellCmd: " ++ err
+      Right new -> pure $ Right $ List [TextEdit range . TL.toStrict $ TL.decodeUtf8 new]
 
 -- | Find Floskell Config, user and system wide or provides a default style.
 -- Every directory of the filepath will be searched to find a user configuration.
@@ -53,6 +50,6 @@ findConfigOrDefault file = do
     Just confFile -> readAppConfig confFile
     Nothing ->
       let gibiansky = head (filter (\s -> styleName s == "gibiansky") styles)
-      in return $ defaultAppConfig { appStyle = gibiansky }
+      in pure $ defaultAppConfig { appStyle = gibiansky }
 
 -- ---------------------------------------------------------------------

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

@@ -1,27 +1,30 @@
 {-# LANGUAGE OverloadedStrings #-}
-module Main(main) where
+module Main
+  ( main
+  ) where
 
-import qualified Data.Text.Lazy          as TL
-import qualified Data.Text.Lazy.Encoding as TL
-import qualified Ide.Plugin.Floskell     as Floskell
+import qualified Ide.Plugin.Floskell as Floskell
+import           System.FilePath
 import           Test.Hls
 
 main :: IO ()
 main = defaultTestRunner tests
 
-plugin :: PluginDescriptor IdeState
-plugin = Floskell.descriptor "floskell"
+floskellPlugin :: PluginDescriptor IdeState
+floskellPlugin = Floskell.descriptor "floskell"
 
 tests :: TestTree
 tests = testGroup "floskell"
-  [ goldenGitDiff "formats a document" "test/testdata/Floskell.formatted_document.hs" $ runSessionWithServerFormatter plugin "floskell" "test/testdata" $ do
-        doc <- openDoc "Floskell.hs" "haskell"
-        formatDoc doc (FormattingOptions 4 True Nothing Nothing Nothing)
-        TL.encodeUtf8 . TL.fromStrict <$> documentContents doc
+  [ goldenWithFloskell "formats a document" "Floskell" "formatted_document" $ \doc -> do
+      formatDoc doc (FormattingOptions 4 True Nothing Nothing Nothing)
 
-  , goldenGitDiff "formats a range" "test/testdata/Floskell.formatted_range.hs" $ runSessionWithServerFormatter plugin "floskell" "test/testdata" $ do
-      doc <- openDoc "Floskell.hs" "haskell"
+  , goldenWithFloskell "formats a range" "Floskell" "formatted_range" $ \doc -> do
       let range = Range (Position 1 0) (Position 4 22)
       formatRange doc (FormattingOptions 4 True Nothing Nothing Nothing) range
-      TL.encodeUtf8 . TL.fromStrict <$> documentContents doc
   ]
+
+goldenWithFloskell :: TestName -> FilePath -> FilePath -> (TextDocumentIdentifier -> Session ()) -> TestTree
+goldenWithFloskell title path desc = goldenWithHaskellDoc floskellPlugin title testDataDir path desc "hs"
+
+testDataDir :: FilePath
+testDataDir = "test" </> "testdata"

plugins/hls-floskell-plugin/test/testdata/hie.yaml

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