Strip module suffix for module class

Zinc relies on class and its companion class having the same name: this
creates an implicit dependency between the two.

Author: allanrenucci

compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala

@@ -207,7 +207,8 @@ private class ExtractAPICollector(implicit val ctx: Context) extends ThunkHolder
 
     val selfType = apiType(sym.givenSelfType)
 
-    val name = sym.fullName.toString
+    val name = sym.fullName.stripModuleClassSuffix.toString
+      // We strip module class suffix. Zinc relies on a class and its companion having the same name
 
     val tparams = sym.typeParams.map(apiTypeParameter).toArray
 
@@ -241,7 +242,7 @@ private class ExtractAPICollector(implicit val ctx: Context) extends ThunkHolder
 
     val javaPlatform = ctx.platform.asInstanceOf[JavaPlatform]
     if (sym.isStatic && defType == DefinitionType.Module && javaPlatform.hasJavaMainMethod(sym)) {
-      _mainClasses += sym.fullName.stripModuleClassSuffix.toString // required for sbt to find the static main method
+      _mainClasses += name
     }
 
     api.ClassLikeDef.of(name, acc, modifiers, anns, tparams, defType)

compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala

@@ -179,7 +179,7 @@ class ExtractDependencies extends Phase {
 
 object ExtractDependencies {
   def classNameAsString(sym: Symbol)(implicit ctx: Context): String =
-    sym.fullName.toString
+    sym.fullName.stripModuleClassSuffix.toString
 
   def isLocal(sym: Symbol)(implicit ctx: Context): Boolean =
     sym.ownersIterator.exists(_.isTerm)
@@ -269,7 +269,7 @@ private class ExtractDependenciesCollector(responsibleForImports: Symbol)(implic
           _topLevelDependencies += ClassDependency(currentClass, tlClass)
         }
       }
-      addUsedName(nonLocalEnclosingClass(ctx.owner), sym.name)
+      addUsedName(nonLocalEnclosingClass(ctx.owner), sym.name.stripModuleClassSuffix)
     }
 
   private def nonLocalEnclosingClass(sym: Symbol)(implicit ctx: Context): Symbol =
@@ -294,7 +294,7 @@ private class ExtractDependenciesCollector(responsibleForImports: Symbol)(implic
   private class PatMatDependencyTraverser(ctx0: Context) extends ExtractTypesCollector(ctx0) {
     override protected def addDependency(symbol: Symbol)(implicit ctx: Context): Unit = {
       if (!ignoreDependency(symbol) && symbol.is(Sealed)) {
-        val encName = nonLocalEnclosingClass(ctx.owner).fullName.toString
+        val encName = nonLocalEnclosingClass(ctx.owner).fullName.stripModuleClassSuffix.toString
         val nameUsed = _usedNames.getOrElseUpdate(encName, new NameUsedInClass)
 
         nameUsed.defaultNames += symbol.name