Move some logic from UserFacingPrinter to RefinedPrinter

Author: nicolasstucki

compiler/src/dotty/tools/dotc/config/ScalaSettings.scala

@@ -103,6 +103,7 @@ class ScalaSettings extends Settings.SettingGroup {
   val YprintSyms = BooleanSetting("-Yprint-syms", "when printing trees print info in symbols instead of corresponding info in trees.")
   val YprintDebug = BooleanSetting("-Yprint-debug", "when printing trees, print some extra information useful for debugging.")
   val YprintDecompile = BooleanSetting("-Yprint-decompile", "Print the program using user friendly abstractions.")
+  val YprintRepl = BooleanSetting("-Yprint-repl", "Print the program removing REPL encodings.")
   val YshowPrintErrors = BooleanSetting("-Yshow-print-errors", "don't suppress exceptions thrown during tree printing.")
   val YtestPickler = BooleanSetting("-Ytest-pickler", "self-test for pickling functionality; should be used with -Ystop-after:pickler")
   val YcheckReentrant = BooleanSetting("-Ycheck-reentrant", "check that compiled program does not contain vars that can be accessed from a global root.")

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

@@ -30,6 +30,8 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
   private[this] val printLines = ctx.settings.printLines.value
   private[this] val YprintDecompile =
     ctx.settings.YprintDecompile.value && !ctx.phases.dropWhile(!_.isInstanceOf[FirstTransform]).contains(ctx.phase)
+  private[this] val YprintRepl = ctx.settings.YprintRepl.value
+
   override protected[this] implicit def ctx: Context = myCtx
 
   def withEnclosingDef(enclDef: Tree[_ >: Untyped])(op: => Text): Text = {
@@ -67,7 +69,9 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
   protected val PrintableFlags = (SourceModifierFlags | Label | Module | Local).toCommonFlags
 
   override def nameString(name: Name): String =
-    if (ctx.settings.YdebugNames.value) name.debugString else name.toString
+    if (name.isReplAssignName) name.decode.toString.takeWhile(_ != '$')
+    else if (ctx.settings.YdebugNames.value) name.debugString
+    else name.toString
 
   override protected def simpleNameString(sym: Symbol): String =
     nameString(if (ctx.property(XprintMode).isEmpty) sym.originalName else sym.name)

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

@@ -8,16 +8,6 @@ import SymDenotations.NoDenotation, Symbols.{ Symbol, ClassSymbol, defn }
 
 class UserFacingPrinter(_ctx: Context) extends RefinedPrinter(_ctx) {
 
-  private[this] def getPkgCls(path: String) =
-    _ctx.requiredPackage(path).moduleClass.asClass
-
-  override protected def keyString(sym: Symbol): String =
-    if (sym.flagsUNSAFE is Package) "" else super.keyString(sym)
-
-  override def nameString(name: Name): String =
-    if (name.isReplAssignName) name.decode.toString.takeWhile(_ != '$')
-    else name.decode.toString
-
   override def toText(sym: Symbol): Text =
     if (sym.name.isReplAssignName) nameString(sym.name)
     else keyString(sym) ~~ nameString(sym.name.stripModuleClassSuffix)

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

@@ -94,6 +94,7 @@ 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/package.scala

@@ -20,6 +20,7 @@ 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 text = printer.dclText(s)
       text.mkString(ctx.settings.pageWidth.value, ctx.settings.printLines.value)