WIP

Author: nicolasstucki

compiler/src/dotty/tools/dotc/decompiler/DecompilationPrinter.scala

@@ -39,7 +39,7 @@ class DecompilationPrinter extends Phase {
     val unit = ctx.compilationUnit
 
     out.println(s"/** Decompiled from $unit */")
-    TastyImpl.showSourceCode.showTree(unit.tpdTree)(ctx)
+    out.print(TastyImpl.showSourceCode.showTree(unit.tpdTree)(ctx))
 
     if (ctx.settings.printTasty.value) {
       out.println("/*")

library/src/scala/tasty/util/ShowSourceCode.scala

@@ -29,7 +29,7 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
 
     def result(): String = sb.result()
 
-    def lineBreak: String = "\n" + ("  " * indent)
+    def lineBreak(): String = "\n" + ("  " * indent)
 
     def printTree(tree: Tree): Buffer = tree match {
       case tree @ PackageClause(Term.Ident(name), stats) =>
@@ -39,14 +39,14 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
         }
 
         if (name == "<empty>") {
-          printTrees(stats1, lineBreak)
+          printTrees(stats1, lineBreak())
         } else {
           this += "package " += name += " {"
           indented {
-            this += lineBreak
-            printTrees(stats1, lineBreak)
+            this += lineBreak()
+            printTrees(stats1, lineBreak())
           }
-          this += lineBreak += "}" += lineBreak
+          this += lineBreak() += "}" += lineBreak()
         }
 
       case Import(expr, selectors) =>
@@ -112,10 +112,10 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
         if (stats1.nonEmpty) {
           this += " {"
           indented {
-            this += lineBreak
-            printTrees(stats1, lineBreak)
+            this += lineBreak()
+            printTrees(stats1, lineBreak())
           }
-          this += lineBreak += "}"
+          this += lineBreak() += "}"
         }
         this
 
@@ -244,26 +244,26 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
             this += "{"
             indented {
               if (!stats.isEmpty) {
-                this += lineBreak
-                printTrees(stats, lineBreak)
+                this += lineBreak()
+                printTrees(stats, lineBreak())
               }
-              this += lineBreak
+              this += lineBreak()
               printTree(expr)
             }
-            this += lineBreak += "}"
+            this += lineBreak() += "}"
         }
 
       case Term.Inlined(call, bindings, expansion) =>
         sb.append("{ // inlined")
         indented {
           if (!bindings.isEmpty) {
-            this += lineBreak
-            printTrees(bindings, lineBreak)
+            this += lineBreak()
+            printTrees(bindings, lineBreak())
           }
-          this += lineBreak
+          this += lineBreak()
           printTree(expansion)
         }
-        this += lineBreak += "}"
+        this += lineBreak() += "}"
 
       case Term.Lambda(meth, tpt) =>
         // Printed in Term.Block branch
@@ -281,17 +281,17 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
         printTree(selector)
         this += " match {"
         indented {
-          this += lineBreak
-          printCases(cases, lineBreak)
+          this += lineBreak()
+          printCases(cases, lineBreak())
         }
-        this += lineBreak += "}"
+        this += lineBreak() += "}"
 
       case Term.Try(body, cases, finallyOpt) =>
         this += "try "
         printTree(body)
         if (cases.nonEmpty) {
           this += " catch "
-          printCases(cases, lineBreak)
+          printCases(cases, lineBreak())
         }
         finallyOpt match {
           case Some(t) =>
@@ -466,7 +466,7 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
       }
       this += " =>"
       indented {
-        this += lineBreak
+        this += lineBreak()
         printTree(body)
       }
       this
@@ -540,10 +540,10 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
         printTypeTree(tpt)
         this += " {"
         indented {
-          this += lineBreak
+          this += lineBreak()
           printTrees(refinements, "; ")
         }
-        this += lineBreak += "}"
+        this += lineBreak() += "}"
 
       case TypeTree.Applied(tpt, args) =>
         printTypeTree(tpt)