Polishing

Author: allanrenucci

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

@@ -21,7 +21,7 @@ import ErrorMessageID._
 import Denotations.SingleDenotation
 import dotty.tools.dotc.ast.Trees
 import dotty.tools.dotc.config.ScalaVersion
-import dotty.tools.dotc.core.Flags.{FlagSet, Mutable}
+import dotty.tools.dotc.core.Flags._
 import dotty.tools.dotc.core.SymDenotations.SymDenotation
 import scala.util.control.NonFatal
 
@@ -203,11 +203,11 @@ object messages {
     val explanation =
       hl"""|Anonymous functions must define a type. For example, if you define a function like this one:
            |
-           |${"val f = { case xs @ List(1, 2, 3) => Some(xs) }"}
+           |${"val f = { case x: Int => x + 1 }"}
            |
            |Make sure you give it a type of what you expect to match and help the type inference system:
            |
-           |${"val f: Seq[Int] => Option[List[Int]] = { case xs @ List(1, 2, 3) => Some(xs) }"} """
+           |${"val f: Any => Int = { case x: Int => x + 1 }"} """
   }
 
   case class WildcardOnTypeArgumentNotAllowedOnNew()(implicit ctx: Context)
@@ -2078,23 +2078,14 @@ object messages {
   }
 
   case class JavaSymbolIsNotAValue(symbol: Symbol)(implicit ctx: Context) extends Message(JavaSymbolIsNotAValueID) {
-    val msg = hl"$symbol is not a value"
     val kind = "Type Mismatch"
-    val explanation = {
-      val javaCodeExample = """class A {public static int a() {return 1;}}"""
-
-      val scalaCodeExample =
-        """val objectA = A     // This does not compile
-          |val aResult = A.a() // This does compile""".stripMargin
+    val msg = {
+      val kind =
+        if (symbol is Package) hl"$symbol"
+        else hl"Java defined ${"class " + symbol.name}"
 
-      hl"""Java statics and packages cannot be used as a value.
-          |For Java statics consider the following Java example:
-          |
-          |$javaCodeExample
-          |
-          |When used from Scala:
-          |
-          |$scalaCodeExample"""
+      s"$kind is not a value"
     }
+    val explanation = ""
   }
 }

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

@@ -805,15 +805,15 @@ class ErrorMessagesTests extends ErrorMessagesTest {
     checkMessagesAfter("refchecks") {
       """
         |object AnonymousF {
-        |  val f = { case l@List(1,2,3) => Some(l) }
+        |  val f = { case x: Int => x + 1 }
         |}""".stripMargin
     }
     .expect { (ictx, messages) =>
       implicit val ctx: Context = ictx
 
-      val AnonymousFunctionMissingParamType(param, args, _, pt) = messages.last
+      assertMessageCount(1, messages)
+      val AnonymousFunctionMissingParamType(param, args, _, pt) = messages.head
       assertEquals("x$1", param.show)
-      assertEquals(s"List(ValDef(${param.show},TypeTree,EmptyTree))", args.toString)
       assertEquals("?", pt.show)
     }
 
@@ -1289,6 +1289,8 @@ class ErrorMessagesTests extends ErrorMessagesTest {
       """.stripMargin
     }.expect { (itcx, messages) =>
       implicit val ctx: Context = itcx
+
+      assertMessageCount(1, messages)
       val JavaSymbolIsNotAValue(symbol) = messages.head
       assertEquals(symbol.show, "package p")
     }