azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[SLC] [KAPT] KT-61916 Fix generation of annotations in annotation arguments

Browse Source
This commit is contained in:
strangepleasures
2023-09-14 13:21:07 +00:00
committed by Space Team
parent 878452bd2b
commit cf01d2970f
16 changed files with 225 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/symbolLightUtils.kt
+1 -1
View File
@@ -199,7 +199,7 @@ internal fun KtAnnotationValue.toAnnotationMemberValue(parent: PsiElement): PsiA
is KtAnnotationApplicationValue ->
SymbolLightSimpleAnnotation(
fqName = annotationValue.classId?.relativeClassName?.asString(),
fqName = annotationValue.classId?.asFqNameString(),
parent = parent,
arguments = annotationValue.arguments,
kotlinOrigin = annotationValue.psi,
analysis/symbol-light-classes/testData/annotationsEquality/Deprecated.java
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
@kotlin.Deprecated(message = "", replaceWith = @ReplaceWith(expression = ""), level = kotlin.DeprecationLevel.ERROR)
@kotlin.Deprecated(message = "", replaceWith = @kotlin.ReplaceWith(expression = ""), level = kotlin.DeprecationLevel.ERROR)
public final class MyClass /* MyClass*/ {
public MyClass();// .ctor()
}
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByPsiForLibraryTestGenerated.java
Generated
+6
View File
@@ -30,6 +30,12 @@ public class SymbolLightClassesByPsiForLibraryTestGenerated extends AbstractSymb
runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/allowedTargets.kt");
}
@Test
@TestMetadata("annotationInAnnotationParameters.kt")
public void testAnnotationInAnnotationParameters() throws Exception {
runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/annotationInAnnotationParameters.kt");
}
@Test
@TestMetadata("annotationWithSetParamPropertyModifier.kt")
public void testAnnotationWithSetParamPropertyModifier() throws Exception {
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesEqualityByPsiForLibraryTestGenerated.java
Generated
+6
View File
@@ -30,6 +30,12 @@ public class SymbolLightClassesEqualityByPsiForLibraryTestGenerated extends Abst
runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/allowedTargets.kt");
}
@Test
@TestMetadata("annotationInAnnotationParameters.kt")
public void testAnnotationInAnnotationParameters() throws Exception {
runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/annotationInAnnotationParameters.kt");
}
@Test
@TestMetadata("annotationWithSetParamPropertyModifier.kt")
public void testAnnotationWithSetParamPropertyModifier() throws Exception {
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesParentingByPsiForLibraryTestGenerated.java
Generated
+6
View File
@@ -30,6 +30,12 @@ public class SymbolLightClassesParentingByPsiForLibraryTestGenerated extends Abs
runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/allowedTargets.kt");
}
@Test
@TestMetadata("annotationInAnnotationParameters.kt")
public void testAnnotationInAnnotationParameters() throws Exception {
runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/annotationInAnnotationParameters.kt");
}
@Test
@TestMetadata("annotationWithSetParamPropertyModifier.kt")
public void testAnnotationWithSetParamPropertyModifier() throws Exception {
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByPsiForSourceTestGenerated.java
Generated
+6
View File
@@ -30,6 +30,12 @@ public class SymbolLightClassesByPsiForSourceTestGenerated extends AbstractSymbo
runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/allowedTargets.kt");
}
@Test
@TestMetadata("annotationInAnnotationParameters.kt")
public void testAnnotationInAnnotationParameters() throws Exception {
runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/annotationInAnnotationParameters.kt");
}
@Test
@TestMetadata("annotationWithSetParamPropertyModifier.kt")
public void testAnnotationWithSetParamPropertyModifier() throws Exception {
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesEqualityByPsiForSourceTestGenerated.java
Generated
+6
View File
@@ -30,6 +30,12 @@ public class SymbolLightClassesEqualityByPsiForSourceTestGenerated extends Abstr
runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/allowedTargets.kt");
}
@Test
@TestMetadata("annotationInAnnotationParameters.kt")
public void testAnnotationInAnnotationParameters() throws Exception {
runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/annotationInAnnotationParameters.kt");
}
@Test
@TestMetadata("annotationWithSetParamPropertyModifier.kt")
public void testAnnotationWithSetParamPropertyModifier() throws Exception {
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesParentingByPsiForSourceTestGenerated.java
Generated
+6
View File
@@ -30,6 +30,12 @@ public class SymbolLightClassesParentingByPsiForSourceTestGenerated extends Abst
runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/allowedTargets.kt");
}
@Test
@TestMetadata("annotationInAnnotationParameters.kt")
public void testAnnotationInAnnotationParameters() throws Exception {
runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/annotationInAnnotationParameters.kt");
}
@Test
@TestMetadata("annotationWithSetParamPropertyModifier.kt")
public void testAnnotationWithSetParamPropertyModifier() throws Exception {
compiler/testData/asJava/lightClasses/lightClassByPsi/annotationInAnnotationParameters.java
Vendored
+13
View File
@@ -0,0 +1,13 @@
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
public abstract @interface A /* a.A*/ {
}
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
public abstract @interface B /* b.B*/ {
public abstract a.A param();// param()
}
@b.B(param = @a.A())
public final class C /* b.C*/ {
public C();// .ctor()
}
compiler/testData/asJava/lightClasses/lightClassByPsi/annotationInAnnotationParameters.kt
Vendored
+17
View File
@@ -0,0 +1,17 @@
// FILE: a/A.kt
package a
annotation class A
// FILE: b/B.kt
package b
import a.A
annotation class B(val param: A)
@B(param = A())
class C
plugins/kapt3/kapt3-compiler/testData/converter/annotationInAnnotationParameters.fir.txt
Vendored
+61
View File
@@ -0,0 +1,61 @@
package a;
/**
* public final annotation class a/A : kotlin/Annotation {
*
* // signature: <init>()V
* public constructor()
*
* // module name: main
* }
*/
@kotlin.Metadata()
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
public abstract @interface A {
}
////////////////////
package b;
/**
* public final annotation class b/B : kotlin/Annotation {
*
* // signature: <init>(La/A;)V
* public constructor(value: a/A)
*
* // getter: value()La/A;
* public final val value: a/A
* public final get
*
* // module name: main
* }
*/
@kotlin.Metadata()
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
public abstract @interface B {
public abstract a.A value();
}
////////////////////
package b;
/**
* public final class b/C : kotlin/Any {
*
* // signature: <init>()V
* public constructor()
*
* // module name: main
* }
*/
@kotlin.Metadata()
@B(value = @a.A())
public final class C {
public C() {
super();
}
}
plugins/kapt3/kapt3-compiler/testData/converter/annotationInAnnotationParameters.kt
Vendored
+17
View File
@@ -0,0 +1,17 @@
// FILE: a/A.kt
package a
annotation class A
// FILE: b/B.kt
package b
import a.A
annotation class B(val value: A)
@B(A())
class C
plugins/kapt3/kapt3-compiler/testData/converter/annotationInAnnotationParameters.txt
Vendored
+61
View File
@@ -0,0 +1,61 @@
package a;
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
/**
* public final annotation class a/A : kotlin/Annotation {
*
* // signature: <init>()V
* public constructor()
*
* // module name: main
* }
*/
@kotlin.Metadata()
public abstract @interface A {
}
////////////////////
package b;
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
/**
* public final annotation class b/B : kotlin/Annotation {
*
* // signature: <init>(La/A;)V
* public constructor(value: a/A)
*
* // getter: value()La/A;
* public final val value: a/A
* public final get
*
* // module name: main
* }
*/
@kotlin.Metadata()
public abstract @interface B {
public abstract a.A value();
}
////////////////////
package b;
@B(value = @a.A())
/**
* public final class b/C : kotlin/Any {
*
* // signature: <init>()V
* public constructor()
*
* // module name: main
* }
*/
@kotlin.Metadata()
public final class C {
public C() {
super();
}
}
plugins/kapt3/kapt3-compiler/tests-gen/org/jetbrains/kotlin/kapt3/test/runners/ClassFileToSourceStubConverterTestGenerated.java
Generated
+6
View File
@@ -43,6 +43,12 @@ public class ClassFileToSourceStubConverterTestGenerated extends AbstractClassFi
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/kapt3/kapt3-compiler/testData/converter"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
}
@Test
@TestMetadata("annotationInAnnotationParameters.kt")
public void testAnnotationInAnnotationParameters() throws Exception {
runTest("plugins/kapt3/kapt3-compiler/testData/converter/annotationInAnnotationParameters.kt");
}
@Test
@TestMetadata("annotationWithFqNames.kt")
public void testAnnotationWithFqNames() throws Exception {
plugins/kapt3/kapt3-compiler/tests-gen/org/jetbrains/kotlin/kapt3/test/runners/IrClassFileToSourceStubConverterTestGenerated.java
Generated
+6
View File
@@ -43,6 +43,12 @@ public class IrClassFileToSourceStubConverterTestGenerated extends AbstractIrCla
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/kapt3/kapt3-compiler/testData/converter"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
}
@Test
@TestMetadata("annotationInAnnotationParameters.kt")
public void testAnnotationInAnnotationParameters() throws Exception {
runTest("plugins/kapt3/kapt3-compiler/testData/converter/annotationInAnnotationParameters.kt");
}
@Test
@TestMetadata("annotationWithFqNames.kt")
public void testAnnotationWithFqNames() throws Exception {
plugins/kapt4/tests-gen/org/jetbrains/kotlin/kapt4/KotlinKapt4ContextTestGenerated.java
Generated
+6
View File
@@ -43,6 +43,12 @@ public class KotlinKapt4ContextTestGenerated extends AbstractKotlinKapt4ContextT
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/kapt4/../kapt3/kapt3-compiler/testData/converter"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
}
@Test
@TestMetadata("annotationInAnnotationParameters.kt")
public void testAnnotationInAnnotationParameters() throws Exception {
runTest("plugins/kapt4/../kapt3/kapt3-compiler/testData/converter/annotationInAnnotationParameters.kt");
}
@Test
@TestMetadata("annotationWithFqNames.kt")
public void testAnnotationWithFqNames() throws Exception {