Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add scalafix for contramap #1937

Merged
merged 6 commits into from
Oct 10, 2017
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions scalafix/input/src/main/scala/fix/v1_0_0/ContraMapToLMap.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/*
rule = "scala:fix.v1_0_0.ContraMapToLMap"
*/
package fix
package to1_0_0



object ContraMapToLMapTests {
import cats.Show
import cats.syntax.all._
import cats.instances.all._

val f: Int => String = _.toString

val g: Int => String = f.contramap(_ + 1)

object Foo
object Bar
object Baz

implicit val showFoo: Show[Foo.type] = Show.fromToString

val showBar: Show[Bar.type] = showFoo.contramap(_ => Foo)

val showBaz: Show[Baz.type] = Show[Foo.type].contramap(_ => Foo)

def getShowBar(): Show[Bar.type] = showBar

getShowBar().contramap((_: Int) => Bar)
}
28 changes: 28 additions & 0 deletions scalafix/output/src/main/scala/fix/v1_0_0/ContraMapToLMap.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package fix
package to1_0_0



object ContraMapToLMapTests {
import cats.Show
import cats.syntax.all._
import cats.instances.all._

val f: Int => String = _.toString

val g: Int => String = f.lmap(_ + 1)

object Foo
object Bar
object Baz

implicit val showFoo: Show[Foo.type] = Show.fromToString

val showBar: Show[Bar.type] = showFoo.contramap(_ => Foo)

val showBaz: Show[Baz.type] = Show[Foo.type].contramap(_ => Foo)

def getShowBar(): Show[Bar.type] = showBar

getShowBar().contramap((_: Int) => Bar)
}
25 changes: 25 additions & 0 deletions scalafix/rules/src/main/scala/fix/Cats_v1_0_0.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package fix
package v1_0_0

import scalafix._
import scalafix.syntax._
import scalafix.util.SymbolMatcher
import scala.meta._
import scala.meta.contrib._
Expand Down Expand Up @@ -73,6 +74,30 @@ case class RemoveCartesianBuilder(index: SemanticdbIndex)
}
}

// ref: https://github.com/typelevel/cats/issues/1850
case class ContraMapToLMap(index: SemanticdbIndex)
extends SemanticRule(index, "UseLMapInsteadOfContraMap") {

override def fix(ctx: RuleCtx): Patch = {

val contraMatcher = SymbolMatcher.normalized(Symbol("_root_.cats.functor.Contravariant.Ops.`contramap`."))

val unApplyName = "catsUnapply2left"

ctx.tree.collect {
case Term.Apply(fun, _) =>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SymbolMatches have an unapply method, so you can use it like

case Term.Apply(contraMatcher(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)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.getOrElse(Patch.empty) can become .asPatch

} else {
Patch.empty
}
case _ => Patch.empty
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no need for this case, since this is a collect


}.asPatch
}
}

// ref: https://github.com/typelevel/cats/pull/1583
case class RemoveUnapply(index: SemanticdbIndex)
extends SemanticRule(index, "RemoveUnapply") {
Expand Down