Tweak per review

[Cherry-picked 55fcf06]

Author: som-snytt

compiler/src/dotty/tools/dotc/ast/Desugar.scala

@@ -1422,7 +1422,7 @@ object desugar {
   /** Assuming `src` contains top-level definition, returns the name that should
    *  be using for the package object that will wrap them.
    */
-  def packageObjectName(src: SourceFile, srcPos: SrcPos)(using Context): TermName =
+  def packageObjectName(src: SourceFile): TermName =
     val fileName = src.file.name
     val sourceName = fileName.take(fileName.lastIndexOf('.'))
     (sourceName ++ str.TOPLEVEL_SUFFIX).toTermName
@@ -1453,7 +1453,7 @@ object desugar {
     val (nestedStats, topStats) = pdef.stats.partition(inPackageObject)
     if (nestedStats.isEmpty) pdef
     else {
-      val name = packageObjectName(ctx.source, pdef.srcPos)
+      val name = packageObjectName(ctx.source)
       val grouped =
         ModuleDef(name, Template(emptyConstructor, Nil, Nil, EmptyValDef, nestedStats))
           .withMods(Modifiers(Synthetic))

compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala

@@ -235,7 +235,7 @@ enum ErrorMessageID(val isActive: Boolean = true) extends java.lang.Enum[ErrorMe
   case CannotInstantiateQuotedTypeVarID // errorNumber: 219
   case DefaultShadowsGivenID // errorNumber: 220
   case RecurseWithDefaultID // errorNumber: 221
-  case EncodedPackageNameID // 222
+  case EncodedPackageNameID // errorNumber: 222
 
   def errorNumber = ordinal - 1
 

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

@@ -3397,10 +3397,10 @@ final class EncodedPackageName(name: Name)(using Context) extends SyntaxMsg(Enco
   override protected def msg(using Context): String =
     i"The package name `$name` will be encoded on the classpath, and can lead to undefined behaviour."
   override protected def explain(using Context): String =
-    i"""Tooling may not cope with directories whose names do not match their package name.
-       |For example, `p-q` is encoded as `p$$minusq` and written that way to the file system.
+    i"""Tools may not handle directories whose names differ from their corresponding package names.
+       |For example, `p-q` is encoded as `p$$minusq` when written to the file system.
        |
-       |Package objects have names derived from their file names, so that names such as
-       |`myfile.test.scala` and `myfile-test.scala` will result in encoded names for package objects.
+       |Package objects derive their names from the file names, so files such as `myfile.test.scala`
+       |or `myfile-test.scala` can produce encoded names for the generated package objects.
        |
-       |The name `$name` is encoded to `${name.encode}`."""
+       |In this case, the name `$name` is encoded as `${name.encode}`."""

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

@@ -2922,7 +2922,7 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
         inContext(ctx.packageContext(tree, pkg)) {
           // If it exists, complete the class containing the top-level definitions
           // before typing any statement in the package to avoid cycles as in i13669.scala
-          val packageObjectName = desugar.packageObjectName(ctx.source, tree.srcPos)
+          val packageObjectName = desugar.packageObjectName(ctx.source)
           val topLevelClassSymbol = pkg.moduleClass.info.decls.lookup(packageObjectName.moduleClassName)
           topLevelClassSymbol.ensureCompleted()
           var stats1 = typedStats(tree.stats, pkg.moduleClass)._1
@@ -3341,8 +3341,8 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
   def typedStats(stats: List[untpd.Tree], exprOwner: Symbol)(using Context): (List[Tree], Context) = {
     val buf = new mutable.ListBuffer[Tree]
     var enumContexts: SimpleIdentityMap[Symbol, Context] = SimpleIdentityMap.empty
-      // A map from `enum` symbols to the contexts enclosing their definitions
     val initialNotNullInfos = ctx.notNullInfos
+      // A map from `enum` symbols to the contexts enclosing their definitions
     @tailrec def traverse(stats: List[untpd.Tree])(using Context): (List[Tree], Context) = stats match {
       case (imp: untpd.Import) :: rest =>
         val imp1 = typed(imp)

tests/neg/i22670.check

@@ -10,11 +10,11 @@
    |--------------------------------------------------------------------------------------------------------------------
    | Explanation (enabled by `-explain`)
    |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   | Tooling may not cope with directories whose names do not match their package name.
-   | For example, `p-q` is encoded as `p$minusq` and written that way to the file system.
+   | Tools may not handle directories whose names differ from their corresponding package names.
+   | For example, `p-q` is encoded as `p$minusq` when written to the file system.
    |
-   | Package objects have names derived from their file names, so that names such as
-   | `myfile.test.scala` and `myfile-test.scala` will result in encoded names for package objects.
+   | Package objects derive their names from the file names, so files such as `myfile.test.scala`
+   | or `myfile-test.scala` can produce encoded names for the generated package objects.
    |
-   | The name `i22670-macro$package` is encoded to `i22670$minusmacro$package`.
+   | In this case, the name `i22670-macro$package` is encoded as `i22670$minusmacro$package`.
     --------------------------------------------------------------------------------------------------------------------