Update to use current hlint master

Author: alanz

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

@@ -85,27 +85,33 @@ applyHint file mpos = do
       opts = case mpos of
         Nothing -> optsf
         Just (r,c) -> optsf ++ " --pos " ++ show r ++ "," ++ show c
-    -- let hlintOpts = [file, "--quiet", "--refactor", "--refactor-options=" ++ opts ]
-    let hlintOpts = [file, "--quiet" ]
+    let hlintOpts = [file, "--quiet", "--refactor", "--refactor-options=" ++ opts ]
+    -- let hlintOpts = [file, "--quiet" ]
     logm $ "applyHint=" ++ show hlintOpts
-    res <- catchException $ hlint hlintOpts
+    res <- catchException $ runHlint file hlintOpts
     logm $ "applyHint:res=" ++ show res
     -- res <- hlint hlintOpts
     case res of
       Left x  -> return $ Left (show x)
       Right x -> do
-        let commands = makeApplyRefact x
+        let commands = makeApplyRefactFromIdeas x
         logm $ "applyHint:commands=" ++ show commands
         appliedFile <- applyRefactorings mpos commands file
         diff <- makeDiffResult file (T.pack appliedFile)
         logm $ "applyHint:diff=" ++ show diff
         return $ Right diff
 
+runHlint :: FilePath -> [String] -> IO [Idea]
+runHlint fileName args = do
+    (flags, classify, hint) <- argsSettings args
+    Right m <- parseModuleEx flags fileName Nothing
+    return $ applyHints classify hint [m]
+
 -- ---------------------------------------------------------------------
 
-makeApplyRefact :: [Suggestion] -> [(String, [Refactoring R.SrcSpan])]
-makeApplyRefact suggestions =
-  map (\(Suggestion i) -> (show i, ideaRefactoring i)) suggestions
+makeApplyRefactFromIdeas :: [Idea] -> [(String, [Refactoring R.SrcSpan])]
+makeApplyRefactFromIdeas ideas =
+  map (\i -> (show i, ideaRefactoring i)) ideas
 
 -- ---------------------------------------------------------------------
 

stack.yaml

@@ -18,8 +18,8 @@ packages:
     # commit: bff86be69f556f80a8dcd9dd42774ab77cb00eba
   extra-dep: true
 - location:
-    git: https://github.com/alanz/hlint.git
-    commit: e32f4d3cf32d15003e54d4f42afae7bf06b50168
+    git: https://github.com/ndmitchell/hlint.git
+    commit: 9799ad84b1eaaccb1cf926f71dcecaaf3fefc9c9
   extra-dep: true
 - location:
     git: https://github.com/alanz/apply-refact.git