Merge pull request #6228 from dotty-staging/rename-tasty-reflect-show-extractors

Rename TASTy reflect show to showExtractors

Author: nicolasstucki

library/src/scala/tasty/reflect/Printers.scala

@@ -24,47 +24,47 @@ trait Printers
   /** Adds `show` as an extension method of a `Tree` */
   implicit class TreeShowDeco(tree: Tree) {
     /** Shows the tree as extractors */
-    def show(implicit ctx: Context): String = new ExtractorsPrinter().showTree(tree)
+    def showExtractors(implicit ctx: Context): String = new ExtractorsPrinter().showTree(tree)
     /** Shows the tree as source code */
     def showCode(implicit ctx: Context): String = new SourceCodePrinter().showTree(tree)
   }
 
   /** Adds `show` as an extension method of a `TypeOrBounds` */
   implicit class TypeOrBoundsShowDeco(tpe: TypeOrBounds) {
     /** Shows the tree as extractors */
-    def show(implicit ctx: Context): String = new ExtractorsPrinter().showTypeOrBounds(tpe)
+    def showExtractors(implicit ctx: Context): String = new ExtractorsPrinter().showTypeOrBounds(tpe)
     /** Shows the tree as source code */
     def showCode(implicit ctx: Context): String = new SourceCodePrinter().showTypeOrBounds(tpe)
   }
 
   /** Adds `show` as an extension method of a `Pattern` */
   implicit class PatternShowDeco(pattern: Pattern) {
     /** Shows the tree as extractors */
-    def show(implicit ctx: Context): String = new ExtractorsPrinter().showPattern(pattern)
+    def showExtractors(implicit ctx: Context): String = new ExtractorsPrinter().showPattern(pattern)
     /** Shows the tree as source code */
     def showCode(implicit ctx: Context): String = new SourceCodePrinter().showPattern(pattern)
   }
 
   /** Adds `show` as an extension method of a `Constant` */
   implicit class ConstantShowDeco(const: Constant) {
     /** Shows the tree as extractors */
-    def show(implicit ctx: Context): String = new ExtractorsPrinter().showConstant(const)
+    def showExtractors(implicit ctx: Context): String = new ExtractorsPrinter().showConstant(const)
     /** Shows the tree as source code */
     def showCode(implicit ctx: Context): String = new SourceCodePrinter().showConstant(const)
   }
 
   /** Adds `show` as an extension method of a `Symbol` */
   implicit class SymbolShowDeco(symbol: Symbol) {
     /** Shows the tree as extractors */
-    def show(implicit ctx: Context): String = new ExtractorsPrinter().showSymbol(symbol)
+    def showExtractors(implicit ctx: Context): String = new ExtractorsPrinter().showSymbol(symbol)
     /** Shows the tree as source code */
     def showCode(implicit ctx: Context): String = new SourceCodePrinter().showSymbol(symbol)
   }
 
   /** Adds `show` as an extension method of a `Flags` */
   implicit class FlagsShowDeco(flags: Flags) {
     /** Shows the tree as extractors */
-    def show(implicit ctx: Context): String = new ExtractorsPrinter().showFlags(flags)
+    def showExtractors(implicit ctx: Context): String = new ExtractorsPrinter().showFlags(flags)
     /** Shows the tree as source code */
     def showCode(implicit ctx: Context): String = new SourceCodePrinter().showFlags(flags)
   }
@@ -598,7 +598,7 @@ trait Printers
             case IsTerm(Select(IsNew(newTree), _)) =>
               printType(newTree.tpe)(Some(cdef.symbol))
             case IsTerm(parent) =>
-              throw new MatchError(parent.show)
+              throw new MatchError(parent.showExtractors)
           }
 
           def printSeparated(list: List[Tree /* Term | TypeTree */]): Unit = list match {
@@ -937,7 +937,7 @@ trait Printers
           printTypeTree(tpt)
 
         case _ =>
-          throw new MatchError(tree.show)
+          throw new MatchError(tree.showExtractors)
 
       }
 
