Mover termRef/typeRef and friends up to Denotation.

Needed for implicit search, because some implicits might be UniqueRefs, not SymDenotations

1 files changed, 30 insertions, 0 deletions

diff --git a/src/dotty/tools/dotc/core/Denotations.scala b/src/dotty/tools/dotc/core/Denotations.scala
index f2df71627..e6d5023e5 100644
--- a/src/dotty/tools/dotc/core/Denotations.scala
+++ b/src/dotty/tools/dotc/core/Denotations.scala
@@ -392,6 +392,36 @@ object Denotations {
     def atSignature(sig: Signature)(implicit ctx: Context): SingleDenotation =
       if (sig matches signature) this else NoDenotation
 
+    // ------ Forming types -------------------------------------------
+
+    /** The TypeRef representing this type denotation at its original location. */
+    def typeRef(implicit ctx: Context): TypeRef =
+      TypeRef(symbol.owner.thisType, symbol.name.asTypeName, this)
+
+    /** The TermRef representing this term denotation at its original location. */
+    def termRef(implicit ctx: Context): TermRef =
+      TermRef(symbol.owner.thisType, symbol.name.asTermName, this)
+
+    /** The TermRef representing this term denotation at its original location
+     *  and at signature `NotAMethod`.
+     */
+    def valRef(implicit ctx: Context): TermRef =
+      TermRef.withSig(symbol.owner.thisType, symbol.name.asTermName, Signature.NotAMethod, this)
+
+    /** The TermRef representing this term denotation at its original location
+     *  at the denotation's signature.
+     *  @note  Unlike `valRef` and `termRef`, this will force the completion of the
+     *         denotation via a call to `info`.
+     */
+    def termRefWithSig(implicit ctx: Context): TermRef =
+      TermRef.withSig(symbol.owner.thisType, symbol.name.asTermName, signature, this)
+
+    /** The NamedType representing this denotation at its original location.
+     *  Same as either `typeRef` or `termRefWithSig` depending whether this denotes a type or not.
+     */
+    def namedType(implicit ctx: Context): NamedType =
+      if (isType) typeRef else termRefWithSig
+
     // ------ Transformations -----------------------------------------
 
     private[this] var myValidFor: Period = Nowhere