-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
Changes from 5 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ sudo: required | |
|
||
dist: trusty | ||
|
||
group: edge | ||
group: edge | ||
|
||
git: | ||
depth: 9999 | ||
|
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) | ||
} |
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) | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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._ | ||
|
@@ -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, _) => | ||
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) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
} else { | ||
Patch.empty | ||
} | ||
case _ => Patch.empty | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. no need for this case, since this is a |
||
|
||
}.asPatch | ||
} | ||
} | ||
|
||
// ref: https://github.com/typelevel/cats/pull/1583 | ||
case class RemoveUnapply(index: SemanticdbIndex) | ||
extends SemanticRule(index, "RemoveUnapply") { | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,8 +7,9 @@ | |
# b. Builds and tests for the JVM using the validateJVM target, and then | ||
# c. Produces the coverage report, and then | ||
# d. Clean is run (as part of coverageReport), to clear down the built artifacts | ||
# 2. The scala js build is executed, compiling the application and testing it for scala js. | ||
# 3. The validateJVM target is executed again, due to the fact that producing coverage with the | ||
# 2. The scalafix subdirectory is run, executing the tests inside. | ||
# 3. The scala js build is executed, compiling the application and testing it for scala js. | ||
# 4. The validateJVM target is executed again, due to the fact that producing coverage with the | ||
# code coverage tool causes the byte code to be instrumented/modified to record the coverage | ||
# metrics when the tests are executing. This causes the full JVM build to be run a second time. | ||
|
||
|
@@ -34,6 +35,11 @@ free_js="$sbt_cmd validateFreeJS" | |
js="$core_js && $free_js && $kernel_js" | ||
jvm="$sbt_cmd coverage validateJVM coverageReport && codecov" | ||
|
||
sbt ;coreJVM/publishLocal;freeJVM/publishLocal | ||
cd scalafix | ||
sbt tests/test | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I expected this to add a lot to build time, but apparently not! |
||
cd .. | ||
|
||
if [[ $JS_BUILD == "true" ]]; then | ||
run_cmd="$js" | ||
else | ||
|
There was a problem hiding this comment.
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