Clean up refine imports plugin

Author: Ailrun

plugins/hls-refine-imports-plugin/hls-refine-imports-plugin.cabal

@@ -1,36 +1,36 @@
-cabal-version: 2.2
-name:          hls-refine-imports-plugin
-version:       1.0.0.0
-synopsis:      Refine imports plugin for Haskell Language Server
-license:       Apache-2.0
-license-file:  LICENSE
-author:        rayshih
-maintainer:    mnf.shih@gmail.com
-category:      Development
-build-type:    Simple
-extra-source-files:
-  LICENSE
+cabal-version:      2.2
+name:               hls-refine-imports-plugin
+version:            1.0.0.0
+synopsis:           Refine imports plugin for Haskell Language Server
+license:            Apache-2.0
+license-file:       LICENSE
+author:             rayshih
+maintainer:         mnf.shih@gmail.com
+category:           Development
+build-type:         Simple
+extra-source-files: LICENSE
 
 library
-  exposed-modules:  Ide.Plugin.RefineImports
-  hs-source-dirs:   src
+  exposed-modules:    Ide.Plugin.RefineImports
+  hs-source-dirs:     src
   build-depends:
     , aeson
-    , base        >=4.12 && <5
+    , base                         >=4.12    && <5
     , containers
     , deepseq
     , ghc
-    , ghcide                ^>=1.3
-    , hls-plugin-api        ^>=1.1
-    , lsp
-    , lsp-types
+    , ghcide                       ^>=1.3
+    , hls-explicit-imports-plugin  ^>=1.0.0.1
     , hls-graph
+    , hls-plugin-api               ^>=1.1
+    , lsp
     , text
     , unordered-containers
-    , hls-explicit-imports-plugin ^>= 1.0.0.1
 
-  default-language: Haskell2010
-  default-extensions: DataKinds, TypeOperators
+  default-language:   Haskell2010
+  default-extensions:
+    DataKinds
+    TypeOperators
 
 test-suite tests
   type:             exitcode-stdio-1.0
@@ -40,7 +40,6 @@ test-suite tests
   ghc-options:      -threaded -rtsopts -with-rtsopts=-N
   build-depends:
     , base
-    , bytestring
     , filepath
     , hls-refine-imports-plugin
     , hls-test-utils

plugins/hls-refine-imports-plugin/test/Main.hs

@@ -4,13 +4,13 @@
 {-# LANGUAGE TypeOperators            #-}
 {-# LANGUAGE ViewPatterns             #-}
 
-module Main (main) where
+module Main
+  ( main
+  ) where
 
-import qualified Data.ByteString.Lazy     as LBS
 import           Data.Foldable            (find, forM_)
 import           Data.Text                (Text)
 import qualified Data.Text                as T
-import           Data.Text.Encoding       (encodeUtf8)
 import qualified Ide.Plugin.RefineImports as RefineImports
 import           System.FilePath          ((<.>), (</>))
 import           Test.Hls
@@ -23,24 +23,17 @@ main = defaultTestRunner $
     , codeLensGoldenTest "UsualCase" 1
     ]
 
-plugin :: PluginDescriptor IdeState
-plugin = RefineImports.descriptor "refineImports"
+refineImportsPlugin :: PluginDescriptor IdeState
+refineImportsPlugin = RefineImports.descriptor "refineImports"
 
 -- code action tests
 
 codeActionGoldenTest :: FilePath -> Int -> Int -> TestTree
-codeActionGoldenTest fp l c = goldenGitDiff (fp <> " (golden)") goldenFilePath $
-  runSessionWithServer plugin testDataDir $ do
-    doc <- openDoc hsFilePath "haskell"
-    actions <- getCodeActions doc (pointRange l c)
-    case find ((== Just "Refine all imports") . caTitle) actions of
-      Just (InR x) -> do
-        executeCodeAction x
-        LBS.fromStrict . encodeUtf8 <$> documentContents doc
-      _ -> liftIO $ assertFailure "Unable to find CodeAction"
-  where
-    hsFilePath = fp <.> "hs"
-    goldenFilePath = testDataDir </> fp <.> "expected" <.> "hs"
+codeActionGoldenTest fp l c = goldenWithRefineImports fp $ \doc -> do
+  actions <- getCodeActions doc (pointRange l c)
+  case find ((== Just "Refine all imports") . caTitle) actions of
+    Just (InR x) -> executeCodeAction x
+    _            -> liftIO $ assertFailure "Unable to find CodeAction"
 
 caTitle :: (Command |? CodeAction) -> Maybe Text
 caTitle (InR CodeAction {_title}) = Just _title
@@ -50,16 +43,10 @@ caTitle _                         = Nothing
 -- code lens tests
 
 codeLensGoldenTest :: FilePath -> Int -> TestTree
-codeLensGoldenTest fp codeLensIdx = goldenGitDiff (fp <> " (golden)") goldenFilePath $
-  runSessionWithServer plugin testDataDir $ do
-    doc <- openDoc hsFilePath "haskell"
-    codeLens <- (!! codeLensIdx) <$> getCodeLensesBy isRefineImports doc
-    mapM_ executeCmd
-      [c | CodeLens{_command = Just c} <- [codeLens]]
-    LBS.fromStrict . encodeUtf8 <$> documentContents doc
-  where
-    hsFilePath = fp <.> "hs"
-    goldenFilePath = testDataDir </> fp <.> "expected" <.> "hs"
+codeLensGoldenTest fp codeLensIdx = goldenWithRefineImports fp $ \doc -> do
+  codeLens <- (!! codeLensIdx) <$> getCodeLensesBy isRefineImports doc
+  mapM_ executeCmd
+    [c | CodeLens{_command = Just c} <- [codeLens]]
 
 getCodeLensesBy :: (CodeLens -> Bool) -> TextDocumentIdentifier -> Session [CodeLens]
 getCodeLensesBy f doc = filter f <$> getCodeLenses doc
@@ -79,6 +66,9 @@ executeCmd cmd = do
 
 -- helpers
 
+goldenWithRefineImports :: FilePath -> (TextDocumentIdentifier -> Session ()) -> TestTree
+goldenWithRefineImports fp = goldenWithHaskellDoc refineImportsPlugin (fp <> " (golden)") testDataDir fp "expected" "hs"
+
 testDataDir :: String
 testDataDir = "test" </> "testdata"