Avoid printing expanded names when displaying type parameters.

Differences can be observed when checking neg/variances.scala. Review and any necessary polishing by @smarter.
bigmarvin · Oct 30, 2015 · 4cda3ff · 4cda3ff
1 parent edfb6e7
commit 4cda3ff
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/dotty/tools/dotc/printing/RefinedPrinter.scala b/src/dotty/tools/dotc/printing/RefinedPrinter.scala
@@ -45,8 +45,10 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
 
   override def nameString(name: Name): String = name.decode.toString
 
-  override protected def simpleNameString(sym: Symbol): String =
-    sym.name.decode.toString
+  override protected def simpleNameString(sym: Symbol): String = {
+    val name = sym.originalName
+    nameString(if (sym is ExpandedTypeParam) name.asTypeName.unexpandedName else name)
+  }
 
   override protected def fullNameOwner(sym: Symbol) = {
     val owner = super.fullNameOwner(sym)
@@ -86,10 +88,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
     else {
       val tsym = tp.parent.member(tp.refinedName).symbol
       if (!tsym.exists) super.refinementNameString(tp)
-      else {
-        val name = tsym.originalName
-        nameString(if (tsym is ExpandedTypeParam) name.asTypeName.unexpandedName else name)
-      }
+      else simpleNameString(tsym)
     }
 
   override def toText(tp: Type): Text = controlled {