Move remaining logic from UserFacingPrinter to RefinedPrinter

Author: nicolasstucki

compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala

@@ -691,7 +691,11 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
         case info: ImportType => return s"import $info.expr.show"
         case _ =>
       }
-    if (sym.is(ModuleClass))
+    if (YprintRepl) {
+      if (sym.name.isReplAssignName) nameString(sym.name)
+      else keyString(sym) ~~ nameString(sym.name.stripModuleClassSuffix)
+    }
+    else if (sym.is(ModuleClass))
       kindString(sym) ~~ (nameString(sym.name.stripModuleClassSuffix) + idString(sym))
     else
       super.toText(sym)

compiler/src/dotty/tools/dotc/printing/UserFacingPrinter.scala

@@ -94,7 +94,6 @@ class ReplDriver(settings: Array[String],
     val rootCtx = initCtx.fresh.addMode(Mode.ReadPositions).addMode(Mode.Interactive)
     val ictx = setup(settings, rootCtx)._2.fresh
     ictx.base.initialize()(ictx)
-    ictx.setSetting(ictx.settings.YprintRepl, true)
     ictx
   }
 

compiler/src/dotty/tools/repl/ReplDriver.scala

@@ -4,7 +4,7 @@ import dotc.core.Contexts.Context
 import dotc.core.Symbols.Symbol
 import dotc.core.Denotations.Denotation
 import dotc.reporting.diagnostic.MessageContainer
-import dotc.printing.UserFacingPrinter
+import dotc.printing.RefinedPrinter
 
 import dotc.reporting.{
   StoreReporter,
@@ -20,10 +20,11 @@ package object repl {
 
   private[repl] implicit class ShowUser(val s: Symbol) extends AnyVal {
     def showUser(implicit ctx: Context): String = {
-      assert(ctx.settings.YprintRepl.value)
-      val printer = new UserFacingPrinter(ctx)
+      val ctx2 = ctx.fresh
+      ctx2.setSetting(ctx2.settings.YprintRepl, true)
+      val printer = new RefinedPrinter(ctx2)
       val text = printer.dclText(s)
-      text.mkString(ctx.settings.pageWidth.value, ctx.settings.printLines.value)
+      text.mkString(ctx2.settings.pageWidth.value, ctx2.settings.printLines.value)
     }
   }