@@ -1320,7 +1320,7 @@ trait Printers
             case Ident("unapply" | "unapplySeq") =>
               this += fun.symbol.owner.fullName.stripSuffix("$")
             case _ =>
-              throw new MatchError(fun.show)
+              throw new MatchError(fun.showExtractors)
           }
           inParens(printPatterns(patterns, ", "))
 
@@ -1332,7 +1332,7 @@ trait Printers
           printTypeOrBoundsTree(tpt)
 
         case _ =>
-          throw new MatchError(pattern.show)
+          throw new MatchError(pattern.showExtractors)
 
       }
 
@@ -1457,7 +1457,7 @@ trait Printers
           }
 
         case _ =>
-          throw new MatchError(tree.show)
+          throw new MatchError(tree.showExtractors)
 
       }
 
@@ -1612,7 +1612,7 @@ trait Printers
           this += highlightTypeDef("this", color)
 
         case _ =>
-          throw new MatchError(tpe.show)
+          throw new MatchError(tpe.showExtractors)
       }
 
       def printImportSelector(sel: ImportSelector): Buffer = sel match {
@@ -1647,7 +1647,7 @@ trait Printers
               case Type.TypeRef("forceInline", Types.ScalaPackage()) => false
               case _ => true
             }
-          case x => throw new MatchError(x.show)
+          case x => throw new MatchError(x.showExtractors)
         }
         printAnnotations(annots)
         if (annots.nonEmpty) this += " "

tests/run-custom-args/Yretain-trees/tasty-definitions-2/Macro_1.scala

