Split NameRef into TermName and TypeName

Author: nicolasstucki

compiler/src/dotty/tools/dotc/tasty/TastyImpl.scala

@@ -578,11 +578,22 @@ object TastyImpl extends scala.tasty.Tasty {
     }
   }
 
-  val NameRef: NameRefExtractor = new NameRefExtractor {
+  val TermRef: TermRefExtractor = new TermRefExtractor {
     def unapply(x: Type)(implicit ctx: Context): Option[(String, TypeOrBounds /* Type | NoPrefix */)] = x match {
       case tp: Types.NamedType =>
         tp.designator match {
-          case name: Names.Name => Some(name.toString, tp.prefix)
+          case name: Names.TermName => Some(name.toString, tp.prefix)
+          case _ => None
+        }
+      case _ => None
+    }
+  }
+
+  val TypeRef: TypeRefExtractor = new TypeRefExtractor {
+    def unapply(x: Type)(implicit ctx: Context): Option[(String, TypeOrBounds /* Type | NoPrefix */)] = x match {
+      case tp: Types.NamedType =>
+        tp.designator match {
+          case name: Names.TypeName => Some(name.toString, tp.prefix)
           case _ => None
         }
       case _ => None

library/src/scala/tasty/Tasty.scala

@@ -439,8 +439,13 @@ abstract class Tasty {
     def unapply(x: Type)(implicit ctx: Context): Option[(Definition, TypeOrBounds /* Type | NoPrefix */)]
   }
 
-  val NameRef: NameRefExtractor
-  abstract class NameRefExtractor {
+  val TermRef: TermRefExtractor
+  abstract class TermRefExtractor {
+    def unapply(x: Type)(implicit ctx: Context): Option[(String, TypeOrBounds /* Type | NoPrefix */)]
+  }
+
+  val TypeRef: TypeRefExtractor
+  abstract class TypeRefExtractor {
     def unapply(x: Type)(implicit ctx: Context): Option[(String, TypeOrBounds /* Type | NoPrefix */)]
   }
 

library/src/scala/tasty/util/TastyPrinter.scala

@@ -481,8 +481,12 @@ class TastyPrinter[T <: Tasty with Singleton](val tasty: T) {
       buff append ", "
       visitType(qual)
       buff append ")"
-    case NameRef(name, qual) =>
-      buff append "NameRef(" append name append ", "
+    case TermRef(name, qual) =>
+      buff append "TermRef(" append name append ", "
+      visitType(qual)
+      buff append ")"
+    case TypeRef(name, qual) =>
+      buff append "TypeRef(" append name append ", "
       visitType(qual)
       buff append ")"
     case Refinement(parent, name, info) =>

tests/pos/tasty/definitions.scala

@@ -122,8 +122,8 @@ object definitions {
 
     case class ConstantType(value: Constant) extends Type
     case class SymRef(sym: Definition, qualifier: Type | NoPrefix = NoPrefix) extends Type
-    case class TypeNameRef(name: String, qualifier: Type | NoPrefix = NoPrefix) extends Type // NoPrefix means: select from _root_
-    case class TermNameRef(name: String, qualifier: Type | NoPrefix = NoPrefix) extends Type // NoPrefix means: select from _root_
+    case class TypeRef(name: String, qualifier: Type | NoPrefix = NoPrefix) extends Type // NoPrefix means: select from _root_
+    case class TermRef(name: String, qualifier: Type | NoPrefix = NoPrefix) extends Type // NoPrefix means: select from _root_
     case class SuperType(thistp: Type, underlying: Type) extends Type
     case class Refinement(underlying: Type, name: String, tpe: Type | TypeBounds) extends Type
     case class AppliedType(tycon: Type, args: List[Type | TypeBounds]) extends Type