Ignore -YprintUser after first transform

Author: nicolasstucki

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

@@ -60,7 +60,6 @@ class ScalaSettings extends Settings.SettingGroup {
   val XprintTypes = BooleanSetting("-Xprint-types", "Print tree types (debugging option).")
   val XprintDiff = BooleanSetting("-Xprint-diff", "Print changed parts of the tree since last print.")
   val XprintDiffDel = BooleanSetting("-Xprint-diff-del", "Print chaged parts of the tree since last print including deleted parts.")
-  val XprintUser = BooleanSetting("-Xprint-user", "Print the program using user friendly abstractions.")
   val Xprompt = BooleanSetting("-Xprompt", "Display a prompt after each error (debugging option).")
   val XmainClass = StringSetting("-Xmain-class", "path", "Class for manifest's Main-Class entry (only useful with -d <jar>)", "")
   val XnoValueClasses = BooleanSetting("-Xno-value-classes", "Do not use value classes. Helps debugging.")
@@ -102,6 +101,7 @@ class ScalaSettings extends Settings.SettingGroup {
   val YplainPrinter = BooleanSetting("-Yplain-printer", "Pretty-print using a plain printer.")
   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 YprintUser = BooleanSetting("-Yprint-user", "Print the program using user friendly abstractions.")
   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/decompiler/Main.scala

@@ -16,6 +16,6 @@ object Main extends dotc.Driver {
   override def setup(args0: Array[String], rootCtx: Context): (List[String], Context) = {
     var args = args0.filter(a => a != "-decompile")
     args = if (args.contains("-from-tasty")) args else "-from-tasty" +: args
-    super.setup("-Xprint-user" +: args, rootCtx)
+    super.setup("-Yprint-user" +: args, rootCtx)
   }
 }

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

@@ -14,7 +14,8 @@ import TypeApplications._
 import Decorators._
 import config.Config
 import util.Positions._
-import transform.SymUtils._
+import dotty.tools.dotc.transform.SymUtils._
+import dotty.tools.dotc.transform.FirstTransform
 import scala.annotation.switch
 import language.implicitConversions
 import dotty.tools.dotc.util.SourcePosition
@@ -27,6 +28,8 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
   private[this] var myCtx: Context = _ctx
   private[this] var printPos = ctx.settings.YprintPos.value
   private[this] val printLines = ctx.settings.printLines.value
+  private[this] val YprintUser =
+   ctx.settings.YprintUser.value && !ctx.phases.dropWhile(!_.isInstanceOf[FirstTransform]).contains(ctx.phase)
   override protected[this] implicit def ctx: Context = myCtx
 
   def withEnclosingDef(enclDef: Tree[_ >: Untyped])(op: => Text): Text = {
@@ -422,7 +425,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
         }
       case Closure(env, ref, target) =>
         ("closure(" ~ (toTextGlobal(env, ", ") ~ " | " provided env.nonEmpty) ~
-        toTextGlobal(ref) ~ (":" ~ toText(target) provided !target.isEmpty) ~ ")").provided(!ctx.settings.XprintUser.value)
+        toTextGlobal(ref) ~ (":" ~ toText(target) provided !target.isEmpty) ~ ")").provided(!YprintUser)
       case Match(sel, cases) =>
         if (sel.isEmpty) blockText(cases)
         else changePrec(GlobalPrec) { toText(sel) ~ keywordStr(" match ") ~ blockText(cases) }
@@ -486,7 +489,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
         }
       case tree @ DefDef(name, tparams, vparamss, tpt, _) =>
         dclTextOr {
-          val printLambda = tree.symbol.isAnonymousFunction && ctx.settings.XprintUser.value
+          val printLambda = tree.symbol.isAnonymousFunction && YprintUser
           val prefix = modText(tree.mods, keywordStr("def")) ~~ valDefText(nameIdText(tree)) provided (!printLambda)
           withEnclosingDef(tree) {
             addVparamssText(prefix ~ tparamsText(tparams), vparamss) ~ optAscription(tpt).provided(!printLambda) ~