fix TastyPrinter for betasty

Author: jchyb

compiler/src/dotty/tools/dotc/core/tasty/TastyAnsiiPrinter.scala

@@ -2,9 +2,9 @@ package dotty.tools.dotc
 package core
 package tasty
 
-class TastyAnsiiPrinter(bytes: Array[Byte], testPickler: Boolean, isBestEffortTasty: Boolean = false) extends TastyPrinter(bytes, testPickler, isBestEffortTasty) {
+class TastyAnsiiPrinter(bytes: Array[Byte], isBestEffortTasty: Boolean, testPickler: Boolean) extends TastyPrinter(bytes, isBestEffortTasty, testPickler) {
 
-  def this(bytes: Array[Byte]) = this(bytes, testPickler = false)
+  def this(bytes: Array[Byte]) = this(bytes, isBestEffortTasty = false, testPickler = false)
 
   override protected def nameStr(str: String): String = Console.MAGENTA + str + Console.RESET
   override protected def treeStr(str: String): String = Console.YELLOW + str + Console.RESET

compiler/src/dotty/tools/dotc/core/tasty/TastyHTMLPrinter.scala

@@ -2,7 +2,7 @@ package dotty.tools.dotc
 package core
 package tasty
 
-class TastyHTMLPrinter(bytes: Array[Byte]) extends TastyPrinter(bytes, isBestEffortTasty = false) {
+class TastyHTMLPrinter(bytes: Array[Byte]) extends TastyPrinter(bytes, isBestEffortTasty = false, testPickler = false) {
   override protected def nameStr(str: String): String = s"<span class='name'>$str</span>"
   override protected def treeStr(str: String): String = s"<span class='tree'>$str</span>"
   override protected def lengthStr(str: String): String = s"<span class='length'>$str</span>"

compiler/src/dotty/tools/dotc/core/tasty/TastyPrinter.scala

@@ -23,12 +23,12 @@ import dotty.tools.dotc.classpath.FileUtils.hasTastyExtension
 object TastyPrinter:
 
   def showContents(bytes: Array[Byte], noColor: Boolean): String =
-    showContents(bytes, noColor, testPickler = false, isBestEffortTasty = false)
+    showContents(bytes, noColor, isBestEffortTasty = false, testPickler = false)
 
-  def showContents(bytes: Array[Byte], noColor: Boolean, testPickler: Boolean = false, isBestEffortTasty: Boolean = false): String =
+  def showContents(bytes: Array[Byte], noColor: Boolean, isBestEffortTasty: Boolean, testPickler: Boolean = false): String =
     val printer =
-      if noColor then new TastyPrinter(bytes, testPickler)
-      else new TastyAnsiiPrinter(bytes, testPickler)
+      if noColor then new TastyPrinter(bytes, isBestEffortTasty, testPickler)
+      else new TastyAnsiiPrinter(bytes, isBestEffortTasty, testPickler)
     printer.showContents()
 
   def main(args: Array[String]): Unit = {
@@ -43,7 +43,7 @@ object TastyPrinter:
       println(line)
       println(fileName)
       println(line)
-      println(showContents(bytes, noColor, isBestEffortTasty))
+      println(showContents(bytes, noColor, isBestEffortTasty, testPickler = false))
       println()
       printLastLine = true
     for arg <- args do
@@ -71,9 +71,9 @@ object TastyPrinter:
       println(line)
   }
 
-class TastyPrinter(bytes: Array[Byte], val testPickler: Boolean, isBestEffortTasty: Boolean = false) {
+class TastyPrinter(bytes: Array[Byte], isBestEffortTasty: Boolean, val testPickler: Boolean) {
 
-  def this(bytes: Array[Byte]) = this(bytes, testPickler = false, isBestEffortTasty = false)
+  def this(bytes: Array[Byte]) = this(bytes, isBestEffortTasty = false, testPickler = false)
 
   class TastyPrinterUnpickler extends TastyUnpickler(bytes, isBestEffortTasty) {
     var namesStart: Addr = uninitialized
@@ -133,7 +133,7 @@ class TastyPrinter(bytes: Array[Byte], val testPickler: Boolean, isBestEffortTas
     })
 
   class TreeSectionUnpickler(sb: StringBuilder) extends PrinterSectionUnpickler[Unit](ASTsSection) {
-    import dotty.tools.tasty.TastyFormat.*
+    import dotty.tools.tasty.besteffort.BestEffortTastyFormat.* // superset on TastyFormat
     def unpickle0(reader: TastyReader)(using refs: NameRefs): Unit = {
       import reader.*
       var indent = 0

compiler/src/dotty/tools/dotc/transform/Pickler.scala

@@ -369,7 +369,7 @@ class Pickler extends Phase {
             if ctx.settings.YtestPickler.value then
               pickledBytes(cls) = (unit, pickled)
               if ctx.settings.YtestPicklerCheck.value then
-                printedTasty(cls) = TastyPrinter.showContents(pickled, noColor = true, testPickler = true)
+                printedTasty(cls) = TastyPrinter.showContents(pickled, noColor = true, isBestEffortTasty = false, testPickler = true)
             () => pickled
 
         unit.pickled += (cls -> demandPickled)

presentation-compiler/src/main/dotty/tools/pc/TastyUtils.scala

@@ -21,7 +21,7 @@ object TastyUtils:
 
   private def normalTasty(tastyURI: URI): String =
     val tastyBytes = Files.readAllBytes(Paths.get(tastyURI))
-    new TastyPrinter(tastyBytes.nn, isBestEffortTasty = false).showContents()
+    new TastyPrinter(tastyBytes.nn, isBestEffortTasty = false, testPickler = false).showContents()
 
   private def htmlTasty(
       tastyURI: URI,