-
-
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
Merged
Merged
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
31 changes: 31 additions & 0 deletions
31
scalafix/input/src/main/scala/fix/v1_0_0/ContraMapToLMap.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
28
scalafix/output/src/main/scala/fix/v1_0_0/ContraMapToLMap.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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") { | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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