Simplify denotation lookup

typelevel · Oct 5, 2017 · eebcf02 · eebcf02
1 parent 562bef9
commit eebcf02
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/scalafix/rules/src/main/scala/fix/Cats_v1_0_0.scala b/scalafix/rules/src/main/scala/fix/Cats_v1_0_0.scala
@@ -85,15 +85,8 @@ case class ContraMapToLMap(index: SemanticdbIndex)
     val unApplyName = "catsUnapply2left"
 
     ctx.tree.collect {
-      case Term.Apply(fun, _) =>
-        if (contraMatcher.matches(fun) &&
-          fun.children.headOption.flatMap(index.denotation).exists(_.name == unApplyName )) {
-          fun.children.find(contraMatcher.matches).map(tree => ctx.replaceTree(tree, "lmap")).getOrElse(Patch.empty)
-        } else {
-          Patch.empty
-        }
-      case _ => Patch.empty
-
+      case Term.Apply(Term.Select(f, contraMatcher(contramap)), _) if f.denotation.exists(_.name == unApplyName) =>
+        ctx.replaceTree(contramap, "lmap")
     }.asPatch
   }
 }