Adjust message pos for enum, avoid trailing space

Author: som-snytt

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

@@ -760,7 +760,9 @@ object RefChecks {
           def showDclAndLocation(sym: Symbol) =
             s"${sym.showDcl} in ${sym.owner.showLocated}"
           def undefined(msg: String) =
-            abstractClassError(false, s"${showDclAndLocation(member)} is not defined $msg")
+            val notdefined = s"${showDclAndLocation(member)} is not defined"
+            val text = if !msg.isEmpty then s"$notdefined $msg" else notdefined
+            abstractClassError(mustBeMixin = false, text)
           val underlying = member.underlyingSymbol
 
           // Give a specific error message for abstract vars based on why it fails:
@@ -926,8 +928,19 @@ object RefChecks {
       if (abstractErrors.isEmpty)
         checkNoAbstractDecls(clazz)
 
-      if (abstractErrors.nonEmpty)
-        report.error(abstractErrorMessage, clazzNamePos)
+      def errorPos(cls: ClassSymbol) =
+        val isEnumAnonCls = // courtesy of Checking.checkEnum
+          cls.isAnonymousClass
+          && cls.owner.isTerm
+          && (cls.owner.flagsUNSAFE.isAllOf(EnumCase)
+            || ((cls.owner.name eq nme.DOLLAR_NEW) && cls.owner.flagsUNSAFE.isAllOf(Private | Synthetic)))
+        if isEnumAnonCls then
+          cls.parentSyms.head.children.filterNot(_.isClass).head.srcPos
+        else
+          clazzNamePos
+
+      if abstractErrors.nonEmpty then
+        report.error(abstractErrorMessage, errorPos(clazz))
 
       checkMemberTypesOK()
       checkCaseClassInheritanceInvariant()

tests/neg/abstract-givens.check

@@ -1,7 +1,7 @@
 -- Error: tests/neg/abstract-givens.scala:11:8 -------------------------------------------------------------------------
 11 |  given s: [T] => T => Seq[T]: // error
    |        ^
-   |instance cannot be created, since def iterator: Iterator[A] in trait IterableOnce in package scala.collection is not defined 
+   |instance cannot be created, since def iterator: Iterator[A] in trait IterableOnce in package scala.collection is not defined
 -- [E164] Declaration Error: tests/neg/abstract-givens.scala:8:8 -------------------------------------------------------
 8 |  given y(using Int): String = summon[Int].toString * 22 // error
   |        ^

tests/neg/i19731.check

@@ -1,7 +1,7 @@
 -- Error: tests/neg/i19731.scala:4:6 -----------------------------------------------------------------------------------
 4 |class F1 extends Foo: // error
   |      ^^
-  |      class F1 needs to be abstract, since def foo(): Unit in class F1 is not defined 
+  |      class F1 needs to be abstract, since def foo(): Unit in class F1 is not defined
 -- Error: tests/neg/i19731.scala:7:6 -----------------------------------------------------------------------------------
 7 |class F2 extends Foo: // error
   |      ^^

tests/neg/i21335.check

@@ -1,8 +1,8 @@
 -- Error: tests/neg/i21335.scala:7:6 -----------------------------------------------------------------------------------
 7 |class Z1 extends Bar1 // error
   |      ^^
-  |      class Z1 needs to be abstract, since override def bar(): Bar1 in trait Bar1 is not defined 
+  |      class Z1 needs to be abstract, since override def bar(): Bar1 in trait Bar1 is not defined
 -- Error: tests/neg/i21335.scala:12:6 ----------------------------------------------------------------------------------
 12 |class Z2 extends Bar2 // error
    |      ^^
-   |      class Z2 needs to be abstract, since def bar(): Bar2 in trait Bar2 is not defined 
+   |      class Z2 needs to be abstract, since def bar(): Bar2 in trait Bar2 is not defined

tests/neg/i22734.check

@@ -0,0 +1,8 @@
+-- Error: tests/neg/i22734.scala:3:7 -----------------------------------------------------------------------------------
+3 |object X extends T // error status quo
+  |       ^
+  |       object creation impossible, since def item: String in trait T is not defined
+-- Error: tests/neg/i22734.scala:6:7 -----------------------------------------------------------------------------------
+6 |  case Empty // error
+  |       ^
+  |       object creation impossible, since def item: String in class Foo is not defined

tests/neg/i22734.scala

@@ -0,0 +1,11 @@
+trait T:
+  def item: String
+object X extends T // error status quo
+
+enum Foo {
+  case Empty // error
+  case NonEmpty(item: String)
+  case Decoy // hopefully not here
+
+  def item: String
+}