Use Ref trees

Author: nicolasstucki

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

@@ -239,6 +239,11 @@ class KernelImpl(val rootContext: core.Contexts.Context, val rootPosition: util.
 
   type Ref = tpd.RefTree
 
+  def matchRef(tree: Tree)(implicit ctx: Context): Option[Ref] = tree match {
+    case x: tpd.RefTree if x.isTerm => Some(x)
+    case _ => None
+  }
+
   def Ref_apply(sym: Symbol)(implicit ctx: Context): Ref =
     withDefaultPos(ctx => tpd.ref(sym)(ctx).asInstanceOf[tpd.RefTree])
 

library/src-bootstrapped/scala/runtime/quoted/Matcher.scala

@@ -76,19 +76,16 @@ object Matcher {
         case (Literal(constant1), Literal(constant2)) if constant1 == constant2 =>
           Some(())
 
-        case (Ident(_), Ident(_)) if scrutinee.symbol == pattern.symbol || env((scrutinee.symbol, pattern.symbol)) =>
-          Some(())
-
         case (Typed(expr1, tpt1), Typed(expr2, tpt2)) =>
           foldMatchings(treeMatches(expr1, expr2), treeMatches(tpt1, tpt2))
 
+        case (Ident(_), Ident(_)) if scrutinee.symbol == pattern.symbol || env((scrutinee.symbol, pattern.symbol)) =>
+          Some(())
+
         case (Select(qual1, _), Select(qual2, _)) if scrutinee.symbol == pattern.symbol =>
           treeMatches(qual1, qual2)
 
-        case (Ident(_), Select(_, _)) if scrutinee.symbol == pattern.symbol =>
-          Some(())
-
-        case (Select(_, _), Ident(_)) if scrutinee.symbol == pattern.symbol =>
+        case (IsRef(_), IsRef(_, _)) if scrutinee.symbol == pattern.symbol =>
           Some(())
 
         case (Apply(fn1, args1), Apply(fn2, args2)) if fn1.symbol == fn2.symbol =>

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

@@ -295,6 +295,8 @@ trait Kernel {
   /** Tree representing a reference to definition */
   type Ref <: Term
 
+  def matchRef(tree: Tree)(implicit ctx: Context): Option[Ref]
+
   def Ref_apply(sym: Symbol)(implicit ctx: Context): Ref
 
   /** Tree representing a reference to definition with a given name */

library/src/scala/tasty/reflect/TreeOps.scala

@@ -187,6 +187,11 @@ trait TreeOps extends Core {
       kernel.matchTerm(tree)
   }
 
+  object IsRef {
+    /** Matches any Ref and returns it */
+    def unapply(tree: Tree)(implicit ctx: Context): Option[Ref] = kernel.matchRef(tree)
+  }
+
   object Ref {
 
     /** Create a reference tree */