wip

Author: nicolasstucki

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

@@ -1114,6 +1114,8 @@ class ReflectionCompilerInterface(val rootContext: core.Contexts.Context) extend
 
   def Type_typeSymbol(self: Type) given Context: Symbol = self.typeSymbol
 
+  def Type_termSymbol(self: Type) given Context: Symbol = self.termSymbol
+
   def Type_isSingleton(self: Type) given Context: Boolean = self.isSingleton
 
   def Type_memberType(self: Type)(member: Symbol) given Context: Type =

library/src/scala/tasty/reflect/CompilerInterface.scala

@@ -882,6 +882,8 @@ trait CompilerInterface {
 
   def Type_typeSymbol(self: Type) given (ctx: Context): Symbol
 
+  def Type_termSymbol(self: Type) given (ctx: Context): Symbol
+
   def Type_isSingleton(self: Type) given (ctx: Context): Boolean
 
   def Type_memberType(self: Type)(member: Symbol) given (ctx: Context): Type

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

@@ -308,8 +308,8 @@ trait Printers
       def visitType(x: TypeOrBounds): Buffer = x match {
         case Type.ConstantType(value) =>
           this += "Type.ConstantType(" += value += ")"
-        case Type.TermRef(sym, qual) =>
-          this += "Type.TermRef(" += sym += ", " += qual += ")"
+        case Type.TermRef(qual, name) =>
+          this += "Type.TermRef(" += qual+= ", " += name += ")"
         case Type.TypeRef(sym, qual) =>
           this += "Type.TypeRef(" += sym += ", " += qual += ")"
         case Type.NamedTermRef(name, qual) =>
@@ -1519,8 +1519,9 @@ trait Printers
         case Type.ConstantType(const) =>
           printConstant(const)
 
-        case Type.TypeRef(sym, prefix) =>
-          prefix match {
+        case Type.IsTypeRef(tpe) =>
+          val sym = tpe.typeSymbol
+          tpe.qualifier match {
             case Type.ThisType(Types.EmptyPackage() | Types.RootPackage()) =>
             case NoPrefix() =>
               if (sym.owner.flags.is(Flags.Package)) {
@@ -1529,7 +1530,7 @@ trait Printers
                 if (packagePath != "")
                   this += packagePath += "."
               }
-            case IsType(prefix @ Type.TermRef(IsClassDefSymbol(_), _)) =>
+            case Type.IsTermRef(prefix) if prefix.termSymbol.isClass =>
               printType(prefix)
               this += "#"
             case IsType(prefix @ Type.TypeRef(IsClassDefSymbol(_), _)) =>

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

@@ -85,6 +85,7 @@ trait SymbolOps extends Core {
 
     def isType given (ctx: Context): Boolean = internal.matchTypeSymbol(self).isDefined
     def isTerm given (ctx: Context): Boolean = internal.matchTermSymbol(self).isDefined
+    def isClass given (ctx: Context): Boolean = internal.matchClassDefSymbol(self).isDefined
   }
 
   // PackageSymbol

library/src/scala/tasty/reflect/TypeOrBoundsOps.scala

@@ -20,6 +20,7 @@ trait TypeOrBoundsOps extends Core {
 
     def classSymbol given (ctx: Context): Option[ClassDefSymbol] = internal.Type_classSymbol(self)
     def typeSymbol given (ctx: Context): Symbol = internal.Type_typeSymbol(self)
+    def termSymbol given (ctx: Context): Symbol = internal.Type_termSymbol(self)
     def isSingleton given (ctx: Context): Boolean = internal.Type_isSingleton(self)
     def memberType(member: Symbol) given (ctx: Context): Type = internal.Type_memberType(self)(member)
 
@@ -84,8 +85,8 @@ trait TypeOrBoundsOps extends Core {
     }
 
     object TermRef {
-      def unapply(typeOrBounds: TypeOrBounds) given (ctx: Context): Option[(Symbol, TypeOrBounds /* Type | NoPrefix */)] =
-        internal.matchTermRef_unapply(typeOrBounds)
+      def unapply(typeOrBounds: TypeOrBounds) given (ctx: Context): Option[(TypeOrBounds /* Type | NoPrefix */, String)] =
+        internal.matchTermRef_unapply(typeOrBounds).map(x => (x.qu, x.name))
     }
 
    object IsTypeRef {
@@ -299,6 +300,7 @@ trait TypeOrBoundsOps extends Core {
 
   implicit class Type_TermRefAPI(self: TermRef) {
     def qualifier given (ctx: Context): TypeOrBounds /* Type | NoPrefix */ = internal.TermRef_qualifier(self)
+    def name given (ctx: Context): String = internal.TermRef_name(self)
   }
 
   implicit class Type_TypeRefAPI(self: TypeRef) {