Merge pull request #3750 from dotty-staging/fix-#2994-v2

Fix #2994

Author: allanrenucci

compiler/src/dotty/tools/dotc/reporting/diagnostic/messages.scala

@@ -1253,29 +1253,20 @@ object messages {
            |""".stripMargin
   }
 
-  case class OverloadedOrRecursiveMethodNeedsResultType private (termName: String)(implicit ctx: Context)
+  case class OverloadedOrRecursiveMethodNeedsResultType(tree: Names.TermName)(implicit ctx: Context)
   extends Message(OverloadedOrRecursiveMethodNeedsResultTypeID) {
     val kind = "Syntax"
-    val msg = hl"""overloaded or recursive method $termName needs return type"""
+    val msg = hl"""overloaded or recursive method ${tree} needs return type"""
     val explanation =
-      hl"""Case 1: $termName is overloaded
-          |If there are multiple methods named `$termName` and at least one definition of
+      hl"""Case 1: ${tree} is overloaded
+          |If there are multiple methods named `${tree.name}` and at least one definition of
           |it calls another, you need to specify the calling method's return type.
           |
-          |Case 2: $termName is recursive
-          |If `$termName` calls itself on any path, you need to specify its return type.
+          |Case 2: ${tree} is recursive
+          |If `${tree.name}` calls itself on any path, you need to specify its return type.
           |""".stripMargin
   }
 
-  object OverloadedOrRecursiveMethodNeedsResultType {
-    def apply[T >: Trees.Untyped](tree: NameTree[T])(implicit ctx: Context)
-    : OverloadedOrRecursiveMethodNeedsResultType =
-      OverloadedOrRecursiveMethodNeedsResultType(tree.name.show)(ctx)
-    def apply(symbol: Symbol)(implicit ctx: Context)
-    : OverloadedOrRecursiveMethodNeedsResultType =
-      OverloadedOrRecursiveMethodNeedsResultType(symbol.name.show)(ctx)
-  }
-
   case class RecursiveValueNeedsResultType(tree: Names.TermName)(implicit ctx: Context)
   extends Message(RecursiveValueNeedsResultTypeID) {
     val kind = "Syntax"
@@ -1373,8 +1364,7 @@ object messages {
            |"""
   }
 
-  case class MethodDoesNotTakeParameters(tree: tpd.Tree, methPartType: Types.Type)
-  (err: typer.ErrorReporting.Errors)(implicit ctx: Context)
+  case class MethodDoesNotTakeParameters(tree: tpd.Tree, methPartType: Types.Type)(err: typer.ErrorReporting.Errors)(implicit ctx: Context)
   extends Message(MethodDoesNotTakeParametersId) {
     private val more = tree match {
       case Apply(_, _) => " more"

compiler/src/dotty/tools/dotc/typer/ErrorReporting.scala

@@ -29,7 +29,7 @@ object ErrorReporting {
       if (cx.mode is Mode.InferringReturnType) {
         cx.tree match {
           case tree: untpd.DefDef if !tree.tpt.typeOpt.exists =>
-            OverloadedOrRecursiveMethodNeedsResultType(tree)
+            OverloadedOrRecursiveMethodNeedsResultType(tree.name)
           case tree: untpd.ValDef if !tree.tpt.typeOpt.exists =>
             RecursiveValueNeedsResultType(tree.name)
           case _ =>

compiler/src/dotty/tools/dotc/typer/Typer.scala

@@ -2056,13 +2056,7 @@ class Typer extends Namer
         else
           tree
       case _ => tryInsertApplyOrImplicit(tree, pt) {
-        pt.resType match {
-          case IgnoredProto(WildcardType(optBounds))
-            if (optBounds == NoType) && (pt.args.size == tree.productArity) =>
-              errorTree(tree, OverloadedOrRecursiveMethodNeedsResultType(tree.symbol))
-          case resType =>
-            errorTree(tree, MethodDoesNotTakeParameters(tree, methPart(tree).tpe)(err))
-        }
+        errorTree(tree, MethodDoesNotTakeParameters(tree, methPart(tree).tpe)(err))
       }
     }
 

compiler/test/dotty/tools/dotc/reporting/ErrorMessagesTests.scala

@@ -193,7 +193,7 @@ class ErrorMessagesTests extends ErrorMessagesTest {
       assertTrue("expected trait", isTrait)
     }
 
-  @Test def overloadedMethodNeedsReturnType = {
+  @Test def overloadedMethodNeedsReturnType =
     checkMessagesAfter("frontend") {
       """
         |class Scope() {
@@ -206,25 +206,10 @@ class ErrorMessagesTests extends ErrorMessagesTest {
       implicit val ctx: Context = ictx
 
       assertMessageCount(1, messages)
-      val OverloadedOrRecursiveMethodNeedsResultType(treeName) :: Nil = messages
-      assertEquals("foo", treeName)
+      val OverloadedOrRecursiveMethodNeedsResultType(tree) :: Nil = messages
+      assertEquals("foo", tree.show)
     }
 
-
-    checkMessagesAfter("frontend") {
-      """
-        |case class Foo[T](x: T)
-        |object Foo { def apply[T]() = Foo(null.asInstanceOf[T]) }
-      """.stripMargin
-    }.expect { (ictx, messages) =>
-      implicit val ctx: Context = ictx
-
-      assertMessageCount(1, messages)
-      val OverloadedOrRecursiveMethodNeedsResultType(treeName2) :: Nil = messages
-      assertEquals("Foo", treeName2)
-    }
-  }
-
   @Test def recursiveMethodNeedsReturnType =
     checkMessagesAfter("frontend") {
       """
@@ -237,8 +222,8 @@ class ErrorMessagesTests extends ErrorMessagesTest {
       implicit val ctx: Context = ictx
 
       assertMessageCount(1, messages)
-      val OverloadedOrRecursiveMethodNeedsResultType(treeName) :: Nil = messages
-      assertEquals("i", treeName)
+      val OverloadedOrRecursiveMethodNeedsResultType(tree) :: Nil = messages
+      assertEquals("i", tree.show)
     }
 
   @Test def recursiveValueNeedsReturnType =