Merge pull request #3400 from maseev/iss1589-underscore-only-for-functions

Add an error message class for a function underscore case

Author: allanrenucci

compiler/src/dotty/tools/dotc/reporting/diagnostic/ErrorMessageID.java

@@ -105,7 +105,8 @@ public enum ErrorMessageID {
     ExpectedTypeBoundOrEqualsID,
     ClassAndCompanionNameClashID,
     TailrecNotApplicableID,
-    FailureToEliminateExistentialID
+    FailureToEliminateExistentialID,
+    OnlyFunctionsCanBeFollowedByUnderscoreID
     ;
 
     public int errorNumber() {

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

@@ -1838,4 +1838,13 @@ object messages {
           |type used instead: $tp2"""
     }
   }
+
+  case class OnlyFunctionsCanBeFollowedByUnderscore(pt: Type)(implicit ctx: Context)
+    extends Message(OnlyFunctionsCanBeFollowedByUnderscoreID) {
+    val kind = "Syntax"
+    val msg = hl"Not a function: $pt: cannot be followed by ${"_"}"
+    val explanation =
+      hl"""The syntax ${"x _"} is no longer supported if ${"x"} is not a function.
+          |To convert to a function value, you need to explicitly write ${"() => x"}"""
+  }
 }

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

@@ -1550,7 +1550,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
     val pt1 = if (defn.isFunctionType(pt)) pt else AnyFunctionProto
     var res = typed(qual, pt1)
     if (pt1.eq(AnyFunctionProto) && !defn.isFunctionClass(res.tpe.classSymbol)) {
-      ctx.errorOrMigrationWarning(i"not a function: ${res.tpe}; cannot be followed by `_'", tree.pos)
+      ctx.errorOrMigrationWarning(OnlyFunctionsCanBeFollowedByUnderscore(res.tpe), tree.pos)
       if (ctx.scala2Mode) {
         // Under -rewrite, patch `x _` to `(() => x)`
         patch(Position(tree.pos.start), "(() => ")

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

@@ -1051,4 +1051,22 @@ class ErrorMessagesTests extends ErrorMessagesTest {
       assertEquals("trait G", other.show)
 
     }
+
+  @Test def onlyFunctionsCanBeFollowedByUnderscore =
+    checkMessagesAfter("frontend") {
+      """
+        |class T {
+        |  def main(args: Array[String]): Unit = {
+        |   val n = "T"
+        |   val func = n _
+        |  }
+        |}
+      """.stripMargin
+    }.expect { (ictx, messages) =>
+      implicit val ctx: Context = ictx
+
+      assertMessageCount(1, messages)
+      val OnlyFunctionsCanBeFollowedByUnderscore(pt) :: Nil = messages
+      assertEquals("String(n)", pt.show)
+    }
 }