Navigate the AST within AnnotatedType and ImportType

Related to #13624

Author: tgodzik

compiler/src/dotty/tools/dotc/ast/NavigateAST.scala

@@ -5,6 +5,9 @@ import core.Contexts._
 import core.Decorators._
 import util.Spans._
 import Trees.{MemberDef, DefTree, WithLazyField}
+import dotty.tools.dotc.core.Annotations.ConcreteAnnotation
+import dotty.tools.dotc.core.Types.AnnotatedType
+import dotty.tools.dotc.core.Types.ImportType
 
 /** Utility functions to go from typed to untyped ASTs */
 // TODO: Handle trees with mixed source files
@@ -98,7 +101,20 @@ object NavigateAST {
         }
         childPath(p.productIterator, p :: path)
       }
-      else path
+      else {
+        p match {
+          case t: untpd.TypeTree =>
+            t.typeOpt match {
+              case ann: AnnotatedType =>
+                childPath(ann.annot.tree.productIterator, path)
+              case imp: ImportType =>
+                childPath(imp.expr.productIterator, path)
+              case _ =>
+                path
+            }
+          case _ => path
+        }
+      }
     singlePath(from, Nil)
   }
 }

language-server/test/dotty/tools/languageserver/CompletionTest.scala

@@ -895,4 +895,21 @@ class CompletionTest {
   @Test def i12465_hkt_alias: Unit =
     code"""???.asInstanceOf[Seq].${m1}""".withSource
       .completion(m1, Set())
-}
+
+  @Test def i13624_annotType: Unit =
+    code"""|class MyAnnotation extends annotation.StaticAnnotation
+           |val x = 1: @MyAnnot${m1}
+           |type X = Int @MyAnnot${m2}""".withSource
+      .completion(
+        m1,
+        Set(
+          ("MyAnnotation", Class, "MyAnnotation"),
+          ("MyAnnotation", Module, "MyAnnotation")
+        )
+      ).completion(
+        m2,
+        Set(
+          ("MyAnnotation", Class, "MyAnnotation"),
+          ("MyAnnotation", Module, "MyAnnotation")
+        )
+      )}