unqualify refactoring templates

ndmitchell · Apr 15, 2020 · e70057a · e70057a
1 parent 1ffea9c
commit e70057a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/data/hlint.yaml b/data/hlint.yaml
@@ -1137,8 +1137,7 @@
 # import qualified Control.Monad \
 # yes = flip mapM -- Control.Monad.forM
 # import qualified Control.Monad as CM \
-# yes = flip mapM -- CM.forM @NoRefactor hlint bug: expected CM.forM, actual Control.Monad.forM
-# @NoRefactor hlint bug: expected CM.forM, actual Control.Monad.forM \
+# yes = flip mapM -- CM.forM
 # import qualified Control.Monad as CM(forM,filterM) \
 # yes = flip mapM -- CM.forM
 # import Control.Monad as CM(forM,filterM) \
@@ -1153,7 +1152,7 @@
 # main = A.id (stringValue id')
 # import Prelude((==)) \
 # import qualified Prelude as P \
-# main = P.length xs == 0 -- P.null xs @NoRefactor hlint bug: null xs (missing "P.")
+# main = P.length xs == 0 -- P.null xs
 # main = hello .~ Just 12 -- hello ?~ 12
 # foo = liftIO $ window `on` deleteEvent $ do a; b
 # no = sort <$> f input `shouldBe` sort <$> x

diff --git a/src/Hint/Match.hs b/src/Hint/Match.hs
@@ -142,7 +142,7 @@ matchIdea' sb declName HintRule{..} parent x = do
       (e, tpl) = substitute' u rhs'
       noParens = [varToStr $ fromParen' x | L _ (HsApp _ (varToStr -> "_noParen_") x) <- universe tpl]
 
-  tpl <- pure (performSpecial' tpl)
+  tpl <- pure $ unqualify' sa sb (performSpecial' tpl)
   u <- pure (removeParens noParens u)
 
   let res = addBracketTy' (addBracket' parent $ performSpecial' $ fst $ substitute' u $ unqualify' sa sb rhs')