fixed given name generation for annotated types #SCL-22193 fixed

Author: SrTobi

scala/scala-impl/src/org/jetbrains/plugins/scala/lang/psi/ScalaPsiUtil.scala

@@ -1709,6 +1709,7 @@ object ScalaPsiUtil {
       case ScParameterizedTypeElement(base, args) if isRoot => (transform(isRoot)(base) +: args.map(transformInner)).mkString("_")
       case ScParameterizedTypeElement(base, _) => transformInner(base)
       case e: ScTypeVariableTypeElement => e.name
+      case e: ScAnnotTypeElement => transform(isRoot)(e.typeElement)
       case ScCompoundTypeElement(tes, _) if isRoot =>
         tes
           .take(2) // we take two elements at most, (A with B with C) means (A with (B with C)), so C is too deep

scala/scala-impl/test/org/jetbrains/plugins/scala/lang/psi/GenerateGivenNameTest.scala

@@ -72,6 +72,19 @@ object GenerateGivenNameTest extends GeneratedTestSuiteFactory {
         |""".stripMargin,
       "given_Byte_Short_Int"
     ),
+    GivenNameTestData(
+      """
+        |given [email protected] = ???
+        |""".stripMargin,
+      "given_Int"
+    ),
+    GivenNameTestData(
+      """
+        |trait Test[A]
+        |given (Test[Int]@java.lang.Deprecated)@java.lang.Deprecated = ???
+        |""".stripMargin,
+      "given_Test_Int"
+    ),
 
     //////////////////// functions /////////////////
     GivenNameTestData(