Address review

Author: liufengyun

compiler/src/dotty/tools/dotc/tastyreflect/KernelImpl.scala

@@ -1427,6 +1427,10 @@ class KernelImpl(val rootContext: core.Contexts.Context, val rootPosition: util.
   def Symbol_isAbstractType(self: Symbol)(implicit ctx: Context): Boolean = self.isAbstractType
   def Symbol_isClassConstructor(self: Symbol)(implicit ctx: Context): Boolean = self.isClassConstructor
 
+  def Symbol_isType(self: Symbol)(implicit ctx: Context): Boolean = self.isType
+
+  def Symbol_isTerm(self: Symbol)(implicit ctx: Context): Boolean = self.isTerm
+
   type PackageDefSymbol = core.Symbols.Symbol
 
   def matchPackageDefSymbol(symbol: Symbol)(implicit ctx: Context): Option[PackageDefSymbol] =

library/src/scala/quoted/Toolbox.scala

@@ -33,7 +33,7 @@ object Toolbox {
   }
 
   /** Setting of the Toolbox instance. */
-  case class Settings private (val outDir: Option[String], val showRawTree: Boolean, val compilerArgs: List[String], val color: Boolean)
+  case class Settings private (outDir: Option[String], showRawTree: Boolean, compilerArgs: List[String], color: Boolean)
 
   object Settings {
 

library/src/scala/tasty/reflect/Kernel.scala

@@ -699,7 +699,7 @@ trait Kernel {
   //
   // PATTERNS
   //
-  
+
   /** Pattern tree of the pattern part of a CaseDef */
   type Pattern <: AnyRef
 
@@ -1169,6 +1169,10 @@ trait Kernel {
 
   def Symbol_isDefinedInCurrentRun(self: Symbol)(implicit ctx: Context): Boolean
 
+  def Symbol_isType(self: Symbol)(implicit ctx: Context): Boolean
+
+  def Symbol_isTerm(self: Symbol)(implicit ctx: Context): Boolean
+
   /** Symbol of a package definition */
   type PackageDefSymbol <: Symbol
 

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

@@ -1360,7 +1360,7 @@ trait Printers
             case tpe @ Type.SymRef(IsClassDefSymbol(sym), _) if sym.name.endsWith("$") =>
               printType(tpe)
               this += ".type"
-            case tpe @ Type.SymRef(sym, _) if !IsTypeSymbol.unapply(sym).nonEmpty =>
+            case tpe @ Type.SymRef(sym, _) if sym.isTerm =>
               printType(tpe)
               this += ".type"
             case tpe => printType(tpe)
@@ -1445,7 +1445,7 @@ trait Printers
         case Type.ConstantType(const) =>
           printConstant(const)
 
-        case Type.SymRef(sym, prefix) if IsTypeSymbol.unapply(sym).nonEmpty =>
+        case Type.SymRef(sym, prefix) if sym.isType =>
           prefix match {
             case Type.ThisType(Types.EmptyPackage() | Types.RootPackage()) =>
             case NoPrefix() =>
@@ -1464,7 +1464,7 @@ trait Printers
           }
           this += highlightTypeDef(sym.name.stripSuffix("$"), color)
 
-        case Type.SymRef(sym, prefix) if !IsTypeSymbol.unapply(sym).nonEmpty =>
+        case Type.SymRef(sym, prefix) if sym.isTerm =>
           prefix match {
             case NoPrefix() =>
                 this += highlightTypeDef(sym.name, color)

library/src/scala/tasty/reflect/SymbolOps.scala

@@ -82,6 +82,9 @@ trait SymbolOps extends Core {
     def isAnonymousFunction(implicit ctx: Context): Boolean = kernel.Symbol_isAnonymousFunction(self)
     def isAbstractType(implicit ctx: Context): Boolean = kernel.Symbol_isAbstractType(self)
     def isClassConstructor(implicit ctx: Context): Boolean = kernel.Symbol_isClassConstructor(self)
+
+    def isType(implicit ctx: Context): Boolean = kernel.Symbol_isType(self)
+    def isTerm(implicit ctx: Context): Boolean = kernel.Symbol_isTerm(self)
   }
 
   // PackageSymbol

tests/pos/i2104b.decompiled

@@ -10,14 +10,14 @@ case class Pair[A, B](_1: A, _2: B) {
     acc = scala.runtime.Statics.mix(acc, scala.runtime.Statics.anyHash(Pair.this._2))
     scala.runtime.Statics.finalizeHash(acc, 2)
   }
-  override def equals(x$0: scala.Any): scala.Boolean = Pair.this.eq(x$0.$asInstanceOf$[java.lang.Object]).||(x$0 match {
-    case x$0: Pair[A, B] @scala.unchecked =>
+  override def equals(x$0: scala.Any): scala.Boolean = Pair.this.eq(x$0.asInstanceOf[java.lang.Object]).||(x$0 match {
+    case x$0: Pair[Pair.this.A, Pair.this.B] @scala.unchecked =>
       Pair.this._1.==(x$0._1).&&(Pair.this._2.==(x$0._2))
     case _ =>
       false
   })
   override def toString(): java.lang.String = scala.runtime.ScalaRunTime._toString(Pair.this)
-  override def canEqual(that: scala.Any): scala.Boolean = that.isInstanceOf[Pair[A, B] @scala.unchecked]
+  override def canEqual(that: scala.Any): scala.Boolean = that.isInstanceOf[Pair[Pair.this.A, Pair.this.B] @scala.unchecked]
   override def productArity: scala.Int = 2
   override def productPrefix: java.lang.String = "Pair"
   override def productElement(n: scala.Int): scala.Any = n match {

tests/pos/simpleCaseClass-3.decompiled

@@ -4,14 +4,14 @@ case class A[T](x: T) {
     acc = scala.runtime.Statics.mix(acc, scala.runtime.Statics.anyHash(A.this.x))
     scala.runtime.Statics.finalizeHash(acc, 1)
   }
-  override def equals(x$0: scala.Any): scala.Boolean = A.this.eq(x$0.$asInstanceOf$[java.lang.Object]).||(x$0 match {
-    case x$0: A[T] @scala.unchecked =>
+  override def equals(x$0: scala.Any): scala.Boolean = A.this.eq(x$0.asInstanceOf[java.lang.Object]).||(x$0 match {
+    case x$0: A[A.this.T] @scala.unchecked =>
       A.this.x.==(x$0.x)
     case _ =>
       false
   })
   override def toString(): java.lang.String = scala.runtime.ScalaRunTime._toString(A.this)
-  override def canEqual(that: scala.Any): scala.Boolean = that.isInstanceOf[A[T] @scala.unchecked]
+  override def canEqual(that: scala.Any): scala.Boolean = that.isInstanceOf[A[A.this.T] @scala.unchecked]
   override def productArity: scala.Int = 1
   override def productPrefix: java.lang.String = "A"
   override def productElement(n: scala.Int): scala.Any = n match {