Handle parentheses on methods without arguments correctly

mlangc · Oct 17, 2014 · e820e27 · e820e27
1 parent 539abd5
commit e820e27
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/...refactoring.library/src/main/scala/scala/tools/refactoring/sourcegen/ReusingPrinter.scala b/...refactoring.library/src/main/scala/scala/tools/refactoring/sourcegen/ReusingPrinter.scala
@@ -933,10 +933,8 @@ trait ReusingPrinter extends TreePrintingTraversals with AbstractPrinter {
       val modsAndName = pp(mods ::: nameTree :: Nil, separator = Requisite.Blank)
 
       val parameters = {
-        // The `)` is always removed from the layout, so if we have an empty
-        // parameter list and `()` in the source, we need to insert it here.
-        if (vparamss == List(List()) && modsAndName.asText.endsWith("(")) {
-          Fragment(")")
+        if (vparamss == List(List())) {
+          Fragment("()")
         } else {
           tree.explicitVParamss.map { vparams =>
             pp(vparams, before = "(", separator = ", ", after = ")")

diff --git a/...g.library/src/test/scala/scala/tools/refactoring/tests/sourcegen/ReusingPrinterTest.scala b/...g.library/src/test/scala/scala/tools/refactoring/tests/sourcegen/ReusingPrinterTest.scala
@@ -59,6 +59,21 @@ class ReusingPrinterTest extends TestHelper with SilentTracing {
         d.copy(tpt = newTpt) replaces d
     }}}
 
+  @Test
+  def add_return_type_to_def_with_brace() = """
+    package add_return_type_to_def
+    object X {
+      def sideEffect() = 3
+    }""" becomes """
+    package add_return_type_to_def
+    object X {
+      def sideEffect(): Int = 3
+    }""" after topdown { matchingChildren { transform {
+      case d @ DefDef(_, _, _, _, tpt: TypeTree, _) =>
+        val newTpt = tpt setOriginal mkReturn(List(tpt.tpe.typeSymbol))
+        d.copy(tpt = newTpt) replaces d
+    }}}
+
   @Test
   def add_return_type_to_val() = """
     package add_return_type_to_val