Remove printTopLevelTree and replace it with printStat

gzm0 · gzm0 · commit a0f0f72705c0 · 2023-12-30T15:56:06.000+01:00
diff --git a/linker/shared/src/main/scala/org/scalajs/linker/backend/BasicLinkerBackend.scala b/linker/shared/src/main/scala/org/scalajs/linker/backend/BasicLinkerBackend.scala
@@ -283,7 +283,7 @@ private object BasicLinkerBackend {
       val jsCodeWriter = new ByteArrayWriter()
       val printer = new Printers.JSTreePrinter(jsCodeWriter)
 
-      printer.printTopLevelTree(tree)
+      printer.printStat(tree)
 
       new PrintedTree(jsCodeWriter.toByteArray(), SourceMapWriter.Fragment.Empty)
     }
@@ -321,7 +321,7 @@ private object BasicLinkerBackend {
       val smFragmentBuilder = new SourceMapWriter.FragmentBuilder()
       val printer = new Printers.JSTreePrinterWithSourceMap(jsCodeWriter, smFragmentBuilder)
 
-      printer.printTopLevelTree(tree)
+      printer.printStat(tree)
       smFragmentBuilder.complete()
 
       new PrintedTree(jsCodeWriter.toByteArray(), smFragmentBuilder.result())
diff --git a/linker/shared/src/main/scala/org/scalajs/linker/backend/javascript/Printers.scala b/linker/shared/src/main/scala/org/scalajs/linker/backend/javascript/Printers.scala
@@ -64,10 +64,6 @@ object Printers {
       newIndentArray
     }
 
-    def printTopLevelTree(tree: Tree): Unit = {
-      printStat(tree)
-    }
-
     private def printRow(ts: List[Tree], start: Char, end: Char): Unit = {
       print(start)
       var rest = ts
@@ -121,7 +117,7 @@ object Printers {
       printRow(args, '(', ')')
 
     /** Prints a stat including leading indent and trailing newline. */
-    private def printStat(tree: Tree): Unit = {
+    final def printStat(tree: Tree): Unit = {
       printIndent()
       printTree(tree, isStat = true)
       println()
diff --git a/linker/shared/src/test/scala/org/scalajs/linker/backend/javascript/PrintersTest.scala b/linker/shared/src/test/scala/org/scalajs/linker/backend/javascript/PrintersTest.scala
@@ -33,7 +33,7 @@ class PrintersTest {
   private def assertPrintEquals(expected: String, tree: Tree): Unit = {
     val out = new ByteArrayWriter
     val printer = new Printers.JSTreePrinter(out)
-    printer.printTopLevelTree(tree)
+    printer.printStat(tree)
     assertEquals(expected.stripMargin.trim + "\n",
         new String(out.toByteArray(), StandardCharsets.UTF_8))
   }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class PrintersTest {`
`33`	`33`	`private def assertPrintEquals(expected: String, tree: Tree): Unit = {`
`34`	`34`	`val out = new ByteArrayWriter`
`35`	`35`	`val printer = new Printers.JSTreePrinter(out)`
`36`		`- printer.printTopLevelTree(tree)`
	`36`	`+ printer.printStat(tree)`
`37`	`37`	`assertEquals(expected.stripMargin.trim + "\n",`
`38`	`38`	`new String(out.toByteArray(), StandardCharsets.UTF_8))`
`39`	`39`	`}`