-YprintUser object instead of final module class with lazy val

Author: nicolasstucki

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

@@ -486,7 +486,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
           modText(tree.mods, keywordStr(if (tree.mods is Mutable) "var" else "val")) ~~
           valDefText(nameIdText(tree)) ~ optAscription(tpt) ~
           withEnclosingDef(tree) { optText(tree.rhs)(" = " ~ _) }
-        }
+        }.provided(!YprintUser || !tree.symbol.is(Module))
       case tree @ DefDef(name, tparams, vparamss, tpt, _) =>
         dclTextOr {
           val printLambda = tree.symbol.isAnonymousFunction && YprintUser
@@ -504,8 +504,10 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
           }
         def recur(rhs: Tree, tparamsTxt: => Text): Text = rhs match {
           case impl: Template =>
-            modText(tree.mods, keywordStr(if ((tree).mods is Trait) "trait" else "class")) ~~
-            typeText(nameIdText(tree)) ~ withEnclosingDef(tree) { toTextTemplate(impl) } ~
+            val decl =
+              if (!YprintUser || !tree.mods.is(Module)) modText(tree.mods, keywordStr(if ((tree).mods is Trait) "trait" else "class"))
+              else modText(tree.mods &~ (Final | Module), keywordStr("object"))
+            decl ~~ typeText(nameIdText(tree)) ~ withEnclosingDef(tree) { toTextTemplate(impl) } ~
             (if (tree.hasType && ctx.settings.verbose.value) i"[decls = ${tree.symbol.info.decls}]" else "")
           case rhs: TypeBoundsTree =>
             typeDefText(tparamsTxt, toText(rhs))