Merge pull request #63 from sschaef/t1002221-mods-without-return-type

T1002221 mods without return type

Author: misto

org.scala-refactoring.library/src/main/scala/scala/tools/refactoring/sourcegen/ReusingPrinter.scala

@@ -977,7 +977,19 @@ trait ReusingPrinter extends TreePrintingTraversals with AbstractPrinter {
       }
 
       val body = p(rhs)
-      val resultType = p(tpt, before = Requisite.allowSurroundingWhitespace(":", ": "))
+
+      def existsTptInFile = tpt match {
+        case tpt: TypeTree =>
+          lazy val textInFile = betweenStartAndEnd(tpt).asText
+          tpt.pos.isRange && (textInFile == tpt.toString() || textInFile == tpt.original.toString())
+        case _ => false
+      }
+
+      val resultType =
+        if (body == EmptyFragment && !existsTptInFile)
+          EmptyFragment
+        else
+          p(tpt, before = Requisite.allowSurroundingWhitespace(":", ": "))
 
       def hasEqualInSource = {
         val originalDefDef = orig(tree)

org.scala-refactoring.library/src/test/scala/scala/tools/refactoring/tests/sourcegen/ReusingPrinterTest.scala

@@ -26,7 +26,7 @@ class ReusingPrinterTest extends TestHelper with SilentTracing {
     def printsTo(expectedOutput: String): Unit = {
       val sourceFile = new BatchSourceFile("noname", expectedOutput)
       val expected = stripWhitespacePreservers(expectedOutput).trim()
-      val actual = generate(original, sourceFile = Some(sourceFile)).asText.trim()
+      val actual = ask { () => generate(original, sourceFile = Some(sourceFile)).asText.trim() }
       if (actual != expected)
         throw new ComparisonFailure("", expected, actual)
     }
@@ -36,7 +36,7 @@ class ReusingPrinterTest extends TestHelper with SilentTracing {
   }
   final implicit class OrToDieAfter(input: (String, String)) {
     def after(trans: Transformation[Tree, Tree]): Unit = {
-      val t = trans(treeFrom(input._1))
+      val t = ask { () => trans(treeFrom(input._1)) }
       require(t.isDefined, "transformation was not successful")
       t foreach (_.printsTo(input._2))
     }
@@ -146,4 +146,57 @@ class ReusingPrinterTest extends TestHelper with SilentTracing {
           d.copy(mods = d.mods.withFlag(Flag.FINAL).withFlag(Flag.CASE).withFlag(Flag.PRIVATE)) replaces d
       }
     }}
+
+  @Test
+  def add_modifier_to_def_without_return_type() = """
+    trait T {
+      def meth: Int
+    }
+    trait TT extends T {
+      def meth
+    }
+    """ becomes """
+    trait T {
+      def meth: Int
+    }
+    trait TT extends T {
+      override def meth
+    }
+    """ after topdown { matchingChildren {
+      filter {
+        case d: DefDef =>
+          d.symbol.isOverridingSymbol && !d.symbol.isOverride
+      } &>
+      transform {
+        case d: DefDef =>
+          d.copy(mods = d.mods.withFlag(Flag.OVERRIDE)) replaces d
+      }
+    }}
+
+  @Test
+  def add_modifier_to_val_without_return_type() = """
+    trait T {
+      def meth: Int
+    }
+    trait TT extends T {
+      val meth
+    }
+    """ becomes """
+    trait T {
+      def meth: Int
+    }
+    trait TT extends T {
+      override val meth
+    }
+    """ after topdown { matchingChildren {
+      filter {
+        case d: ValDef =>
+          val getter = d.symbol.getter(d.symbol.owner)
+          getter.isOverridingSymbol && !getter.isOverride
+      } &>
+      transform {
+        case d: ValDef =>
+          d.copy(mods = d.mods.withFlag(Flag.OVERRIDE)) replaces d
+      }
+    }}
 }