Override printing of self in DecompilerPrinter

Author: nicolasstucki

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

@@ -54,6 +54,9 @@ class DecompilerPrinter(_ctx: Context) extends RefinedPrinter(_ctx) {
     decl ~~ typeText(nameIdText(tree)) ~ withEnclosingDef(tree) { toTextTemplate(impl) } ~ ""
   }
 
+  override protected def selfToText(impl: Template): Text =
+    super.selfToText(impl).provided(!impl.constr.symbol.owner.is(Module))
+
   override protected def toTextTemplate(impl: Template, ofNew: Boolean = false): Text = {
     def isSyntheticParent(sym: Symbol): Boolean = {
       sym.maybeOwner == defn.ObjectClass ||

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

@@ -640,11 +640,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
         withEnclosingDef(constr) { addVparamssText(tparamsTxt ~~ modsText, vparamss) }
       }
     val parentsText = Text(parents map constrText, keywordStr(" with "))
-    val selfText = {
-      val selfName = if (self.name == nme.WILDCARD) keywordStr("this") else self.name.toString
-      (selfName ~ optText(self.tpt)(": " ~ _) ~ " =>").close
-    } provided (!self.isEmpty && !constr.symbol.owner.is(Module))
-
+    val selfText = selfToText(impl)
     val body = if (ctx.settings.YtestPickler.value) {
       // Pickling/unpickling reorders the body members, so we need to homogenize
       val (params, rest) = impl.body partition {
@@ -661,6 +657,12 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
     prefix ~ (keywordText(" extends") provided (!ofNew && parents.nonEmpty)) ~~ parentsText ~~ bodyText
   }
 
+  protected def selfToText(impl: Template): Text = {
+    val self = impl.self
+    val selfName = if (self.name == nme.WILDCARD) keywordStr("this") else self.name.toString
+    (selfName ~ optText(self.tpt)(": " ~ _) ~ " =>").close provided (!self.isEmpty)
+  }
+
   protected def templateText(tree: TypeDef, impl: Template): Text = {
     val decl = modText(tree.mods, keywordStr(if ((tree).mods is Trait) "trait" else "class"))
     decl ~~ typeText(nameIdText(tree)) ~ withEnclosingDef(tree) { toTextTemplate(impl) } ~