[Analysis API] Handle ConeFlexibleType when parsing to KaAnnotationValue

JetBrains · Aug 2, 2024 · afbb511 · afbb511
1 parent bd222b7
commit afbb511
Show file tree

Hide file tree

Showing 8 changed files with 97 additions and 1 deletion.
diff --git a/...erated/cases/symbols/Fe10IdeNormalAnalysisSourceModuleSymbolByReferenceTestGenerated.java b/...erated/cases/symbols/Fe10IdeNormalAnalysisSourceModuleSymbolByReferenceTestGenerated.java
diff --git a/...api-fir/src/org/jetbrains/kotlin/analysis/api/fir/evaluate/FirAnnotationValueConverter.kt b/...api-fir/src/org/jetbrains/kotlin/analysis/api/fir/evaluate/FirAnnotationValueConverter.kt
@@ -183,7 +183,7 @@ internal object FirAnnotationValueConverter {
             }
 
             is FirGetClassCall -> {
-                val coneType = getTargetType()?.fullyExpandedType(session)
+                val coneType = getTargetType()?.fullyExpandedType(session)?.lowerBoundIfFlexible()
 
                 if (coneType is ConeClassLikeType && coneType !is ConeErrorType) {
                     val classId = coneType.lookupTag.classId

diff --git a/...nerated/cases/symbols/FirIdeNormalAnalysisSourceModuleSymbolByReferenceTestGenerated.java b/...nerated/cases/symbols/FirIdeNormalAnalysisSourceModuleSymbolByReferenceTestGenerated.java
diff --git a/.../cases/symbols/FirStandaloneNormalAnalysisSourceModuleSymbolByReferenceTestGenerated.java b/.../cases/symbols/FirStandaloneNormalAnalysisSourceModuleSymbolByReferenceTestGenerated.java
diff --git a/...ysis/analysis-api/testData/symbols/symbolByReference/javaNestedAnnotation.descriptors.txt b/...ysis/analysis-api/testData/symbols/symbolByReference/javaNestedAnnotation.descriptors.txt
@@ -0,0 +1,30 @@
+KaNamedClassSymbol:
+  annotations: []
+  classId: JavaClass
+  classKind: CLASS
+  companionObject: null
+  compilerVisibility: Unknown
+  contextReceivers: []
+  isActual: false
+  isData: false
+  isExpect: false
+  isExternal: false
+  isFun: false
+  isInline: false
+  isInner: false
+  location: TOP_LEVEL
+  modality: OPEN
+  name: JavaClass
+  origin: JAVA_SOURCE
+  superTypes: [
+    KaUsualClassType:
+      annotations: []
+      typeArguments: []
+      type: kotlin/Any
+  ]
+  typeParameters: []
+  visibility: UNKNOWN
+  getContainingFileSymbol: null
+  getContainingModule: KaSourceModule "Sources of main"
+  annotationApplicableTargets: null
+  deprecationStatus: null
diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/javaNestedAnnotation.kt b/analysis/analysis-api/testData/symbols/symbolByReference/javaNestedAnnotation.kt
@@ -0,0 +1,14 @@
+// MODULE: main
+// FILE: JavaClass.java
+import java.lang.annotation.*;
+
+@Target(ElementType.TYPE_USE)
+@interface MyAnnotation {
+  Class<?> typeParam();
+}
+class JavaClass extends @MyAnnotation(typeParam = String.class) Object {}
+
+// FILE: main.kt
+fun test() {
+  val x: J<caret>avaClass = TODO()
+}
diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/javaNestedAnnotation.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByReference/javaNestedAnnotation.pretty.txt
@@ -0,0 +1 @@
+open class JavaClass
diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/javaNestedAnnotation.txt b/analysis/analysis-api/testData/symbols/symbolByReference/javaNestedAnnotation.txt
@@ -0,0 +1,33 @@
+KaNamedClassSymbol:
+  annotations: []
+  classId: JavaClass
+  classKind: CLASS
+  companionObject: null
+  compilerVisibility: PackageVisibility
+  contextReceivers: []
+  isActual: false
+  isData: false
+  isExpect: false
+  isExternal: false
+  isFun: false
+  isInline: false
+  isInner: false
+  location: TOP_LEVEL
+  modality: OPEN
+  name: JavaClass
+  origin: JAVA_SOURCE
+  superTypes: [
+    KaUsualClassType:
+      annotations: [
+        MyAnnotation(typeParam = kotlin.String::class)
+          psi: null
+      ]
+      typeArguments: []
+      type: @R|MyAnnotation|(typeParam = <getClass>(<getClass>(R|kotlin/String!|)))  kotlin/Any
+  ]
+  typeParameters: []
+  visibility: PACKAGE_PRIVATE
+  getContainingFileSymbol: null
+  getContainingModule: KaSourceModule "Sources of main"
+  annotationApplicableTargets: null
+  deprecationStatus: null