Use argsSettings instead of autoSettings

Author: cocreature

hie-apply-refact/Haskell/Ide/ApplyRefactPlugin.hs

@@ -4,6 +4,7 @@ module Haskell.Ide.ApplyRefactPlugin where
 
 import           Control.Arrow
 import           Control.Monad.IO.Class
+import           Control.Monad.Trans.Either
 import           Data.Aeson
 import qualified Data.Text as T
 import qualified Data.Text.IO as T
@@ -12,7 +13,7 @@ import           Haskell.Ide.Engine.MonadFunctions
 import           Haskell.Ide.Engine.PluginDescriptor
 import           Haskell.Ide.Engine.PluginUtils
 import           Haskell.Ide.Engine.SemanticTypes
-import           Language.Haskell.HLint3
+import           Language.Haskell.HLint3 as Hlint
 import           Refact.Apply
 import qualified Refact.Types as R
 import           Refact.Types hiding (SrcSpan)
@@ -78,19 +79,29 @@ applyAllCmd = CmdSync $ \_ctxs req -> do
 applyHint :: FilePath -> Maybe Pos -> IO (Either String HieDiff)
 applyHint file mpos = do
   withTempFile $ \f -> do
-    (flags,classify,hint) <- autoSettings
-    res <- parseModuleEx flags file Nothing
-    case res of
-      Left err  -> return $ Left (unlines [show $ parseErrorLocation err
-                                          ,parseErrorMessage err
-                                          ,parseErrorContents err])
-      Right mod -> do
-        let commands = map (show &&& ideaRefactoring) $ applyHints classify hint [mod]
-        logm $ "applyHint:commands=" ++ show commands
-        appliedFile <- applyRefactorings mpos commands file
-        diff <- makeDiffResult file (T.pack appliedFile)
-        logm $ "applyHint:diff=" ++ show diff
-        return $ Right diff
+  let optsf = "-o " ++ f
+      opts = case mpos of
+               Nothing -> optsf
+               Just (r,c) -> optsf ++ " --pos " ++ show r ++ "," ++ show c
+      hlintOpts = [file, "--quiet", "--refactor", "--refactor-options=" ++ opts ]
+  runEitherT $ do
+    ideas <- runHlint file hlintOpts
+    liftIO $ logm $ "applyHint:ideas=" ++ show ideas
+    let commands = map (show &&& ideaRefactoring) ideas
+    appliedFile <- liftIO $ applyRefactorings mpos commands file
+    diff <- liftIO $ makeDiffResult file (T.pack appliedFile)
+    liftIO $ logm $ "applyHint:diff=" ++ show diff
+    return diff
+
+
+runHlint :: FilePath -> [String] -> EitherT String IO [Idea]
+runHlint file args =
+  do (flags,classify,hint) <- liftIO $ argsSettings args
+     res <- bimapEitherT showParseError id $ EitherT $ parseModuleEx flags file Nothing
+     pure $ applyHints classify hint [res]
+
+showParseError :: Hlint.ParseError -> String
+showParseError (Hlint.ParseError loc message content) = unlines [show loc, message, content]
 
 makeDiffResult :: FilePath -> T.Text -> IO HieDiff
 makeDiffResult orig new = do