Merge pull request #284 from olhotak/pr-annotatedtypes

fixes to handle AnnotatedTypes transparently like the types that they wrap

2 files changed, 14 insertions, 0 deletions

diff --git a/src/dotty/tools/dotc/ast/Trees.scala b/src/dotty/tools/dotc/ast/Trees.scala
index 05e3b84d7..002287076 100644
--- a/src/dotty/tools/dotc/ast/Trees.scala
+++ b/src/dotty/tools/dotc/ast/Trees.scala
@@ -266,6 +266,11 @@ object Trees {
     override def denot(implicit ctx: Context) = tpe match {
       case tpe: NamedType => tpe.denot
       case tpe: ThisType => tpe.cls.denot
+      case tpe: AnnotatedType => tpe.stripAnnots match {
+        case tpe: NamedType => tpe.denot
+        case tpe: ThisType => tpe.cls.denot
+        case _ => NoDenotation
+      }
       case _ => NoDenotation
     }
   }
diff --git a/src/dotty/tools/dotc/core/Types.scala b/src/dotty/tools/dotc/core/Types.scala
index 987014ff4..3100be9a0 100644
--- a/src/dotty/tools/dotc/core/Types.scala
+++ b/src/dotty/tools/dotc/core/Types.scala
@@ -622,6 +622,10 @@ object Types {
      */
     def stripTypeVar(implicit ctx: Context): Type = this
 
+    /** Remove all AnnotatedTypes wrapping this type.
+      */
+    def stripAnnots(implicit ctx: Context): Type = this
+
     /** Widen from singleton type to its underlying non-singleton
      *  base type by applying one or more `underlying` dereferences,
      *  Also go from => T to T.
@@ -673,6 +677,8 @@ object Types {
         if (tp1.exists) tp1.dealias else tp
       case tp: LazyRef =>
         tp.ref.dealias
+      case tp: AnnotatedType =>
+        tp.derivedAnnotatedType(tp.annot, tp.tpe.dealias)
       case tp => tp
     }
 
@@ -2502,6 +2508,9 @@ object Types {
     def derivedAnnotatedType(annot: Annotation, tpe: Type) =
       if ((annot eq this.annot) && (tpe eq this.tpe)) this
       else AnnotatedType(annot, tpe)
+
+    override def stripTypeVar(implicit ctx: Context): Type = tpe.stripTypeVar
+    override def stripAnnots(implicit ctx: Context): Type = tpe.stripAnnots
   }
 
   object AnnotatedType {