@@ -10,9 +10,9 @@ object Foo {
   def inspectBodyImpl(x: Expr[Int])(implicit reflect: Reflection): Expr[String] = {
     import reflect._
     def definitionString(tree: Tree): Expr[String] = tree.symbol match {
-      case IsDefDefSymbol(sym) => sym.tree.show
-      case IsValDefSymbol(sym) => sym.tree.show
-      case IsBindSymbol(sym) => sym.tree.show
+      case IsDefDefSymbol(sym) => sym.tree.showExtractors
+      case IsValDefSymbol(sym) => sym.tree.showExtractors
+      case IsBindSymbol(sym) => sym.tree.showExtractors
     }
     x.unseal match {
       case Inlined(None, Nil, arg) => definitionString(arg)

tests/run-custom-args/Yretain-trees/tasty-definitions-3/Macro_1.scala

@@ -10,9 +10,9 @@ object Foo {
   def inspectBodyImpl(x: Expr[Int])(implicit reflect: Reflection): Expr[String] = {
     import reflect._
     def definitionString(tree: Tree): Expr[String] = tree.symbol match {
-      case IsDefDefSymbol(sym) => sym.tree.show
-      case IsValDefSymbol(sym) => sym.tree.show
-      case IsBindSymbol(sym) => sym.tree.show
+      case IsDefDefSymbol(sym) => sym.tree.showExtractors
+      case IsValDefSymbol(sym) => sym.tree.showExtractors
+      case IsBindSymbol(sym) => sym.tree.showExtractors
     }
     x.unseal match {
       case Inlined(None, Nil, arg) => definitionString(arg)

tests/run-custom-args/Yretain-trees/tasty-extractors-owners/quoted_1.scala

@@ -28,12 +28,12 @@ object Macros {
           case IsDefinition(tree @ DefDef(name, _, _, _, _)) =>
             buff.append(name)
             buff.append("\n")
-            buff.append(tree.symbol.owner.treeOpt.get.show)
+            buff.append(tree.symbol.owner.treeOpt.get.showExtractors)
             buff.append("\n\n")
           case IsDefinition(tree @ ValDef(name, _, _)) =>
             buff.append(name)
             buff.append("\n")
-            buff.append(tree.symbol.owner.treeOpt.get.show)
+            buff.append(tree.symbol.owner.treeOpt.get.showExtractors)
             buff.append("\n\n")
           case _ =>
         }

tests/run-custom-args/Yretain-trees/tasty-load-tree-1/quoted_1.scala

@@ -11,9 +11,9 @@ object Foo {
     import reflect._
 
     def definitionString(tree: Tree): Expr[String] = tree.symbol match {
-      case IsClassDefSymbol(sym) => sym.tree.show.toExpr
-      case IsDefDefSymbol(sym) => sym.tree.show.toExpr
-      case IsValDefSymbol(sym) => sym.tree.show.toExpr
+      case IsClassDefSymbol(sym) => sym.tree.showExtractors.toExpr
+      case IsDefDefSymbol(sym) => sym.tree.showExtractors.toExpr
+      case IsValDefSymbol(sym) => sym.tree.showExtractors.toExpr
       case _ => '{"NO DEFINTION"}
     }
 

tests/run-custom-args/Yretain-trees/tasty-load-tree-2/quoted_1.scala

@@ -11,9 +11,9 @@ object Foo {
     import reflect._
 
     def definitionString(tree: Tree): Expr[String] = tree.symbol match {
-      case IsClassDefSymbol(sym) => sym.tree.show.toExpr
-      case IsDefDefSymbol(sym) => sym.tree.show.toExpr
-      case IsValDefSymbol(sym) => sym.tree.show.toExpr
+      case IsClassDefSymbol(sym) => sym.tree.showExtractors.toExpr
+      case IsDefDefSymbol(sym) => sym.tree.showExtractors.toExpr
+      case IsValDefSymbol(sym) => sym.tree.showExtractors.toExpr
       case _ => '{"NO DEFINTION"}
     }
 

tests/run-with-compiler-custom-args/tasty-interpreter/interpreter/TreeInterpreter.scala

@@ -152,7 +152,7 @@ abstract class TreeInterpreter[R <: Reflection & Singleton](val reflect: R) {
       case Typed(expr, _)         => log("<interpretTyped>", tree)(eval(expr))
       case Repeated(elems, _)     => log("<interpretRepeated>", tree)(interpretRepeated(elems.map(elem => eval(elem))))
 
-      case _ => throw new MatchError(tree.show)
+      case _ => throw new MatchError(tree.showExtractors)
     }
   }
 
@@ -161,7 +161,7 @@ abstract class TreeInterpreter[R <: Reflection & Singleton](val reflect: R) {
       println(
         s"""#> $tag:
            |${tree.showCode}
-           |${tree.show}
+           |${tree.showExtractors}
            |
            |""".stripMargin)
     thunk

tests/run-with-compiler/tasty-consumer/Test.scala

@@ -15,7 +15,7 @@ class DBConsumer extends TastyConsumer {
 
       override def traverseTree(tree: Tree)(implicit ctx: Context): Unit = tree match {
         case IsDefinition(tree) =>
-          println(tree.show)
+          println(tree.showExtractors)
           super.traverseTree(tree)
         case tree =>
           super.traverseTree(tree)

tests/run/f-interpolation-1/FQuote_1.scala

@@ -40,7 +40,7 @@ object FQuote {
              values.forall(isStringConstant) =>
         values.collect { case Literal(Constant.String(value)) => value }
       case tree =>
-        throw new QuoteError(s"String literal expected, but ${tree.show} found")
+        throw new QuoteError(s"String literal expected, but ${tree.showExtractors} found")
     }
 
     // [a0, ...]: Any*

tests/run/i5119/Macro_1.scala

@@ -9,6 +9,6 @@ object Macro {
   implicit inline def XmlQuote(sc: => StringContext): StringContextOps = new StringContextOps(sc)
   def impl(sc: Expr[StringContext], args: Expr[Seq[Any]])(implicit reflect: Reflection): Expr[String] = {
     import reflect._
-    (sc.unseal.underlyingArgument.show + "\n" + args.unseal.underlyingArgument.show)
+    (sc.unseal.underlyingArgument.showExtractors + "\n" + args.unseal.underlyingArgument.showExtractors)
   }
 }