Merge pull request #14 from dwijnand/no-auto-apply

Implement ExplicitNonNullaryApply

Author: dwijnand

build.sbt

@@ -12,7 +12,7 @@ skip in publish := true
 
 val rewrites = project.settings(
   moduleName := "scala-rewrites",
-  libraryDependencies += "ch.epfl.scala" %% "scalafix-core" % scalafixVersion,
+  libraryDependencies += "ch.epfl.scala" %% "scalafix-rules" % scalafixVersion,
 )
 
 val input = project.settings(

input/src/main/java/fix/scala213/ExplicitNonNullaryApplyI.java

@@ -0,0 +1,5 @@
+package fix.scala213;
+
+interface ExplicitNonNullaryApplyI {
+  String foo();
+}

input/src/main/scala/fix/scala213/ExplicitNonNullaryApply.scala

@@ -0,0 +1,76 @@
+/*
+rule = fix.scala213.ExplicitNonNullaryApply
+*/
+package fix.scala213
+
+class ExplicitNonNullaryApply {
+  val enna = new ExplicitNonNullaryApply()
+
+  def prop            = ""
+  def meth()          = ""
+
+  def id[A](x: A)     = x
+
+
+  def def_prop_p = prop
+  def def_meth_p = meth
+  def def_meth_m = meth()
+
+  def def_id    = id("")
+  def def_id_ta = id[String]("")
+
+
+  def def_this_prop_p    = this.prop
+  def def_this_meth_p    = this.meth
+  def def_this_meth_m    = this.meth()
+//def def_this_meth_m_in = this meth ()
+
+  def def_this_id_m       = this.id("")
+  def def_this_id_m_ta    = this.id[String]("")
+  def def_this_id_m_in    = this id ""
+  def def_this_id_m_in_ta = this id[String] ""
+
+
+  def def_enna_prop_p    = enna.prop
+  def def_enna_meth_p    = enna.meth
+  def def_enna_meth_m    = enna.meth()
+//def def_enna_meth_m_in = enna meth ()
+
+  def def_enna_id_m       = enna.id("")
+  def def_enna_id_m_ta    = enna.id[String]("")
+  def def_enna_id_m_in    = enna id ""
+  def def_enna_id_m_in_ta = enna id[String] ""
+
+
+  def def_this_enna_prop_p    = this.enna.prop
+  def def_this_enna_meth_p    = this.enna.meth
+  def def_this_enna_meth_m    = this.enna.meth()
+//def def_this_enna_meth_m_in = this.enna meth ()
+
+  def def_this_enna_id_m       = this.enna.id("")
+  def def_this_enna_id_m_ta    = this.enna.id[String]("")
+  def def_this_enna_id_m_in    = this.enna id ""
+  def def_this_enna_id_m_in_ta = this.enna id[String] ""
+
+
+  def def_enna_this_prop_p    = ExplicitNonNullaryApply.this.prop
+  def def_enna_this_meth_p    = ExplicitNonNullaryApply.this.meth
+  def def_enna_this_meth_m    = ExplicitNonNullaryApply.this.meth()
+//def def_enna_this_meth_m_in = ExplicitNonNullaryApply.this meth ()
+
+  def def_enna_this_id_m       = ExplicitNonNullaryApply.this.id("")
+  def def_enna_this_id_m_ta    = ExplicitNonNullaryApply.this.id[String]("")
+  def def_enna_this_id_m_in    = ExplicitNonNullaryApply.this id ""
+  def def_enna_this_id_m_in_ta = ExplicitNonNullaryApply.this id[String] ""
+
+
+  def def_enna_enna_prop_p    = enna.enna.prop
+  def def_enna_enna_meth_p    = enna.enna.meth
+  def def_enna_enna_meth_m    = enna.enna.meth()
+//def def_enna_enna_meth_m_in = enna.enna meth ()
+
+  def def_enna_enna_id_m       = enna.enna.id("")
+  def def_enna_enna_id_m_ta    = enna.enna.id[String]("")
+  def def_enna_enna_id_m_in    = enna.enna id ""
+  def def_enna_enna_id_m_in_ta = enna.enna id[String] ""
+}

input/src/main/scala/fix/scala213/ExplicitNonNullaryApplyJava.scala

@@ -0,0 +1,88 @@
+/*
+rule = fix.scala213.ExplicitNonNullaryApply
+*/
+package fix.scala213
+
+import ExplicitNonNullaryApplyJavaDefs._
+
+class ExplicitNonNullaryApplyJava {
+  ???.##
+  ???.getClass()
+  ???.getClass
+  ???.hashCode()
+  ???.hashCode
+  ???.toString()
+  ???.toString
+  ???.asInstanceOf[Int]
+  ???.isInstanceOf[Int]
+
+  any.##
+  any.getClass()
+  any.getClass
+  any.hashCode()
+  any.hashCode
+  any.toString()
+  any.toString
+  any.asInstanceOf[Int]
+  any.isInstanceOf[Int]
+
+  ref.##
+  ref.getClass()
+  ref.getClass
+  ref.hashCode()
+  ref.hashCode
+  ref.toString()
+  ref.toString
+  ref.asInstanceOf[Int]
+  ref.isInstanceOf[Int]
+
+  obj.##
+  obj.getClass()
+  obj.getClass
+  obj.hashCode()
+  obj.hashCode
+  obj.toString()
+  obj.toString
+  obj.asInstanceOf[Int]
+  obj.isInstanceOf[Int]
+
+  str.##
+  str.getClass()
+  str.getClass
+  str.hashCode()
+  str.hashCode
+  str.toString()
+  str.toString
+  str.asInstanceOf[Int]
+  str.isInstanceOf[Int]
+
+  cm.toString()
+  cm.toString
+  cp.toString()
+  cp.toString
+
+  cm.run()
+  cm.run
+  cp.run()
+  cp.run
+
+  cm.foo()
+  cm.foo
+  cp.foo()
+  cp.foo
+
+  vcm.toString()
+  vcm.toString
+  vcp.toString()
+  vcp.toString
+
+  ccm.toString()
+  ccm.toString
+  ccp.toString()
+  ccp.toString
+
+  vccm.toString()
+  vccm.toString
+  vccp.toString()
+  vccp.toString
+}

input/src/main/scala/fix/scala213/ExplicitNonNullaryApplyJavaDefs.scala

@@ -0,0 +1,30 @@
+/**/
+package fix.scala213
+
+object ExplicitNonNullaryApplyJavaDefs {
+       class CM    extends Runnable with ExplicitNonNullaryApplyI { override def toString() = ""; def run() = (); def foo() = "" }
+       class CP    extends Runnable with ExplicitNonNullaryApplyI { override def toString   = ""; def run   = (); def foo   = "" }
+
+  case class CCM() extends Runnable with ExplicitNonNullaryApplyI { override def toString() = ""; def run() = (); def foo() = "" }
+  case class CCP() extends Runnable with ExplicitNonNullaryApplyI { override def toString   = ""; def run   = (); def foo   = "" }
+
+  class VCM(val x: String) extends AnyVal { override def toString() = "" }
+  class VCP(val x: String) extends AnyVal { override def toString   = "" }
+
+  case class VCCM(x: String) extends AnyVal { override def toString() = "" }
+  case class VCCP(x: String) extends AnyVal { override def toString   = "" }
+
+  val any: Any    = ""
+  val ref: AnyRef = ""
+  val obj: Object = ""
+  val str: String = ""
+
+  val cm: CM     = new CM()
+  val cp: CP     = new CP()
+  val vcm: VCM   = new VCM("")
+  val vcp: VCP   = new VCP("")
+  val ccm: CCM   = CCM()
+  val ccp: CCP   = CCP()
+  val vccm: VCCM = VCCM("")
+  val vccp: VCCP = VCCP("")
+}

input/src/main/scala/fix/scala213/ExplicitNonNullaryApplyOver.scala

@@ -0,0 +1,20 @@
+/*
+rule = fix.scala213.ExplicitNonNullaryApply
+*/
+package fix.scala213
+
+class ExplicitNonNullaryApplyOver {
+  class Meth { def d() = "" }
+  class Prop { def d   = "" }
+
+  class Meth2Prop extends Meth { override def d   = "" }
+  class Prop2Meth extends Prop { override def d() = "" }
+
+  val meth2prop = new Meth2Prop
+  val prop2meth = new Prop2Meth
+
+  meth2prop.d()
+  meth2prop.d // <- should call with parens
+  prop2meth.d()
+  prop2meth.d // <- should call with parens
+}

input/src/main/scala/fix/scala213/NoAutoApply.scala

@@ -0,0 +1,39 @@
+/*
+rule = fix.scala213.ExplicitNonNullaryApply
+*/
+package fix.scala213
+
+object NoAutoApply {
+  object buz {
+    override def toString(): String = ""
+    def empty[T]() = List.empty[T]
+  }
+  val x: Iterator[Int] = ???
+  def foo() = println(1)
+  def bar = 32
+  foo
+  println(foo)
+  foo()
+  bar
+  x.next
+  class buz() {
+    def qux() = List(1)
+  }
+  new buz().qux.toIterator.next
+  new java.util.ArrayList[Int]().toString
+  val builder = List.newBuilder[Int]
+  builder.result()
+//builder result ()
+  builder.result
+  fix.scala213.NoAutoApply.buz.empty[String]
+  var opt: Option[() => Int] = None
+  opt = None
+  println(1.toString)
+  println(buz.toString) // not inserted
+  List(builder) map (_.result)
+  builder.##
+  def lzy(f: => Int) = {
+    var k = f _
+    k = () => 3
+  }
+}

output/src/main/java/fix/scala213/ExplicitNonNullaryApplyI.java

@@ -0,0 +1,5 @@
+package fix.scala213;
+
+interface ExplicitNonNullaryApplyI {
+  String foo();
+}

output/src/main/scala/fix/scala213/ExplicitNonNullaryApply.scala

@@ -0,0 +1,73 @@
+package fix.scala213
+
+class ExplicitNonNullaryApply {
+  val enna = new ExplicitNonNullaryApply()
+
+  def prop            = ""
+  def meth()          = ""
+
+  def id[A](x: A)     = x
+
+
+  def def_prop_p = prop
+  def def_meth_p = meth()
+  def def_meth_m = meth()
+
+  def def_id    = id("")
+  def def_id_ta = id[String]("")
+
+
+  def def_this_prop_p    = this.prop
+  def def_this_meth_p    = this.meth()
+  def def_this_meth_m    = this.meth()
+//def def_this_meth_m_in = this meth ()
+
+  def def_this_id_m       = this.id("")
+  def def_this_id_m_ta    = this.id[String]("")
+  def def_this_id_m_in    = this id ""
+  def def_this_id_m_in_ta = this id[String] ""
+
+
+  def def_enna_prop_p    = enna.prop
+  def def_enna_meth_p    = enna.meth()
+  def def_enna_meth_m    = enna.meth()
+//def def_enna_meth_m_in = enna meth ()
+
+  def def_enna_id_m       = enna.id("")
+  def def_enna_id_m_ta    = enna.id[String]("")
+  def def_enna_id_m_in    = enna id ""
+  def def_enna_id_m_in_ta = enna id[String] ""
+
+
+  def def_this_enna_prop_p    = this.enna.prop
+  def def_this_enna_meth_p    = this.enna.meth()
+  def def_this_enna_meth_m    = this.enna.meth()
+//def def_this_enna_meth_m_in = this.enna meth ()
+
+  def def_this_enna_id_m       = this.enna.id("")
+  def def_this_enna_id_m_ta    = this.enna.id[String]("")
+  def def_this_enna_id_m_in    = this.enna id ""
+  def def_this_enna_id_m_in_ta = this.enna id[String] ""
+
+
+  def def_enna_this_prop_p    = ExplicitNonNullaryApply.this.prop
+  def def_enna_this_meth_p    = ExplicitNonNullaryApply.this.meth()
+  def def_enna_this_meth_m    = ExplicitNonNullaryApply.this.meth()
+//def def_enna_this_meth_m_in = ExplicitNonNullaryApply.this meth ()
+
+  def def_enna_this_id_m       = ExplicitNonNullaryApply.this.id("")
+  def def_enna_this_id_m_ta    = ExplicitNonNullaryApply.this.id[String]("")
+  def def_enna_this_id_m_in    = ExplicitNonNullaryApply.this id ""
+  def def_enna_this_id_m_in_ta = ExplicitNonNullaryApply.this id[String] ""
+
+
+  def def_enna_enna_prop_p    = enna.enna.prop
+  def def_enna_enna_meth_p    = enna.enna.meth()
+  def def_enna_enna_meth_m    = enna.enna.meth()
+//def def_enna_enna_meth_m_in = enna.enna meth ()
+
+  def def_enna_enna_id_m       = enna.enna.id("")
+  def def_enna_enna_id_m_ta    = enna.enna.id[String]("")
+  def def_enna_enna_id_m_in    = enna.enna id ""
+  def def_enna_enna_id_m_in_ta = enna.enna id[String] ""
+}