#1058, weaken the self-definition check to match more things

ndmitchell · Jun 24, 2020 · 6282bd1 · 6282bd1
1 parent f8cbb55
commit 6282bd1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,5 +1,6 @@
 Changelog for HLint (* = breaking change)
 
+    #1058, weaken the self-definition check to match more things
     #1060, suggest [] ++ x and [] ++ x to x
 3.1.5, released 2020-06-19
     #1049, suggest or/and from True `elem` xs and False `notElem` xs

diff --git a/data/hlint.yaml b/data/hlint.yaml
@@ -1174,6 +1174,7 @@
 # issue1055 = map f ((sort . map g) xs)
 # issue1049 = True `elem` xs -- or xs
 # issue1049 = elem True -- or
+# issue1058 n = [] ++ issue1058 (n+1) -- issue1058 (n+1)
 
 # import Prelude \
 # yes = flip mapM -- Control.Monad.forM

diff --git a/src/Hint/Match.hs b/src/Hint/Match.hs
@@ -157,7 +157,7 @@ matchIdea sb declName HintRule{..} parent x = do
   guard $ not (any isLambda $ universe lhs) || not (any isQuasiQuote $ universe x)
 
   guard $ checkSide (unextendInstances <$> hintRuleSide) $ ("original", x) : ("result", res) : fromSubst u
-  guard $ checkDefine declName parent res
+  guard $ checkDefine declName parent rhs
 
   (u, tpl) <- pure $ if any ((== noSrcSpan) . getLoc . snd) (fromSubst u) then (mempty, res) else (u, tpl)
   tpl <- pure $ unqualify sa sb (performSpecial tpl)