Fix name clashes because of `@usecase`

2 files changed, 15 insertions, 4 deletions

diff --git a/dottydoc/src/dotty/tools/dottydoc/core/UsecasePhase.scala b/dottydoc/src/dotty/tools/dottydoc/core/UsecasePhase.scala
index 758d65e92..4d9c0abbd 100644
--- a/dottydoc/src/dotty/tools/dottydoc/core/UsecasePhase.scala
+++ b/dottydoc/src/dotty/tools/dottydoc/core/UsecasePhase.scala
@@ -13,7 +13,7 @@ import dotty.tools.dotc.core.Symbols.Symbol
 class UsecasePhase extends DocMiniPhase {
   private def defdefToDef(d: tpd.DefDef, sym: Symbol)(implicit ctx: Context) = DefImpl(
     sym,
-    d.name.decode.toString,
+    d.name.show.split("\\$").head, // UseCase defs get $pos appended to their names
     flags(d), path(d.symbol),
     returnType(d.tpt.tpe),
     typeParams(d.symbol),
diff --git a/dottydoc/test/UsecaseTest.scala b/dottydoc/test/UsecaseTest.scala
index e2190e709..d5f338892 100644
--- a/dottydoc/test/UsecaseTest.scala
+++ b/dottydoc/test/UsecaseTest.scala
@@ -29,9 +29,9 @@ class UsecaseTest extends DottyTest {
     checkSources(source :: Nil) { packages =>
       packages("scala") match {
         case PackageImpl(_, _, List(trt: Trait), _, _) =>
-          val List(map: Def) = trt.members
+          val List(foo: Def) = trt.members
 
-          val returnValue = map.returnValue match {
+          val returnValue = foo.returnValue match {
             case ref: TypeReference => ref.title
             case _ =>
               assert(
@@ -42,11 +42,22 @@ class UsecaseTest extends DottyTest {
           }
 
           assert(
-            map.typeParams.isEmpty,
+            foo.typeParams.isEmpty,
             "Type parameters were not stripped by usecase"
           )
           assert(returnValue == "A", "Incorrect return type after usecase")
+
+          assert(foo.name == "foo", s"Incorrect name after transform: ${foo.name}")
       }
     }
   }
+
+  @Test def checkIterator = {
+    val sources =
+      "./scala-scala/src/library/scala/collection/Iterator.scala" :: Nil
+
+    checkFiles(sources) { packages =>
+      // success if typer throws no errors! :)
+    }
+  }
 }