visit symbol annotations if not from scala.annotation.internal package

Author: bishabosha

compiler/src/dotty/tools/dotc/core/Definitions.scala

@@ -739,6 +739,7 @@ class Definitions {
   @tu lazy val RefiningAnnotationClass: ClassSymbol = ctx.requiredClass("scala.annotation.RefiningAnnotation")
 
   // Annotation classes
+  @tu lazy val ScalaAnnotationInternal: ClassSymbol = ctx.requiredClass("scala.annotation.internal")
   @tu lazy val AliasAnnot: ClassSymbol = ctx.requiredClass("scala.annotation.internal.Alias")
   @tu lazy val AnnotationDefaultAnnot: ClassSymbol = ctx.requiredClass("scala.annotation.internal.AnnotationDefault")
   @tu lazy val BodyAnnot: ClassSymbol = ctx.requiredClass("scala.annotation.internal.Body")

compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala

@@ -167,6 +167,12 @@ class ExtractSemanticDB extends Phase {
 
         case _ =>
 
+      for annot <- tree.symbol.annotations do
+        if annot.tree.span.exists
+          && annot.symbol.owner != defn.ScalaAnnotationInternal
+        then
+          traverse(annot.tree)
+
       tree match
         case tree: ValDef if tree.symbol.is(Module) => // skip module val
         case tree: NamedDefTree
@@ -196,6 +202,8 @@ class ExtractSemanticDB extends Phase {
         case tree: Inlined =>
           traverse(tree.call)
         case tree: PackageDef => tree.stats.foreach(traverse)
+        case tree: Annotated => // skip the annotation (see `@param` in https://github.com/scalameta/scalameta/blob/633824474e99bbfefe12ad0cc73da1fe064b3e9b/tests/jvm/src/test/resources/example/Annotations.scala#L37)
+          traverse(tree.arg)
         case _ =>
           traverseChildren(tree)
   }

tests/semanticdb/Annotations.expect.scala

@@ -4,35 +4,35 @@ import com.javacp.annot._
 import scala.annotation.meta._
 import scala.language/*=>>scalaShadowing.language.*/.experimental/*=>>scalaShadowing.language.experimental.*/.macros/*=>>scalaShadowing.language.experimental.macros.*/
 
-@ClassAnnotation
-class /*=>>java.lang.Object#`<init>`().*/Annotations/*<<=annot.Annotations#*/[@Type/*<<=annot.Annotations#`<init>`().*/ParameterAnnotation T/*<<=annot.Annotations#`<init>`().(T)*//*<<=annot.Annotations#(T)*/](@ParameterAnnotation x/*<<=annot.Annotations#`<init>`().(x)*//*<<=annot.Annotations#(x)*/: T/*=>>annot.Annotations#`<init>`().(T)*/) { self/*<<=local0*/: AnyRef/*=>>scala.AnyRef#*/ =>
-  @FieldAnnotation
+@ClassAnnotation/*=>>com.javacp.annot.ClassAnnotation#*/
+class /*=>>java.lang.Object#`<init>`().*/Annotations/*<<=annot.Annotations#*/[@Type/*<<=annot.Annotations#`<init>`().*/ParameterAnnotation/*=>>com.javacp.annot.TypeParameterAnnotation#*/ T/*<<=annot.Annotations#`<init>`().(T)*//*<<=annot.Annotations#(T)*/](@ParameterAnnotation/*=>>com.javacp.annot.ParameterAnnotation#*/ x/*<<=annot.Annotations#`<init>`().(x)*//*<<=annot.Annotations#(x)*/: T/*=>>annot.Annotations#`<init>`().(T)*/) { self/*<<=local0*/: AnyRef/*=>>scala.AnyRef#*/ =>
+  @FieldAnnotation/*=>>com.javacp.annot.FieldAnnotation#*/
   val field/*<<=annot.Annotations#field.*/ = 42
 
-  @MethodAnnotation
+  @MethodAnnotation/*=>>com.javacp.annot.MethodAnnotation#*/
   def method/*<<=annot.Annotations#method().*/ = {
-    @LocalAnnotation
+    @LocalAnnotation/*=>>com.javacp.annot.LocalAnnotation#*/
     val local/*<<=local1*/ = 42
     local/*=>>local1*/
   }
-  @TypeAnnotation
+  @TypeAnnotation/*=>>com.javacp.annot.TypeAnnotation#*/
   type S/*<<=annot.Annotations#S#*/
 }
 
-class /*=>>java.lang.Object#`<init>`().*/B/*<<=annot.B#*/ @Cons/*<<=annot.B#`<init>`().*/tructorAnnotation()(x/*<<=annot.B#`<init>`().(x)*//*<<=annot.B#(x)*/: Int/*=>>scala.Int#*/) {
-  @ConstructorAnnotation
+class /*=>>java.lang.Object#`<init>`().*/B/*<<=annot.B#*/ @Cons/*<<=annot.B#`<init>`().*/tructorAnnotation/*=>>com.javacp.annot.ConstructorAnnotation#*/()(x/*<<=annot.B#`<init>`().(x)*//*<<=annot.B#(x)*/: Int/*=>>scala.Int#*/) {
+  @ConstructorAnnotation/*=>>com.javacp.annot.ConstructorAnnotation#*/
   def this()/*<<=annot.B#`<init>`(+1).*/ = this(/*=>>annot.B#`<init>`().*/42)
 }
 
-@ObjectAnnotation
+@ObjectAnnotation/*=>>com.javacp.annot.ObjectAnnotation#*/
 object /*=>>java.lang.Object#`<init>`().*/M/*<<=annot.M.*/ {
-  /*=>>scala.package.Serializable#*//*=>>scala.*//*=>>_root_*//*=>>annot.M.*/@MacroAnnotation
+  /*=>>scala.package.Serializable#*//*=>>scala.*//*=>>_root_*//*=>>annot.M.*/@MacroAnnotation/*=>>com.javacp.annot.MacroAnnotation#*/
   def m/*<<=annot.M.m().*/[TT/*<<=annot.M.m().(TT)*/]: Int/*=>>scala.Int#*//*=>>scala.Predef.`???`().*//*=>>scala.Predef.*//*=>>scala.*//*=>>_root_*/ = macro ???
 }
 
-@TraitAnnotation
+@TraitAnnotation/*=>>com.javacp.annot.TraitAnnotation#*/
 trait T/*<<=annot.T#*/
 
 object /*=>>java.lang.Object#`<init>`().*/Alias/*<<=annot.Alias.*/ {
-  /*=>>scala.package.Serializable#*//*=>>scala.*//*=>>_root_*//*=>>annot.Alias.*/type A/*<<=annot.Alias.A#*/ = ClassAnnotation/*=>>com.javacp.annot.ClassAnnotation#*/ @param/*=>>scala.annotation.meta.param#*//*=>>scala.annotation.meta.param#`<init>`().*/
+  /*=>>scala.package.Serializable#*//*=>>scala.*//*=>>_root_*//*=>>annot.Alias.*/type A/*<<=annot.Alias.A#*/ = ClassAnnotation/*=>>com.javacp.annot.ClassAnnotation#*/ @param
 }