From af5f76048b551576a554ae6765074b4b2d14b5b8 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Wed, 3 Jan 2024 19:41:34 +0100 Subject: [PATCH] [SLC] AbstractSymbolLightClassesByPsiTest: add more stable order Now more diff between sources and libraries are readable. Also prefer .descriptors to .fir as FIR is a first-class support ^KT-62892 --- .../AbstractSymbolLightClassesByPsiTest.kt | 3 +- .../AnnotationsOnEnumEntry.descriptors.java | 5 +- ...ava => DelegatedProperty.descriptors.java} | 17 ++-- .../lightClassByPsi/DelegatedProperty.java | 47 +++++----- .../DelegatedProperty.lib.java | 84 ++++++++++++++++++ .../LateinitProperties.descriptors.java | 4 +- .../lightClassByPsi/LateinitProperties.java | 36 ++++---- .../LateinitProperties.lib.java | 28 +++--- ...r.java => allowedTargets.descriptors.java} | 18 +--- .../lightClassByPsi/allowedTargets.java | 18 +++- ....fir.java => annotations.descriptors.java} | 12 +-- .../lightClassByPsi/annotations.java | 24 ++--- .../classModifiers.descriptors.java | 47 ++++++++++ .../lightClassByPsi/classModifiers.java | 20 ++--- .../lightClassByPsi/classModifiers.lib.java | 20 ++--- ...fir.java => constructors.descriptors.java} | 4 +- .../lightClassByPsi/constructors.java | 28 +++--- .../lightClassByPsi/constructors.lib.java | 24 ++--- ...=> defaultParameterValue.descriptors.java} | 36 ++++---- .../defaultParameterValue.java | 39 ++++---- ...delegatesWithAnnotations.descriptors.java} | 9 +- .../delegatesWithAnnotations.java | 9 +- .../dollarsInNameLocal.descriptors.java | 27 ++++++ .../lightClassByPsi/dollarsInNameLocal.java | 8 +- ....fir.java => enumMembers.descriptors.java} | 0 .../lightClassByPsi/enumMembers.java | 34 ++++--- .../lightClassByPsi/enumMembers.lib.java | 69 --------------- ...{enums.fir.java => enums.descriptors.java} | 37 ++++---- .../lightClasses/lightClassByPsi/enums.java | 79 ++++++++++------- ... => exposedAnonymousType.descriptors.java} | 6 +- .../lightClassByPsi/exposedAnonymousType.java | 46 +++++----- .../facades/inlineOnly.descriptors.java | 5 ++ .../facades/inlineOnly.fir.java | 2 - .../lightClassByPsi/facades/inlineOnly.java | 3 - ...ifiedInlineReturnsObject.descriptors.java} | 1 - .../facades/reifiedInlineReturnsObject.java | 15 ++-- ...java => throwsAnnotation.descriptors.java} | 2 +- .../facades/throwsAnnotation.java | 2 +- .../valueClassInSignature.descriptors.java | 74 ++++++++++++++++ .../facades/valueClassInSignature.fir.java | 32 ------- .../facades/valueClassInSignature.java | 42 --------- .../inferringAnonymousObjectTypes.fir.java | 80 ++++++++--------- .../lightClassByPsi/jvmField.fir.java | 16 ++-- ...rd.fir.java => jvmRecord.descriptors.java} | 3 +- .../lightClassByPsi/jvmRecord.java | 3 +- .../jvmStaticOnPropertySetter.fir.java | 30 +++---- .../jvmStaticOnPropertySetter.lib.java | 30 +++---- ...fir.java => jvmSynthetic.descriptors.java} | 4 +- .../lightClassByPsi/jvmSynthetic.java | 4 +- ...jvmSyntheticForAccessors.descriptors.java} | 4 - .../jvmSyntheticForAccessors.java | 4 + .../lightClassByPsi/objects.descriptors.java | 8 +- .../lightClasses/lightClassByPsi/objects.java | 88 +++++++++---------- .../lightClassByPsi/objects.lib.java | 78 ++++++++-------- .../lightClassByPsi/properties.fir.java | 24 ++--- ...a => propertyAnnotations.descriptors.java} | 55 ++---------- .../lightClassByPsi/propertyAnnotations.java | 55 ++++++++++-- ...va => FunsPropsAndFields.descriptors.java} | 6 +- .../scripts/FunsPropsAndFields.java | 6 +- .../scripts/InnerClasses.descriptors.java | 29 ++++++ .../lightClassByPsi/scripts/InnerClasses.java | 16 ++-- ...va => strangeIdentifiers.descriptors.java} | 6 +- .../lightClassByPsi/strangeIdentifiers.java | 25 +++--- .../strangeIdentifiers.lib.java | 16 ++-- ...java => throwsAnnotation.descriptors.java} | 7 +- .../lightClassByPsi/throwsAnnotation.java | 7 +- ....java => typeAnnotations.descriptors.java} | 8 +- .../lightClassByPsi/typeAnnotations.java | 8 +- 68 files changed, 891 insertions(+), 745 deletions(-) rename compiler/testData/asJava/lightClasses/lightClassByPsi/{DelegatedProperty.fir.java => DelegatedProperty.descriptors.java} (80%) create mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/DelegatedProperty.lib.java rename compiler/testData/asJava/lightClasses/lightClassByPsi/{allowedTargets.fir.java => allowedTargets.descriptors.java} (81%) rename compiler/testData/asJava/lightClasses/lightClassByPsi/{annotations.fir.java => annotations.descriptors.java} (94%) create mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.descriptors.java rename compiler/testData/asJava/lightClasses/lightClassByPsi/{constructors.fir.java => constructors.descriptors.java} (82%) rename compiler/testData/asJava/lightClasses/lightClassByPsi/{defaultParameterValue.fir.java => defaultParameterValue.descriptors.java} (72%) rename compiler/testData/asJava/lightClasses/lightClassByPsi/{delegatesWithAnnotations.fir.java => delegatesWithAnnotations.descriptors.java} (65%) create mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/dollarsInNameLocal.descriptors.java rename compiler/testData/asJava/lightClasses/lightClassByPsi/{enumMembers.fir.java => enumMembers.descriptors.java} (100%) delete mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/enumMembers.lib.java rename compiler/testData/asJava/lightClasses/lightClassByPsi/{enums.fir.java => enums.descriptors.java} (83%) rename compiler/testData/asJava/lightClasses/lightClassByPsi/{exposedAnonymousType.fir.java => exposedAnonymousType.descriptors.java} (94%) create mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.descriptors.java delete mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.fir.java rename compiler/testData/asJava/lightClasses/lightClassByPsi/facades/{reifiedInlineReturnsObject.fir.java => reifiedInlineReturnsObject.descriptors.java} (95%) rename compiler/testData/asJava/lightClasses/lightClassByPsi/facades/{throwsAnnotation.fir.java => throwsAnnotation.descriptors.java} (88%) create mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/facades/valueClassInSignature.descriptors.java delete mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/facades/valueClassInSignature.fir.java rename compiler/testData/asJava/lightClasses/lightClassByPsi/{jvmRecord.fir.java => jvmRecord.descriptors.java} (93%) rename compiler/testData/asJava/lightClasses/lightClassByPsi/{jvmSynthetic.fir.java => jvmSynthetic.descriptors.java} (77%) rename compiler/testData/asJava/lightClasses/lightClassByPsi/{jvmSyntheticForAccessors.fir.java => jvmSyntheticForAccessors.descriptors.java} (58%) rename compiler/testData/asJava/lightClasses/lightClassByPsi/{propertyAnnotations.fir.java => propertyAnnotations.descriptors.java} (50%) rename compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/{FunsPropsAndFields.fir.java => FunsPropsAndFields.descriptors.java} (76%) create mode 100644 compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.descriptors.java rename compiler/testData/asJava/lightClasses/lightClassByPsi/{strangeIdentifiers.fir.java => strangeIdentifiers.descriptors.java} (97%) rename compiler/testData/asJava/lightClasses/lightClassByPsi/{throwsAnnotation.fir.java => throwsAnnotation.descriptors.java} (77%) rename compiler/testData/asJava/lightClasses/lightClassByPsi/{typeAnnotations.fir.java => typeAnnotations.descriptors.java} (93%) diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesByPsiTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesByPsiTest.kt index cb43e9d95e4..2b4c0130df4 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesByPsiTest.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesByPsiTest.kt @@ -54,8 +54,9 @@ abstract class AbstractSymbolLightClassesByPsiTest( val lcViaFinder = finder.findClass(lc.qualifiedName!!, scope) TestCase.assertEquals(lc, lcViaFinder) } + return withExtendedTypeRenderer(testDataFile) { - lightClasses.sortedBy { it.name }.joinToString("\n\n") { it.renderClass() } + lightClasses.sortedBy { it.qualifiedName ?: it.name.toString() }.joinToString("\n\n") { it.renderClass() } } } } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/AnnotationsOnEnumEntry.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/AnnotationsOnEnumEntry.descriptors.java index ce8438ebf49..19370a466ec 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/AnnotationsOnEnumEntry.descriptors.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/AnnotationsOnEnumEntry.descriptors.java @@ -1,8 +1,11 @@ public enum AnnotationsOnEnumEntry /* two.AnnotationsOnEnumEntry*/ { - @two.PropertyImplicitly() @two.PropertyExplicitly() @two.FieldImplicitly() @two.FieldExplicitly() EntryWithoutConstructor, + @two.PropertyImplicitly() @two.FieldImplicitly() @two.FieldExplicitly() EntryWithoutConstructor, @two.PropertyImplicitly() @two.FieldImplicitly() EntryWithConstructor, EntryWithConstructor2; + @org.jetbrains.annotations.NotNull() + public static kotlin.enums.EnumEntries getEntries();// getEntries() + @org.jetbrains.annotations.NotNull() public static two.AnnotationsOnEnumEntry valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/DelegatedProperty.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/DelegatedProperty.descriptors.java similarity index 80% rename from compiler/testData/asJava/lightClasses/lightClassByPsi/DelegatedProperty.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/DelegatedProperty.descriptors.java index fd5e2dde21e..a12b32603c4 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/DelegatedProperty.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/DelegatedProperty.descriptors.java @@ -1,15 +1,15 @@ public static abstract class Base /* Container.Base*/ { @org.jetbrains.annotations.NotNull() - private final Container.Delegate a$delegate; + private final Container.Delegate a$delegate; @org.jetbrains.annotations.NotNull() - private final Container.Delegate b$delegate; + private final Container.Delegate b$delegate; @org.jetbrains.annotations.NotNull() - private final Container.Delegate mutable$delegate; + private final Container.Delegate mutable$delegate; @org.jetbrains.annotations.NotNull() - private final java.lang.String c = "" /* initializer type: java.lang.String */; + private final java.lang.String c; @org.jetbrains.annotations.NotNull() public abstract java.lang.String getD();// getD() @@ -63,23 +63,20 @@ public static abstract interface Delegate /* Container.Delegate*/ { public static final class Derived /* Container.Derived*/ extends Container.Base { @org.jetbrains.annotations.NotNull() - private final Container.Delegate b$delegate; + private final Container.Delegate b$delegate; @org.jetbrains.annotations.NotNull() - private final Container.Delegate c$delegate; + private final Container.Delegate c$delegate; @org.jetbrains.annotations.NotNull() - private final Container.Delegate d$delegate; + private final Container.Delegate d$delegate; - @java.lang.Override() @org.jetbrains.annotations.NotNull() public java.lang.String getB();// getB() - @java.lang.Override() @org.jetbrains.annotations.NotNull() public java.lang.String getC();// getC() - @java.lang.Override() @org.jetbrains.annotations.NotNull() public java.lang.String getD();// getD() diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/DelegatedProperty.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/DelegatedProperty.java index a12b32603c4..85b49b19517 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/DelegatedProperty.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/DelegatedProperty.java @@ -1,15 +1,30 @@ +public final class Container /* Container*/ { + @org.jetbrains.annotations.NotNull() + public static final Container.Companion Companion; + + public Container();// .ctor() + + class Base ... + + class Companion ... + + class Delegate ... + + class Derived ... +} + public static abstract class Base /* Container.Base*/ { @org.jetbrains.annotations.NotNull() - private final Container.Delegate a$delegate; + private final Container.Delegate a$delegate; @org.jetbrains.annotations.NotNull() - private final Container.Delegate b$delegate; + private final Container.Delegate b$delegate; @org.jetbrains.annotations.NotNull() - private final Container.Delegate mutable$delegate; + private final Container.Delegate mutable$delegate; @org.jetbrains.annotations.NotNull() - private final java.lang.String c; + private final java.lang.String c = "" /* initializer type: java.lang.String */; @org.jetbrains.annotations.NotNull() public abstract java.lang.String getD();// getD() @@ -38,21 +53,6 @@ public static final class Companion /* Container.Companion*/ { private Companion();// .ctor() } -public final class Container /* Container*/ { - @org.jetbrains.annotations.NotNull() - public static final Container.Companion Companion; - - public Container();// .ctor() - - class Base ... - - class Companion ... - - class Delegate ... - - class Derived ... -} - public static abstract interface Delegate /* Container.Delegate*/ { public abstract R getValue(@org.jetbrains.annotations.Nullable() java.lang.Object, @org.jetbrains.annotations.NotNull() kotlin.reflect.KProperty);// getValue(java.lang.Object, kotlin.reflect.KProperty) @@ -63,20 +63,23 @@ public static abstract interface Delegate /* Container.Delegate*/ { public static final class Derived /* Container.Derived*/ extends Container.Base { @org.jetbrains.annotations.NotNull() - private final Container.Delegate b$delegate; + private final Container.Delegate b$delegate; @org.jetbrains.annotations.NotNull() - private final Container.Delegate c$delegate; + private final Container.Delegate c$delegate; @org.jetbrains.annotations.NotNull() - private final Container.Delegate d$delegate; + private final Container.Delegate d$delegate; + @java.lang.Override() @org.jetbrains.annotations.NotNull() public java.lang.String getB();// getB() + @java.lang.Override() @org.jetbrains.annotations.NotNull() public java.lang.String getC();// getC() + @java.lang.Override() @org.jetbrains.annotations.NotNull() public java.lang.String getD();// getD() diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/DelegatedProperty.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/DelegatedProperty.lib.java new file mode 100644 index 00000000000..165387994f1 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/DelegatedProperty.lib.java @@ -0,0 +1,84 @@ +public final class Container /* Container*/ { + @org.jetbrains.annotations.NotNull() + public static final Container.Companion Companion; + + public Container();// .ctor() + + class Base ... + + class Companion ... + + class Delegate ... + + class Derived ... +} + +public static abstract class Base /* Container.Base*/ { + @org.jetbrains.annotations.NotNull() + private final Container.Delegate a$delegate; + + @org.jetbrains.annotations.NotNull() + private final Container.Delegate b$delegate; + + @org.jetbrains.annotations.NotNull() + private final Container.Delegate mutable$delegate; + + @org.jetbrains.annotations.NotNull() + private final java.lang.String c; + + @org.jetbrains.annotations.NotNull() + public abstract java.lang.String getD();// getD() + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getA();// getA() + + @org.jetbrains.annotations.NotNull() + public java.lang.String getB();// getB() + + @org.jetbrains.annotations.NotNull() + public java.lang.String getC();// getC() + + @org.jetbrains.annotations.Nullable() + public final java.lang.String getMutable();// getMutable() + + public Base();// .ctor() + + public final void setMutable(@org.jetbrains.annotations.Nullable() java.lang.String);// setMutable(java.lang.String) +} + +public static final class Companion /* Container.Companion*/ { + @org.jetbrains.annotations.NotNull() + public final Container.Delegate delegate();// delegate() + + private Companion();// .ctor() +} + +public static abstract interface Delegate /* Container.Delegate*/ { + public abstract R getValue(@org.jetbrains.annotations.Nullable() java.lang.Object, @org.jetbrains.annotations.NotNull() kotlin.reflect.KProperty);// getValue(java.lang.Object, kotlin.reflect.KProperty) + + public abstract void setValue(@org.jetbrains.annotations.Nullable() java.lang.Object, @org.jetbrains.annotations.NotNull() kotlin.reflect.KProperty, R);// setValue(java.lang.Object, kotlin.reflect.KProperty, R) + + class DefaultImpls ... +} + +public static final class Derived /* Container.Derived*/ extends Container.Base { + @org.jetbrains.annotations.NotNull() + private final Container.Delegate b$delegate; + + @org.jetbrains.annotations.NotNull() + private final Container.Delegate c$delegate; + + @org.jetbrains.annotations.NotNull() + private final Container.Delegate d$delegate; + + @org.jetbrains.annotations.NotNull() + public java.lang.String getB();// getB() + + @org.jetbrains.annotations.NotNull() + public java.lang.String getC();// getC() + + @org.jetbrains.annotations.NotNull() + public java.lang.String getD();// getD() + + public Derived();// .ctor() +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.descriptors.java index dfdd6c8b239..52c76aadf00 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.descriptors.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.descriptors.java @@ -23,7 +23,7 @@ public abstract class AbstractKotlinClass /* AbstractKotlinClass*/ { class Companion ... } -public static final class Companion /* KotlinClass.Companion*/ { +public static final class Companion /* AbstractKotlinClass.Companion*/ { @org.jetbrains.annotations.NotNull() public final Custom getCompanionLateinitStaticVariable();// getCompanionLateinitStaticVariable() @@ -37,7 +37,7 @@ public static final class Companion /* KotlinClass.Companion*/ { public final void setCompanionLateinitVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitVariable(Custom) } -public static final class Companion /* AbstractKotlinClass.Companion*/ { +public static final class Companion /* KotlinClass.Companion*/ { @org.jetbrains.annotations.NotNull() public final Custom getCompanionLateinitStaticVariable();// getCompanionLateinitStaticVariable() diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.java index bfd28edc7b3..72a6ca2b15a 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.java @@ -23,24 +23,6 @@ public abstract class AbstractKotlinClass /* AbstractKotlinClass*/ { class Companion ... } -public static final class Companion /* KotlinClass.Companion*/ { - @java.lang.Deprecated() - @kotlin.jvm.JvmStatic() - public static void getCompanionLateinitStaticVariable$annotations();// getCompanionLateinitStaticVariable$annotations() - - @org.jetbrains.annotations.NotNull() - public final Custom getCompanionLateinitStaticVariable();// getCompanionLateinitStaticVariable() - - @org.jetbrains.annotations.NotNull() - public final Custom getCompanionLateinitVariable();// getCompanionLateinitVariable() - - private Companion();// .ctor() - - public final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitStaticVariable(Custom) - - public final void setCompanionLateinitVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitVariable(Custom) -} - public static final class Companion /* AbstractKotlinClass.Companion*/ { @java.lang.Deprecated() @kotlin.jvm.JvmStatic() @@ -88,6 +70,24 @@ public final class KotlinClass /* KotlinClass*/ { class Companion ... } +public static final class Companion /* KotlinClass.Companion*/ { + @java.lang.Deprecated() + @kotlin.jvm.JvmStatic() + public static void getCompanionLateinitStaticVariable$annotations();// getCompanionLateinitStaticVariable$annotations() + + @org.jetbrains.annotations.NotNull() + public final Custom getCompanionLateinitStaticVariable();// getCompanionLateinitStaticVariable() + + @org.jetbrains.annotations.NotNull() + public final Custom getCompanionLateinitVariable();// getCompanionLateinitVariable() + + private Companion();// .ctor() + + public final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitStaticVariable(Custom) + + public final void setCompanionLateinitVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitVariable(Custom) +} + public final class LateinitPropertiesKt /* LateinitPropertiesKt*/ { public static Custom topLevelLateinit; diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.lib.java index 52c76aadf00..d8450c497e2 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.lib.java @@ -37,20 +37,6 @@ public static final class Companion /* AbstractKotlinClass.Companion*/ { public final void setCompanionLateinitVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitVariable(Custom) } -public static final class Companion /* KotlinClass.Companion*/ { - @org.jetbrains.annotations.NotNull() - public final Custom getCompanionLateinitStaticVariable();// getCompanionLateinitStaticVariable() - - @org.jetbrains.annotations.NotNull() - public final Custom getCompanionLateinitVariable();// getCompanionLateinitVariable() - - private Companion();// .ctor() - - public final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitStaticVariable(Custom) - - public final void setCompanionLateinitVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitVariable(Custom) -} - public final class Custom /* Custom*/ { public Custom();// .ctor() } @@ -80,6 +66,20 @@ public final class KotlinClass /* KotlinClass*/ { class Companion ... } +public static final class Companion /* KotlinClass.Companion*/ { + @org.jetbrains.annotations.NotNull() + public final Custom getCompanionLateinitStaticVariable();// getCompanionLateinitStaticVariable() + + @org.jetbrains.annotations.NotNull() + public final Custom getCompanionLateinitVariable();// getCompanionLateinitVariable() + + private Companion();// .ctor() + + public final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitStaticVariable(Custom) + + public final void setCompanionLateinitVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitVariable(Custom) +} + public final class LateinitPropertiesKt /* LateinitPropertiesKt*/ { public static Custom topLevelLateinit; diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/allowedTargets.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/allowedTargets.descriptors.java similarity index 81% rename from compiler/testData/asJava/lightClasses/lightClassByPsi/allowedTargets.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/allowedTargets.descriptors.java index 347b5e069c8..95244ad9e41 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/allowedTargets.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/allowedTargets.descriptors.java @@ -26,23 +26,7 @@ public final class MyClass /* MyClass*/ { private final int x7; - @AnotherUniversalAnnotation() - @java.lang.Deprecated() - public static void getX7$annotations();// getX7$annotations() - - @PropertyAnnotation() - @java.lang.Deprecated() - public static void getX1$annotations();// getX1$annotations() - - @PropertyOrFieldAnnotation() - @java.lang.Deprecated() - public static void getX2$annotations();// getX2$annotations() - - @UniversalAnnotation() - @java.lang.Deprecated() - public static void getX5$annotations();// getX5$annotations() - - public MyClass(@AnotherUniversalAnnotation() @ParameterAnnotation() @UniversalAnnotation() int, int, @PropertyOrParameterAnnotation() int, @ParameterOrFieldAnnotation() int, int, @AnotherUniversalAnnotation() int, @UniversalAnnotation() int);// .ctor(int, int, int, int, int, int, int) + public MyClass(@AnotherUniversalAnnotation() @FieldAnnotation() @ParameterAnnotation() @PropertyAnnotation() @UniversalAnnotation() int, @PropertyOrFieldAnnotation() int, @PropertyOrParameterAnnotation() int, @ParameterOrFieldAnnotation() int, int, @AnotherUniversalAnnotation() int, @UniversalAnnotation() int);// .ctor(int, int, int, int, int, int, int) public final int getX1();// getX1() diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/allowedTargets.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/allowedTargets.java index 95244ad9e41..347b5e069c8 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/allowedTargets.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/allowedTargets.java @@ -26,7 +26,23 @@ public final class MyClass /* MyClass*/ { private final int x7; - public MyClass(@AnotherUniversalAnnotation() @FieldAnnotation() @ParameterAnnotation() @PropertyAnnotation() @UniversalAnnotation() int, @PropertyOrFieldAnnotation() int, @PropertyOrParameterAnnotation() int, @ParameterOrFieldAnnotation() int, int, @AnotherUniversalAnnotation() int, @UniversalAnnotation() int);// .ctor(int, int, int, int, int, int, int) + @AnotherUniversalAnnotation() + @java.lang.Deprecated() + public static void getX7$annotations();// getX7$annotations() + + @PropertyAnnotation() + @java.lang.Deprecated() + public static void getX1$annotations();// getX1$annotations() + + @PropertyOrFieldAnnotation() + @java.lang.Deprecated() + public static void getX2$annotations();// getX2$annotations() + + @UniversalAnnotation() + @java.lang.Deprecated() + public static void getX5$annotations();// getX5$annotations() + + public MyClass(@AnotherUniversalAnnotation() @ParameterAnnotation() @UniversalAnnotation() int, int, @PropertyOrParameterAnnotation() int, @ParameterOrFieldAnnotation() int, int, @AnotherUniversalAnnotation() int, @UniversalAnnotation() int);// .ctor(int, int, int, int, int, int, int) public final int getX1();// getX1() diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.descriptors.java similarity index 94% rename from compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.descriptors.java index 7cb73cd4751..5d7c7f0ea55 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.descriptors.java @@ -7,7 +7,7 @@ public abstract @interface Ann /* Ann*/ { @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface Anno /* Anno*/ { - public abstract Anno[] x() default {Anno(p = "a"), Anno(p = "b")};// x() + public abstract Anno[] x() default {@Anno(p = "a"), @Anno(p = "b")};// x() public abstract java.lang.String p() default "";// p() } @@ -45,7 +45,7 @@ public abstract @interface Anno6 /* Anno6*/ { @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface AnnoWithCompanion /* AnnoWithCompanion*/ { @kotlin.jvm.JvmField() - public static final int x = 42 /* initializer type: int */; + public static final int x; @org.jetbrains.annotations.NotNull() public static final AnnoWithCompanion.Companion Companion; @@ -121,7 +121,7 @@ public final class Example /* Example*/ { @Anno() public final class F /* F*/ implements java.lang.Runnable { @org.jetbrains.annotations.NotNull() - private java.lang.String prop = "x" /* initializer type: java.lang.String */; + private java.lang.String prop; @Anno(p = "f") public final void f(@Anno() @org.jetbrains.annotations.NotNull() java.lang.String);// f(java.lang.String) @@ -146,10 +146,10 @@ public abstract @interface Fancy /* Fancy*/ { public final class Foo /* Foo*/ { @org.jetbrains.annotations.Nullable() - private java.lang.String x = null /* initializer type: null */; + private java.lang.String x; @Anno() - public Foo(@org.jetbrains.annotations.NotNull() MyDependency);// .ctor(MyDependency) + public Foo(error.NonExistentClass);// .ctor(error.NonExistentClass) @Anno() public final void f4(@org.jetbrains.annotations.NotNull() java.lang.String);// f4(java.lang.String) @@ -161,7 +161,7 @@ public final class Foo /* Foo*/ { public final java.lang.String getX();// getX() } -@Ann(arg1 = java.lang.String.class, arg2 = int.class) +@Ann(arg1 = kotlin.String.class, arg2 = kotlin.Int.class) public final class MyClass /* MyClass*/ { public MyClass();// .ctor() } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.java index 5d7c7f0ea55..80fa394b06f 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/annotations.java @@ -7,7 +7,7 @@ public abstract @interface Ann /* Ann*/ { @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface Anno /* Anno*/ { - public abstract Anno[] x() default {@Anno(p = "a"), @Anno(p = "b")};// x() + public abstract Anno[] x() default {Anno(p = "a"), Anno(p = "b")};// x() public abstract java.lang.String p() default "";// p() } @@ -45,7 +45,7 @@ public abstract @interface Anno6 /* Anno6*/ { @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface AnnoWithCompanion /* AnnoWithCompanion*/ { @kotlin.jvm.JvmField() - public static final int x; + public static final int x = 42 /* initializer type: int */; @org.jetbrains.annotations.NotNull() public static final AnnoWithCompanion.Companion Companion; @@ -53,18 +53,18 @@ public abstract @interface AnnoWithCompanion /* AnnoWithCompanion*/ { class Companion ... } -@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) -public abstract @interface AnnotatedAttribute /* AnnotatedAttribute*/ { - @Anno() - public abstract java.lang.String x();// x() -} - public static final class Companion /* AnnoWithCompanion.Companion*/ { private Companion();// .ctor() public final void foo();// foo() } +@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) +public abstract @interface AnnotatedAttribute /* AnnotatedAttribute*/ { + @Anno() + public abstract java.lang.String x();// x() +} + public final class CtorAnnotations /* CtorAnnotations*/ { @org.jetbrains.annotations.NotNull() private final java.lang.String x; @@ -121,7 +121,7 @@ public final class Example /* Example*/ { @Anno() public final class F /* F*/ implements java.lang.Runnable { @org.jetbrains.annotations.NotNull() - private java.lang.String prop; + private java.lang.String prop = "x" /* initializer type: java.lang.String */; @Anno(p = "f") public final void f(@Anno() @org.jetbrains.annotations.NotNull() java.lang.String);// f(java.lang.String) @@ -146,10 +146,10 @@ public abstract @interface Fancy /* Fancy*/ { public final class Foo /* Foo*/ { @org.jetbrains.annotations.Nullable() - private java.lang.String x; + private java.lang.String x = null /* initializer type: null */; @Anno() - public Foo(error.NonExistentClass);// .ctor(error.NonExistentClass) + public Foo(@org.jetbrains.annotations.NotNull() MyDependency);// .ctor(MyDependency) @Anno() public final void f4(@org.jetbrains.annotations.NotNull() java.lang.String);// f4(java.lang.String) @@ -161,7 +161,7 @@ public final class Foo /* Foo*/ { public final java.lang.String getX();// getX() } -@Ann(arg1 = kotlin.String.class, arg2 = kotlin.Int.class) +@Ann(arg1 = java.lang.String.class, arg2 = int.class) public final class MyClass /* MyClass*/ { public MyClass();// .ctor() } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.descriptors.java new file mode 100644 index 00000000000..6cadf18fb66 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.descriptors.java @@ -0,0 +1,47 @@ +public static final class Nested /* pkg.Season.Nested*/ extends pkg.Season { + public Nested();// .ctor() +} + +public class Open /* pkg.Open*/ { + public Open();// .ctor() + + class Private ... + + class Private2 ... + + class StaticInternal ... +} + +public final class OuterInternal /* pkg.OuterInternal*/ { + public OuterInternal();// .ctor() +} + +private static final class Private /* pkg.Open.Private*/ extends pkg.Open { + public Private();// .ctor() +} + +protected final class Private2 /* pkg.Open.Private2*/ { + public Private2();// .ctor() +} + +public abstract class SealedWithArgs /* pkg.SealedWithArgs*/ { + private final int a; + + protected SealedWithArgs(int);// .ctor(int) + + public final int getA();// getA() +} + +public abstract class Season /* pkg.Season*/ { + protected Season();// .ctor() + + class Nested ... +} + +public static final class StaticInternal /* pkg.Open.StaticInternal*/ { + public StaticInternal();// .ctor() +} + +final class TopLevelPrivate /* pkg.TopLevelPrivate*/ { + public TopLevelPrivate();// .ctor() +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.java index 6cadf18fb66..3b809eb32c3 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.java @@ -1,7 +1,3 @@ -public static final class Nested /* pkg.Season.Nested*/ extends pkg.Season { - public Nested();// .ctor() -} - public class Open /* pkg.Open*/ { public Open();// .ctor() @@ -12,10 +8,6 @@ public class Open /* pkg.Open*/ { class StaticInternal ... } -public final class OuterInternal /* pkg.OuterInternal*/ { - public OuterInternal();// .ctor() -} - private static final class Private /* pkg.Open.Private*/ extends pkg.Open { public Private();// .ctor() } @@ -24,6 +16,14 @@ protected final class Private2 /* pkg.Open.Private2*/ { public Private2();// .ctor() } +public static final class StaticInternal /* pkg.Open.StaticInternal*/ { + public StaticInternal();// .ctor() +} + +public final class OuterInternal /* pkg.OuterInternal*/ { + public OuterInternal();// .ctor() +} + public abstract class SealedWithArgs /* pkg.SealedWithArgs*/ { private final int a; @@ -38,8 +38,8 @@ public abstract class Season /* pkg.Season*/ { class Nested ... } -public static final class StaticInternal /* pkg.Open.StaticInternal*/ { - public StaticInternal();// .ctor() +public static final class Nested /* pkg.Season.Nested*/ extends pkg.Season { + public Nested();// .ctor() } final class TopLevelPrivate /* pkg.TopLevelPrivate*/ { diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.lib.java index 986ee8f216d..2122b508522 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/classModifiers.lib.java @@ -1,7 +1,3 @@ -public static final class Nested /* pkg.Season.Nested*/ extends pkg.Season { - public Nested();// .ctor() -} - public class Open /* pkg.Open*/ { public Open();// .ctor() @@ -12,10 +8,6 @@ public class Open /* pkg.Open*/ { class StaticInternal ... } -public final class OuterInternal /* pkg.OuterInternal*/ { - public OuterInternal();// .ctor() -} - private static final class Private /* pkg.Open.Private*/ extends pkg.Open { public Private();// .ctor() } @@ -24,6 +16,14 @@ protected final class Private2 /* pkg.Open.Private2*/ { public Private2();// .ctor() } +public static final class StaticInternal /* pkg.Open.StaticInternal*/ { + public StaticInternal();// .ctor() +} + +public final class OuterInternal /* pkg.OuterInternal*/ { + public OuterInternal();// .ctor() +} + public abstract class SealedWithArgs /* pkg.SealedWithArgs*/ { private final int a; @@ -38,8 +38,8 @@ public abstract class Season /* pkg.Season*/ { class Nested ... } -public static final class StaticInternal /* pkg.Open.StaticInternal*/ { - public StaticInternal();// .ctor() +public static final class Nested /* pkg.Season.Nested*/ extends pkg.Season { + public Nested();// .ctor() } final class TopLevelPrivate /* pkg.TopLevelPrivate*/ { diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.descriptors.java similarity index 82% rename from compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.descriptors.java index cc77ef0c5a8..899f12c351f 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.descriptors.java @@ -1,6 +1,6 @@ public abstract class A /* A*/ { @org.jetbrains.annotations.Nullable() - private final java.lang.String x = null /* initializer type: null */; + private final java.lang.String x; @org.jetbrains.annotations.Nullable() public final java.lang.String getX();// getX() @@ -11,7 +11,7 @@ public abstract class A /* A*/ { } public final class AAA /* AAA*/ { - public /* vararg */ AAA(@org.jetbrains.annotations.NotNull() int[], @org.jetbrains.annotations.NotNull() kotlin.jvm.functions.Function0);// .ctor(int[], kotlin.jvm.functions.Function0) + public AAA(@org.jetbrains.annotations.NotNull() int[], @org.jetbrains.annotations.NotNull() kotlin.jvm.functions.Function0);// .ctor(int[], kotlin.jvm.functions.Function0) } public final class B /* B*/ { diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.java index 899f12c351f..f256eca02f4 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.java @@ -1,6 +1,6 @@ public abstract class A /* A*/ { @org.jetbrains.annotations.Nullable() - private final java.lang.String x; + private final java.lang.String x = null /* initializer type: null */; @org.jetbrains.annotations.Nullable() public final java.lang.String getX();// getX() @@ -10,17 +10,17 @@ public abstract class A /* A*/ { class C ... } +public static final class C /* A.C*/ extends A { + public C();// .ctor() +} + public final class AAA /* AAA*/ { - public AAA(@org.jetbrains.annotations.NotNull() int[], @org.jetbrains.annotations.NotNull() kotlin.jvm.functions.Function0);// .ctor(int[], kotlin.jvm.functions.Function0) + public /* vararg */ AAA(@org.jetbrains.annotations.NotNull() int[], @org.jetbrains.annotations.NotNull() kotlin.jvm.functions.Function0);// .ctor(int[], kotlin.jvm.functions.Function0) } public final class B /* B*/ { } -public static final class C /* A.C*/ extends A { - public C();// .ctor() -} - public final class ClassWithPrivateCtor /* ClassWithPrivateCtor*/ { @org.jetbrains.annotations.NotNull() private final java.util.Set property; @@ -31,6 +31,14 @@ public final class ClassWithPrivateCtor /* ClassWithPrivateCtor*/ { private ClassWithPrivateCtor(java.util.Set);// .ctor(java.util.Set) } +public final class Outer /* Outer*/ { + public Outer();// .ctor() + + class Inner ... + + class Nested ... +} + public final class Inner /* Outer.Inner*/ { public Inner(int, @org.jetbrains.annotations.NotNull() java.lang.String);// .ctor(int, java.lang.String) } @@ -41,14 +49,6 @@ public static final class Nested /* Outer.Nested*/ { public Nested(int, @org.jetbrains.annotations.NotNull() java.lang.String);// .ctor(int, java.lang.String) } -public final class Outer /* Outer*/ { - public Outer();// .ctor() - - class Inner ... - - class Nested ... -} - public final class TestConstructor /* TestConstructor*/ { private TestConstructor(int);// .ctor(int) } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.lib.java index 01012a19ccd..e6105a60886 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/constructors.lib.java @@ -10,6 +10,10 @@ public abstract class A /* A*/ { class C ... } +public static final class C /* A.C*/ extends A { + public C();// .ctor() +} + public final class AAA /* AAA*/ { public AAA(@org.jetbrains.annotations.NotNull() int[], @org.jetbrains.annotations.NotNull() kotlin.jvm.functions.Function0);// .ctor(int[], kotlin.jvm.functions.Function0) } @@ -17,10 +21,6 @@ public final class AAA /* AAA*/ { public final class B /* B*/ { } -public static final class C /* A.C*/ extends A { - public C();// .ctor() -} - public final class ClassWithPrivateCtor /* ClassWithPrivateCtor*/ { @org.jetbrains.annotations.NotNull() private final java.util.Set property; @@ -31,6 +31,14 @@ public final class ClassWithPrivateCtor /* ClassWithPrivateCtor*/ { private ClassWithPrivateCtor(java.util.Set);// .ctor(java.util.Set) } +public final class Outer /* Outer*/ { + public Outer();// .ctor() + + class Inner ... + + class Nested ... +} + public final class Inner /* Outer.Inner*/ { public Inner(int, @org.jetbrains.annotations.NotNull() java.lang.String);// .ctor(int, java.lang.String) } @@ -41,14 +49,6 @@ public static final class Nested /* Outer.Nested*/ { public Nested(int, @org.jetbrains.annotations.NotNull() java.lang.String);// .ctor(int, java.lang.String) } -public final class Outer /* Outer*/ { - public Outer();// .ctor() - - class Inner ... - - class Nested ... -} - public final class TestConstructor /* TestConstructor*/ { private TestConstructor(int);// .ctor(int) } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultParameterValue.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultParameterValue.descriptors.java similarity index 72% rename from compiler/testData/asJava/lightClasses/lightClassByPsi/defaultParameterValue.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/defaultParameterValue.descriptors.java index 5ac83138053..2a3146d403f 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultParameterValue.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultParameterValue.descriptors.java @@ -16,52 +16,52 @@ public enum Em /* Em*/ { public final class Foo /* Foo*/ { @org.jetbrains.annotations.NotNull() - private final Em em = Em.BAR /* initializer type: Em */; + private final Em em; @org.jetbrains.annotations.NotNull() - private final Em[] emarr = {Em.FOO, Em.BAR} /* initializer type: null */; + private final Em[] emarr; @org.jetbrains.annotations.NotNull() - private final double[] darr = {7.3} /* initializer type: null */; + private final double[] darr; @org.jetbrains.annotations.NotNull() - private final int[] iarr = {1, 2, 3} /* initializer type: null */; + private final int[] iarr; @org.jetbrains.annotations.NotNull() private final java.lang.Class cl; @org.jetbrains.annotations.NotNull() - private final java.lang.Class[] clarr = {} /* initializer type: null */; + private final java.lang.Class[] clarr; @org.jetbrains.annotations.NotNull() - private final java.lang.String s = "foo" /* initializer type: java.lang.String */; + private final java.lang.String s; @org.jetbrains.annotations.NotNull() - private final java.lang.String[] empty = {} /* initializer type: null */; + private final java.lang.String[] empty; @org.jetbrains.annotations.NotNull() - private final java.lang.String[] sarr = {"a", "bc"} /* initializer type: null */; + private final java.lang.String[] sarr; @org.jetbrains.annotations.NotNull() - private final long[] larr = {-1L, 0L, 1L} /* initializer type: null */; + private final long[] larr; - private final boolean z = true /* initializer type: boolean */; + private final boolean z; - private final byte b = 1 /* initializer type: int */; + private final byte b; - private final char c = 'c' /* initializer type: char */; + private final char c2; - private final char c2 = '\n' /* initializer type: char */; + private final char c; - private final double d = -1.0 /* initializer type: double */; + private final double d; - private final float f = 1.0f /* initializer type: float */; + private final float f; - private final int i = 10 /* initializer type: int */; + private final int i; - private final long l = -10L /* initializer type: long */; + private final long l; - private final short sh = 10 /* initializer type: int */; + private final short sh; @org.jetbrains.annotations.NotNull() public final Em getEm();// getEm() diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultParameterValue.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultParameterValue.java index 87f97d0b180..5ac83138053 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultParameterValue.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/defaultParameterValue.java @@ -8,57 +8,60 @@ public enum Em /* Em*/ { @org.jetbrains.annotations.NotNull() public static Em[] values();// values() + @org.jetbrains.annotations.NotNull() + public static kotlin.enums.EnumEntries getEntries();// getEntries() + private Em();// .ctor() } public final class Foo /* Foo*/ { @org.jetbrains.annotations.NotNull() - private final Em em; + private final Em em = Em.BAR /* initializer type: Em */; @org.jetbrains.annotations.NotNull() - private final Em[] emarr; + private final Em[] emarr = {Em.FOO, Em.BAR} /* initializer type: null */; @org.jetbrains.annotations.NotNull() - private final double[] darr; + private final double[] darr = {7.3} /* initializer type: null */; @org.jetbrains.annotations.NotNull() - private final int[] iarr; + private final int[] iarr = {1, 2, 3} /* initializer type: null */; @org.jetbrains.annotations.NotNull() private final java.lang.Class cl; @org.jetbrains.annotations.NotNull() - private final java.lang.Class[] clarr; + private final java.lang.Class[] clarr = {} /* initializer type: null */; @org.jetbrains.annotations.NotNull() - private final java.lang.String s; + private final java.lang.String s = "foo" /* initializer type: java.lang.String */; @org.jetbrains.annotations.NotNull() - private final java.lang.String[] empty; + private final java.lang.String[] empty = {} /* initializer type: null */; @org.jetbrains.annotations.NotNull() - private final java.lang.String[] sarr; + private final java.lang.String[] sarr = {"a", "bc"} /* initializer type: null */; @org.jetbrains.annotations.NotNull() - private final long[] larr; + private final long[] larr = {-1L, 0L, 1L} /* initializer type: null */; - private final boolean z; + private final boolean z = true /* initializer type: boolean */; - private final byte b; + private final byte b = 1 /* initializer type: int */; - private final char c2; + private final char c = 'c' /* initializer type: char */; - private final char c; + private final char c2 = '\n' /* initializer type: char */; - private final double d; + private final double d = -1.0 /* initializer type: double */; - private final float f; + private final float f = 1.0f /* initializer type: float */; - private final int i; + private final int i = 10 /* initializer type: int */; - private final long l; + private final long l = -10L /* initializer type: long */; - private final short sh; + private final short sh = 10 /* initializer type: int */; @org.jetbrains.annotations.NotNull() public final Em getEm();// getEm() diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.descriptors.java similarity index 65% rename from compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.descriptors.java index 0e9c4bd8ab0..261895d7854 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.descriptors.java @@ -14,14 +14,13 @@ public abstract @interface Ann /* Ann*/ { } public abstract interface Base /* Base*/ { - @Ann(x = 1, y = "134", z = java.lang.String.class, e = {int.class, double.class}, depr = kotlin.DeprecationLevel.WARNING, t = {SimpleAnn("243"), SimpleAnn("4324")}) - public abstract void foo(@Ann(x = 2, y = "324", z = Ann.class, e = {byte.class, Base.class}, depr = kotlin.DeprecationLevel.WARNING, t = {SimpleAnn("687"), SimpleAnn("78")}) @org.jetbrains.annotations.NotNull() java.lang.String);// foo(java.lang.String) + @Ann(x = 1, y = "134", z = kotlin.String.class, e = {kotlin.Int.class, kotlin.Double.class}, depr = kotlin.DeprecationLevel.WARNING, t = {@SimpleAnn(value = "243"), @SimpleAnn(value = "4324")}) + public abstract void foo(@Ann(x = 2, y = "324", z = Ann.class, e = {kotlin.Byte.class, Base.class}, depr = kotlin.DeprecationLevel.WARNING, t = {@SimpleAnn(value = "687"), @SimpleAnn(value = "78")}) @org.jetbrains.annotations.NotNull() java.lang.String);// foo(java.lang.String) } public final class Derived /* Derived*/ implements Base { - @Ann(x = 1, y = "134", z = java.lang.String.class, e = {int.class, double.class}, depr = kotlin.DeprecationLevel.WARNING, t = {SimpleAnn("243"), SimpleAnn("4324")}) - @java.lang.Override() - public void foo(@Ann(x = 2, y = "324", z = Ann.class, e = {byte.class, Base.class}, depr = kotlin.DeprecationLevel.WARNING, t = {SimpleAnn("687"), SimpleAnn("78")}) @org.jetbrains.annotations.NotNull() java.lang.String);// foo(java.lang.String) + @Ann(x = 1, y = "134", z = java.lang.String.class, e = {int.class, double.class}, depr = kotlin.DeprecationLevel.WARNING, t = {@SimpleAnn(value="243"), @SimpleAnn(value="4324")}) + public void foo(@Ann(x = 2, y = "324", z = Ann.class, e = {byte.class, Base.class}, depr = kotlin.DeprecationLevel.WARNING, t = {@SimpleAnn(value="687"), @SimpleAnn(value="78")}) @org.jetbrains.annotations.NotNull() java.lang.String);// foo(java.lang.String) public Derived(@org.jetbrains.annotations.NotNull() Base);// .ctor(Base) } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.java index 261895d7854..0e9c4bd8ab0 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/delegatesWithAnnotations.java @@ -14,13 +14,14 @@ public abstract @interface Ann /* Ann*/ { } public abstract interface Base /* Base*/ { - @Ann(x = 1, y = "134", z = kotlin.String.class, e = {kotlin.Int.class, kotlin.Double.class}, depr = kotlin.DeprecationLevel.WARNING, t = {@SimpleAnn(value = "243"), @SimpleAnn(value = "4324")}) - public abstract void foo(@Ann(x = 2, y = "324", z = Ann.class, e = {kotlin.Byte.class, Base.class}, depr = kotlin.DeprecationLevel.WARNING, t = {@SimpleAnn(value = "687"), @SimpleAnn(value = "78")}) @org.jetbrains.annotations.NotNull() java.lang.String);// foo(java.lang.String) + @Ann(x = 1, y = "134", z = java.lang.String.class, e = {int.class, double.class}, depr = kotlin.DeprecationLevel.WARNING, t = {SimpleAnn("243"), SimpleAnn("4324")}) + public abstract void foo(@Ann(x = 2, y = "324", z = Ann.class, e = {byte.class, Base.class}, depr = kotlin.DeprecationLevel.WARNING, t = {SimpleAnn("687"), SimpleAnn("78")}) @org.jetbrains.annotations.NotNull() java.lang.String);// foo(java.lang.String) } public final class Derived /* Derived*/ implements Base { - @Ann(x = 1, y = "134", z = java.lang.String.class, e = {int.class, double.class}, depr = kotlin.DeprecationLevel.WARNING, t = {@SimpleAnn(value="243"), @SimpleAnn(value="4324")}) - public void foo(@Ann(x = 2, y = "324", z = Ann.class, e = {byte.class, Base.class}, depr = kotlin.DeprecationLevel.WARNING, t = {@SimpleAnn(value="687"), @SimpleAnn(value="78")}) @org.jetbrains.annotations.NotNull() java.lang.String);// foo(java.lang.String) + @Ann(x = 1, y = "134", z = java.lang.String.class, e = {int.class, double.class}, depr = kotlin.DeprecationLevel.WARNING, t = {SimpleAnn("243"), SimpleAnn("4324")}) + @java.lang.Override() + public void foo(@Ann(x = 2, y = "324", z = Ann.class, e = {byte.class, Base.class}, depr = kotlin.DeprecationLevel.WARNING, t = {SimpleAnn("687"), SimpleAnn("78")}) @org.jetbrains.annotations.NotNull() java.lang.String);// foo(java.lang.String) public Derived(@org.jetbrains.annotations.NotNull() Base);// .ctor(Base) } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/dollarsInNameLocal.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/dollarsInNameLocal.descriptors.java new file mode 100644 index 00000000000..4835f6dbf56 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/dollarsInNameLocal.descriptors.java @@ -0,0 +1,27 @@ +public final class $$$$$$$ /* null*/ { + public $$$$$$$();// .ctor() + + class G$G$ ... +} + +public static final class A$B /* null*/ { + public A$B();// .ctor() + + class $$$$$$$ ... + + class C$D ... +} + +public final class C$D /* null*/ { + public C$D();// .ctor() +} + +public final class Foo /* c.b.a.Foo*/ { + public Foo();// .ctor() + + public final void bar();// bar() +} + +public final class G$G$ /* null*/ { + public G$G$();// .ctor() +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/dollarsInNameLocal.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/dollarsInNameLocal.java index 4835f6dbf56..9c3ece16395 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/dollarsInNameLocal.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/dollarsInNameLocal.java @@ -16,12 +16,12 @@ public final class C$D /* null*/ { public C$D();// .ctor() } +public final class G$G$ /* null*/ { + public G$G$();// .ctor() +} + public final class Foo /* c.b.a.Foo*/ { public Foo();// .ctor() public final void bar();// bar() } - -public final class G$G$ /* null*/ { - public G$G$();// .ctor() -} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/enumMembers.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/enumMembers.descriptors.java similarity index 100% rename from compiler/testData/asJava/lightClasses/lightClassByPsi/enumMembers.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/enumMembers.descriptors.java diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/enumMembers.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/enumMembers.java index 50b602c5ddd..62140753f1b 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/enumMembers.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/enumMembers.java @@ -1,17 +1,3 @@ -public static final class Companion /* Event.Companion*/ { - @kotlin.jvm.JvmStatic() - @org.jetbrains.annotations.Nullable() - public final Event upTo(@org.jetbrains.annotations.NotNull() State);// upTo(State) - - private Companion();// .ctor() -} - -public static final class Companion /* State.Companion*/ { - private Companion();// .ctor() - - public final boolean done(@org.jetbrains.annotations.NotNull() State);// done(State) -} - public enum Event /* Event*/ { ON_CREATE, ON_START, @@ -31,11 +17,22 @@ public enum Event /* Event*/ { @org.jetbrains.annotations.NotNull() public static Event[] values();// values() + @org.jetbrains.annotations.NotNull() + public static kotlin.enums.EnumEntries getEntries();// getEntries() + private Event();// .ctor() class Companion ... } +public static final class Companion /* Event.Companion*/ { + @kotlin.jvm.JvmStatic() + @org.jetbrains.annotations.Nullable() + public final Event upTo(@org.jetbrains.annotations.NotNull() State);// upTo(State) + + private Companion();// .ctor() +} + public enum State /* State*/ { ENQUEUED, RUNNING, @@ -53,6 +50,9 @@ public enum State /* State*/ { @org.jetbrains.annotations.NotNull() public static State[] values();// values() + @org.jetbrains.annotations.NotNull() + public static kotlin.enums.EnumEntries getEntries();// getEntries() + private State();// .ctor() public final boolean isAtLeast(@org.jetbrains.annotations.NotNull() State);// isAtLeast(State) @@ -61,3 +61,9 @@ public enum State /* State*/ { class Companion ... } + +public static final class Companion /* State.Companion*/ { + private Companion();// .ctor() + + public final boolean done(@org.jetbrains.annotations.NotNull() State);// done(State) +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/enumMembers.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/enumMembers.lib.java deleted file mode 100644 index 4155a984799..00000000000 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/enumMembers.lib.java +++ /dev/null @@ -1,69 +0,0 @@ -public static final class Companion /* State.Companion*/ { - private Companion();// .ctor() - - public final boolean done(@org.jetbrains.annotations.NotNull() State);// done(State) -} - -public static final class Companion /* Event.Companion*/ { - @kotlin.jvm.JvmStatic() - @org.jetbrains.annotations.Nullable() - public final Event upTo(@org.jetbrains.annotations.NotNull() State);// upTo(State) - - private Companion();// .ctor() -} - -public enum Event /* Event*/ { - ON_CREATE, - ON_START, - ON_STOP, - ON_DESTROY; - - @org.jetbrains.annotations.NotNull() - public static final Event.Companion Companion; - - @kotlin.jvm.JvmStatic() - @org.jetbrains.annotations.Nullable() - public static final Event upTo(@org.jetbrains.annotations.NotNull() State);// upTo(State) - - @org.jetbrains.annotations.NotNull() - public static Event valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) - - @org.jetbrains.annotations.NotNull() - public static Event[] values();// values() - - @org.jetbrains.annotations.NotNull() - public static kotlin.enums.EnumEntries getEntries();// getEntries() - - private Event();// .ctor() - - class Companion ... -} - -public enum State /* State*/ { - ENQUEUED, - RUNNING, - SUCCEEDED, - FAILED, - BLOCKED, - CANCELLED; - - @org.jetbrains.annotations.NotNull() - public static final State.Companion Companion; - - @org.jetbrains.annotations.NotNull() - public static State valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) - - @org.jetbrains.annotations.NotNull() - public static State[] values();// values() - - @org.jetbrains.annotations.NotNull() - public static kotlin.enums.EnumEntries getEntries();// getEntries() - - private State();// .ctor() - - public final boolean isAtLeast(@org.jetbrains.annotations.NotNull() State);// isAtLeast(State) - - public final boolean isFinished();// isFinished() - - class Companion ... -} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/enums.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/enums.descriptors.java similarity index 83% rename from compiler/testData/asJava/lightClasses/lightClassByPsi/enums.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/enums.descriptors.java index 438b172819e..8d3159d4be2 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/enums.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/enums.descriptors.java @@ -1,6 +1,6 @@ public final class C /* C*/ { @org.jetbrains.annotations.Nullable() - private final Direction enumConst = Direction.EAST /* initializer type: Direction */; + private final Direction enumConst; @org.jetbrains.annotations.Nullable() public final Direction getEnumConst();// getEnumConst() @@ -13,7 +13,7 @@ public enum Color /* Color*/ { GREEN, BLUE; - private final int rgb = 5 /* initializer type: int */; + private final int rgb; @org.jetbrains.annotations.NotNull() public static Color valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) @@ -24,9 +24,9 @@ public enum Color /* Color*/ { @org.jetbrains.annotations.NotNull() public static kotlin.enums.EnumEntries getEntries();// getEntries() - private Color(int);// .ctor(int) + private Color(@org.jetbrains.annotations.NotNull() java.lang.String);// .ctor(java.lang.String) - private Color(java.lang.String);// .ctor(java.lang.String) + private Color(int);// .ctor(int) public final int getRgb();// getRgb() } @@ -53,21 +53,16 @@ public abstract enum IntArithmetics /* IntArithmetics*/ implements java.util.fun PLUS { PLUS();// .ctor() - @java.lang.Override() @org.jetbrains.annotations.NotNull() public java.lang.Integer apply(int, int);// apply(int, int) }, TIMES { TIMES();// .ctor() - @java.lang.Override() @org.jetbrains.annotations.NotNull() public java.lang.Integer apply(int, int);// apply(int, int) }; - @java.lang.Override() - public int applyAsInt(int, int);// applyAsInt(int, int) - @org.jetbrains.annotations.NotNull() public static IntArithmetics valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) @@ -78,12 +73,17 @@ public abstract enum IntArithmetics /* IntArithmetics*/ implements java.util.fun public static kotlin.enums.EnumEntries getEntries();// getEntries() private IntArithmetics();// .ctor() + + public int applyAsInt(int, int);// applyAsInt(int, int) + + class PLUS ... + + class TIMES ... } -static final class PLUS /* IntArithmetics.PLUS*/ extends IntArithmetics { +public static final class PLUS /* IntArithmetics.PLUS*/ extends IntArithmetics { PLUS();// .ctor() - @java.lang.Override() @org.jetbrains.annotations.NotNull() public java.lang.Integer apply(int, int);// apply(int, int) } @@ -92,14 +92,12 @@ public abstract enum ProtocolState /* ProtocolState*/ { WAITING { WAITING();// .ctor() - @java.lang.Override() @org.jetbrains.annotations.NotNull() public ProtocolState signal();// signal() }, TALKING { TALKING();// .ctor() - @java.lang.Override() @org.jetbrains.annotations.NotNull() public ProtocolState signal();// signal() }; @@ -117,32 +115,33 @@ public abstract enum ProtocolState /* ProtocolState*/ { public static kotlin.enums.EnumEntries getEntries();// getEntries() private ProtocolState();// .ctor() + + class TALKING ... + + class WAITING ... } @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface Some /* Some*/ { } -static final class TALKING /* ProtocolState.TALKING*/ extends ProtocolState { +public static final class TALKING /* ProtocolState.TALKING*/ extends ProtocolState { TALKING();// .ctor() - @java.lang.Override() @org.jetbrains.annotations.NotNull() public ProtocolState signal();// signal() } -static final class TIMES /* IntArithmetics.TIMES*/ extends IntArithmetics { +public static final class TIMES /* IntArithmetics.TIMES*/ extends IntArithmetics { TIMES();// .ctor() - @java.lang.Override() @org.jetbrains.annotations.NotNull() public java.lang.Integer apply(int, int);// apply(int, int) } -static final class WAITING /* ProtocolState.WAITING*/ extends ProtocolState { +public static final class WAITING /* ProtocolState.WAITING*/ extends ProtocolState { WAITING();// .ctor() - @java.lang.Override() @org.jetbrains.annotations.NotNull() public ProtocolState signal();// signal() } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/enums.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/enums.java index 17ebd19365b..ae6acc181e1 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/enums.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/enums.java @@ -1,6 +1,6 @@ public final class C /* C*/ { @org.jetbrains.annotations.Nullable() - private final Direction enumConst; + private final Direction enumConst = Direction.EAST /* initializer type: Direction */; @org.jetbrains.annotations.Nullable() public final Direction getEnumConst();// getEnumConst() @@ -13,7 +13,7 @@ public enum Color /* Color*/ { GREEN, BLUE; - private final int rgb; + private final int rgb = 5 /* initializer type: int */; @org.jetbrains.annotations.NotNull() public static Color valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) @@ -21,10 +21,13 @@ public enum Color /* Color*/ { @org.jetbrains.annotations.NotNull() public static Color[] values();// values() - private Color(@org.jetbrains.annotations.NotNull() java.lang.String);// .ctor(java.lang.String) + @org.jetbrains.annotations.NotNull() + public static kotlin.enums.EnumEntries getEntries();// getEntries() private Color(int);// .ctor(int) + private Color(java.lang.String);// .ctor(java.lang.String) + public final int getRgb();// getRgb() } @@ -40,6 +43,9 @@ public enum Direction /* Direction*/ { @org.jetbrains.annotations.NotNull() public static Direction[] values();// values() + @org.jetbrains.annotations.NotNull() + public static kotlin.enums.EnumEntries getEntries();// getEntries() + private Direction();// .ctor() } @@ -47,34 +53,45 @@ public abstract enum IntArithmetics /* IntArithmetics*/ implements java.util.fun PLUS { PLUS();// .ctor() + @java.lang.Override() @org.jetbrains.annotations.NotNull() public java.lang.Integer apply(int, int);// apply(int, int) }, TIMES { TIMES();// .ctor() + @java.lang.Override() @org.jetbrains.annotations.NotNull() public java.lang.Integer apply(int, int);// apply(int, int) }; + @java.lang.Override() + public int applyAsInt(int, int);// applyAsInt(int, int) + @org.jetbrains.annotations.NotNull() public static IntArithmetics valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) @org.jetbrains.annotations.NotNull() public static IntArithmetics[] values();// values() + @org.jetbrains.annotations.NotNull() + public static kotlin.enums.EnumEntries getEntries();// getEntries() + private IntArithmetics();// .ctor() - - public int applyAsInt(int, int);// applyAsInt(int, int) - - class PLUS ... - - class TIMES ... } -public static final class PLUS /* IntArithmetics.PLUS*/ extends IntArithmetics { +static final class PLUS /* IntArithmetics.PLUS*/ extends IntArithmetics { PLUS();// .ctor() + @java.lang.Override() + @org.jetbrains.annotations.NotNull() + public java.lang.Integer apply(int, int);// apply(int, int) +} + +static final class TIMES /* IntArithmetics.TIMES*/ extends IntArithmetics { + TIMES();// .ctor() + + @java.lang.Override() @org.jetbrains.annotations.NotNull() public java.lang.Integer apply(int, int);// apply(int, int) } @@ -83,12 +100,14 @@ public abstract enum ProtocolState /* ProtocolState*/ { WAITING { WAITING();// .ctor() + @java.lang.Override() @org.jetbrains.annotations.NotNull() public ProtocolState signal();// signal() }, TALKING { TALKING();// .ctor() + @java.lang.Override() @org.jetbrains.annotations.NotNull() public ProtocolState signal();// signal() }; @@ -102,34 +121,28 @@ public abstract enum ProtocolState /* ProtocolState*/ { @org.jetbrains.annotations.NotNull() public static ProtocolState[] values();// values() + @org.jetbrains.annotations.NotNull() + public static kotlin.enums.EnumEntries getEntries();// getEntries() + private ProtocolState();// .ctor() +} - class TALKING ... +static final class TALKING /* ProtocolState.TALKING*/ extends ProtocolState { + TALKING();// .ctor() - class WAITING ... + @java.lang.Override() + @org.jetbrains.annotations.NotNull() + public ProtocolState signal();// signal() +} + +static final class WAITING /* ProtocolState.WAITING*/ extends ProtocolState { + WAITING();// .ctor() + + @java.lang.Override() + @org.jetbrains.annotations.NotNull() + public ProtocolState signal();// signal() } @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) public abstract @interface Some /* Some*/ { } - -public static final class TALKING /* ProtocolState.TALKING*/ extends ProtocolState { - TALKING();// .ctor() - - @org.jetbrains.annotations.NotNull() - public ProtocolState signal();// signal() -} - -public static final class TIMES /* IntArithmetics.TIMES*/ extends IntArithmetics { - TIMES();// .ctor() - - @org.jetbrains.annotations.NotNull() - public java.lang.Integer apply(int, int);// apply(int, int) -} - -public static final class WAITING /* ProtocolState.WAITING*/ extends ProtocolState { - WAITING();// .ctor() - - @org.jetbrains.annotations.NotNull() - public ProtocolState signal();// signal() -} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/exposedAnonymousType.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/exposedAnonymousType.descriptors.java similarity index 94% rename from compiler/testData/asJava/lightClasses/lightClassByPsi/exposedAnonymousType.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/exposedAnonymousType.descriptors.java index e48b4cb410c..929b16c229b 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/exposedAnonymousType.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/exposedAnonymousType.descriptors.java @@ -25,14 +25,14 @@ public final class C /* C*/ { @org.jetbrains.annotations.NotNull() private final A x2; + @org.jetbrains.annotations.NotNull() + private final A x4; + @org.jetbrains.annotations.NotNull() private final B x3; @org.jetbrains.annotations.NotNull() private final java.lang.Object x1; - @org.jetbrains.annotations.NotNull() - private final java.lang.Object x4; - public C();// .ctor() } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/exposedAnonymousType.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/exposedAnonymousType.java index 929b16c229b..ec0323542a1 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/exposedAnonymousType.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/exposedAnonymousType.java @@ -1,3 +1,26 @@ +public abstract class A /* A*/ { + public A();// .ctor() +} + +public abstract interface B /* B*/ { +} + +public final class C /* C*/ { + @org.jetbrains.annotations.NotNull() + private final A x2; + + @org.jetbrains.annotations.NotNull() + private final B x3; + + @org.jetbrains.annotations.NotNull() + private final java.lang.Object x1; + + @org.jetbrains.annotations.NotNull() + private final java.lang.Object x4; + + public C();// .ctor() +} + final class null /* null*/ { private ();// .ctor() } @@ -13,26 +36,3 @@ final class null /* null*/ implements B { final class null /* null*/ extends A implements B { private ();// .ctor() } - -public abstract class A /* A*/ { - public A();// .ctor() -} - -public abstract interface B /* B*/ { -} - -public final class C /* C*/ { - @org.jetbrains.annotations.NotNull() - private final A x2; - - @org.jetbrains.annotations.NotNull() - private final A x4; - - @org.jetbrains.annotations.NotNull() - private final B x3; - - @org.jetbrains.annotations.NotNull() - private final java.lang.Object x1; - - public C();// .ctor() -} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.descriptors.java new file mode 100644 index 00000000000..6f109415ef3 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.descriptors.java @@ -0,0 +1,5 @@ +public final class InlineOnlyKt /* InlineOnlyKt*/ { + @kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) + @kotlin.internal.InlineOnly() + private static final void foo();// foo() +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.fir.java deleted file mode 100644 index 2bba9598e40..00000000000 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.fir.java +++ /dev/null @@ -1,2 +0,0 @@ -public final class InlineOnlyKt /* InlineOnlyKt*/ { -} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.java index 6f109415ef3..2bba9598e40 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.java @@ -1,5 +1,2 @@ public final class InlineOnlyKt /* InlineOnlyKt*/ { - @kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) - @kotlin.internal.InlineOnly() - private static final void foo();// foo() } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/reifiedInlineReturnsObject.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/reifiedInlineReturnsObject.descriptors.java similarity index 95% rename from compiler/testData/asJava/lightClasses/lightClassByPsi/facades/reifiedInlineReturnsObject.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/reifiedInlineReturnsObject.descriptors.java index c183cacf3e7..e6264bed580 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/reifiedInlineReturnsObject.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/reifiedInlineReturnsObject.descriptors.java @@ -1,5 +1,4 @@ final class null /* null*/ extends PaginatedTableModel { - @java.lang.Override() @org.jetbrains.annotations.NotNull() public java.util.List getRows();// getRows() diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/reifiedInlineReturnsObject.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/reifiedInlineReturnsObject.java index e6264bed580..ecac528cbda 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/reifiedInlineReturnsObject.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/reifiedInlineReturnsObject.java @@ -1,10 +1,3 @@ -final class null /* null*/ extends PaginatedTableModel { - @org.jetbrains.annotations.NotNull() - public java.util.List getRows();// getRows() - - private ();// .ctor() -} - public abstract class PaginatedTableModel /* PaginatedTableModel*/ { @org.jetbrains.annotations.NotNull() public abstract java.util.List getRows();// getRows() @@ -14,3 +7,11 @@ public abstract class PaginatedTableModel /* PaginatedTableModel*/ { public final class ReifiedInlineReturnsObjectKt /* ReifiedInlineReturnsObjectKt*/ { } + +final class null /* null*/ extends PaginatedTableModel { + @java.lang.Override() + @org.jetbrains.annotations.NotNull() + public java.util.List getRows();// getRows() + + private ();// .ctor() +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.descriptors.java similarity index 88% rename from compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.descriptors.java index 5ca3b6f53ee..185dad0fdfa 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.descriptors.java @@ -7,6 +7,6 @@ public final class ThrowsAnnotationKt /* ThrowsAnnotationKt*/ { @org.jetbrains.annotations.NotNull() public static final java.lang.String readFile(@org.jetbrains.annotations.NotNull() java.lang.String) throws java.io.IOException, MyException;// readFile(java.lang.String) - @kotlin.jvm.Throws(exceptionClasses = {java.lang.Throwable.class}) + @kotlin.jvm.Throws(exceptionClasses = {kotlin.Throwable.class}) public static final void baz() throws java.lang.Throwable;// baz() } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.java index 185dad0fdfa..5ca3b6f53ee 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.java @@ -7,6 +7,6 @@ public final class ThrowsAnnotationKt /* ThrowsAnnotationKt*/ { @org.jetbrains.annotations.NotNull() public static final java.lang.String readFile(@org.jetbrains.annotations.NotNull() java.lang.String) throws java.io.IOException, MyException;// readFile(java.lang.String) - @kotlin.jvm.Throws(exceptionClasses = {kotlin.Throwable.class}) + @kotlin.jvm.Throws(exceptionClasses = {java.lang.Throwable.class}) public static final void baz() throws java.lang.Throwable;// baz() } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/valueClassInSignature.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/valueClassInSignature.descriptors.java new file mode 100644 index 00000000000..0427018b7e8 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/valueClassInSignature.descriptors.java @@ -0,0 +1,74 @@ +@kotlin.jvm.JvmInline() +public final class Some /* Some*/ { + @org.jetbrains.annotations.NotNull() + private final java.lang.String value; + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getValue();// getValue() + + public Some(@org.jetbrains.annotations.NotNull() java.lang.String);// .ctor(java.lang.String) +} + +public final class SomeClass /* SomeClass*/ { + @org.jetbrains.annotations.NotNull() + private java.lang.String memberProp; + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getMemberProp();// getMemberProp() + + @org.jetbrains.annotations.NotNull() + public final java.lang.String memberFunInReturn();// memberFunInReturn() + + public SomeClass();// .ctor() + + public final int getMemberPropInExtension(@org.jetbrains.annotations.NotNull() java.lang.String);// getMemberPropInExtension(java.lang.String) + + public final void memberFunInExtension(@org.jetbrains.annotations.NotNull() java.lang.String);// memberFunInExtension(java.lang.String) + + public final void memberFunInParameter(@org.jetbrains.annotations.NotNull() java.lang.String);// memberFunInParameter(java.lang.String) + + public final void setMemberProp(@org.jetbrains.annotations.NotNull() java.lang.String);// setMemberProp(java.lang.String) + + public final void setMemberPropInExtension(@org.jetbrains.annotations.NotNull() java.lang.String, int);// setMemberPropInExtension(java.lang.String, int) +} + +public abstract interface SomeInterface /* SomeInterface*/ { + @org.jetbrains.annotations.NotNull() + public abstract java.lang.String getMemberProp();// getMemberProp() + + @org.jetbrains.annotations.NotNull() + public abstract java.lang.String memberFunInReturn();// memberFunInReturn() + + public abstract int getMemberPropInExtension(@org.jetbrains.annotations.NotNull() java.lang.String);// getMemberPropInExtension(java.lang.String) + + public abstract void memberFunInExtension(@org.jetbrains.annotations.NotNull() java.lang.String);// memberFunInExtension(java.lang.String) + + public abstract void memberFunInParameter(@org.jetbrains.annotations.NotNull() java.lang.String);// memberFunInParameter(java.lang.String) + + public abstract void setMemberProp(@org.jetbrains.annotations.NotNull() java.lang.String);// setMemberProp(java.lang.String) + + public abstract void setMemberPropInExtension(@org.jetbrains.annotations.NotNull() java.lang.String, int);// setMemberPropInExtension(java.lang.String, int) + + class DefaultImpls ... +} + +public final class ValueClassInSignatureKt /* ValueClassInSignatureKt*/ { + @org.jetbrains.annotations.NotNull() + private static java.lang.String topLevelProp; + + @org.jetbrains.annotations.NotNull() + public static final java.lang.String getTopLevelProp();// getTopLevelProp() + + @org.jetbrains.annotations.NotNull() + public static final java.lang.String topLevelFunInReturn();// topLevelFunInReturn() + + public static final int getTopLevelPropInExtension(@org.jetbrains.annotations.NotNull() java.lang.String);// getTopLevelPropInExtension(java.lang.String) + + public static final void setTopLevelProp(@org.jetbrains.annotations.NotNull() java.lang.String);// setTopLevelProp(java.lang.String) + + public static final void setTopLevelPropInExtension(@org.jetbrains.annotations.NotNull() java.lang.String, int);// setTopLevelPropInExtension(java.lang.String, int) + + public static final void topLevelFunInExtension(@org.jetbrains.annotations.NotNull() java.lang.String);// topLevelFunInExtension(java.lang.String) + + public static final void topLevelFunInParameter(@org.jetbrains.annotations.NotNull() java.lang.String);// topLevelFunInParameter(java.lang.String) +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/valueClassInSignature.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/valueClassInSignature.fir.java deleted file mode 100644 index 15a0b565a55..00000000000 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/valueClassInSignature.fir.java +++ /dev/null @@ -1,32 +0,0 @@ -@kotlin.jvm.JvmInline() -public final class Some /* Some*/ { - @org.jetbrains.annotations.NotNull() - private final java.lang.String value; - - @org.jetbrains.annotations.NotNull() - public final java.lang.String getValue();// getValue() - - public Some(@org.jetbrains.annotations.NotNull() java.lang.String);// .ctor(java.lang.String) -} - -public final class SomeClass /* SomeClass*/ { - @org.jetbrains.annotations.NotNull() - private java.lang.String memberProp; - - public SomeClass();// .ctor() -} - -public abstract interface SomeInterface /* SomeInterface*/ { - class DefaultImpls ... -} - -public final class ValueClassInSignatureKt /* ValueClassInSignatureKt*/ { - @org.jetbrains.annotations.NotNull() - private static java.lang.String topLevelProp; - - @org.jetbrains.annotations.NotNull() - public static final java.lang.String getTopLevelProp();// getTopLevelProp() - - @org.jetbrains.annotations.NotNull() - public static final java.lang.String topLevelFunInReturn();// topLevelFunInReturn() -} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/valueClassInSignature.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/valueClassInSignature.java index 0427018b7e8..15a0b565a55 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/valueClassInSignature.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/valueClassInSignature.java @@ -13,42 +13,10 @@ public final class SomeClass /* SomeClass*/ { @org.jetbrains.annotations.NotNull() private java.lang.String memberProp; - @org.jetbrains.annotations.NotNull() - public final java.lang.String getMemberProp();// getMemberProp() - - @org.jetbrains.annotations.NotNull() - public final java.lang.String memberFunInReturn();// memberFunInReturn() - public SomeClass();// .ctor() - - public final int getMemberPropInExtension(@org.jetbrains.annotations.NotNull() java.lang.String);// getMemberPropInExtension(java.lang.String) - - public final void memberFunInExtension(@org.jetbrains.annotations.NotNull() java.lang.String);// memberFunInExtension(java.lang.String) - - public final void memberFunInParameter(@org.jetbrains.annotations.NotNull() java.lang.String);// memberFunInParameter(java.lang.String) - - public final void setMemberProp(@org.jetbrains.annotations.NotNull() java.lang.String);// setMemberProp(java.lang.String) - - public final void setMemberPropInExtension(@org.jetbrains.annotations.NotNull() java.lang.String, int);// setMemberPropInExtension(java.lang.String, int) } public abstract interface SomeInterface /* SomeInterface*/ { - @org.jetbrains.annotations.NotNull() - public abstract java.lang.String getMemberProp();// getMemberProp() - - @org.jetbrains.annotations.NotNull() - public abstract java.lang.String memberFunInReturn();// memberFunInReturn() - - public abstract int getMemberPropInExtension(@org.jetbrains.annotations.NotNull() java.lang.String);// getMemberPropInExtension(java.lang.String) - - public abstract void memberFunInExtension(@org.jetbrains.annotations.NotNull() java.lang.String);// memberFunInExtension(java.lang.String) - - public abstract void memberFunInParameter(@org.jetbrains.annotations.NotNull() java.lang.String);// memberFunInParameter(java.lang.String) - - public abstract void setMemberProp(@org.jetbrains.annotations.NotNull() java.lang.String);// setMemberProp(java.lang.String) - - public abstract void setMemberPropInExtension(@org.jetbrains.annotations.NotNull() java.lang.String, int);// setMemberPropInExtension(java.lang.String, int) - class DefaultImpls ... } @@ -61,14 +29,4 @@ public final class ValueClassInSignatureKt /* ValueClassInSignatureKt*/ { @org.jetbrains.annotations.NotNull() public static final java.lang.String topLevelFunInReturn();// topLevelFunInReturn() - - public static final int getTopLevelPropInExtension(@org.jetbrains.annotations.NotNull() java.lang.String);// getTopLevelPropInExtension(java.lang.String) - - public static final void setTopLevelProp(@org.jetbrains.annotations.NotNull() java.lang.String);// setTopLevelProp(java.lang.String) - - public static final void setTopLevelPropInExtension(@org.jetbrains.annotations.NotNull() java.lang.String, int);// setTopLevelPropInExtension(java.lang.String, int) - - public static final void topLevelFunInExtension(@org.jetbrains.annotations.NotNull() java.lang.String);// topLevelFunInExtension(java.lang.String) - - public static final void topLevelFunInParameter(@org.jetbrains.annotations.NotNull() java.lang.String);// topLevelFunInParameter(java.lang.String) } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/inferringAnonymousObjectTypes.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/inferringAnonymousObjectTypes.fir.java index d88c32f03ae..952dd4bae18 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/inferringAnonymousObjectTypes.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/inferringAnonymousObjectTypes.fir.java @@ -1,43 +1,3 @@ -final class null /* null*/ { - private ();// .ctor() -} - -final class null /* null*/ { - @java.lang.Override() - @org.jetbrains.annotations.NotNull() - public java.lang.String toString();// toString() - - private ();// .ctor() -} - -final class null /* null*/ implements java.lang.Runnable { - @java.lang.Override() - public void run();// run() - - private ();// .ctor() -} - -final class null /* null*/ implements java.lang.Runnable { - @java.lang.Override() - public void run();// run() - - private ();// .ctor() -} - -final class null /* null*/ implements I, java.lang.Runnable { - @java.lang.Override() - public void run();// run() - - private ();// .ctor() -} - -final class null /* null*/ implements I, java.lang.Runnable { - @java.lang.Override() - public void run();// run() - - private ();// .ctor() -} - final class C /* C*/ { @org.jetbrains.annotations.NotNull() private final kotlin.jvm.functions.Function0 initChild; @@ -87,3 +47,43 @@ public final class ValidPublicSupertype /* ValidPublicSupertype*/ { public ValidPublicSupertype();// .ctor() } + +final class null /* null*/ { + private ();// .ctor() +} + +final class null /* null*/ { + @java.lang.Override() + @org.jetbrains.annotations.NotNull() + public java.lang.String toString();// toString() + + private ();// .ctor() +} + +final class null /* null*/ implements java.lang.Runnable { + @java.lang.Override() + public void run();// run() + + private ();// .ctor() +} + +final class null /* null*/ implements java.lang.Runnable { + @java.lang.Override() + public void run();// run() + + private ();// .ctor() +} + +final class null /* null*/ implements I, java.lang.Runnable { + @java.lang.Override() + public void run();// run() + + private ();// .ctor() +} + +final class null /* null*/ implements I, java.lang.Runnable { + @java.lang.Override() + public void run();// run() + + private ();// .ctor() +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmField.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmField.fir.java index 056ad0acfe3..ee227155dd4 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmField.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmField.fir.java @@ -21,6 +21,10 @@ public final class A /* A*/ { class Companion ... } +public static final class Companion /* A.Companion*/ { + private Companion();// .ctor() +} + public abstract interface B /* B*/ { @kotlin.jvm.JvmField() @org.jetbrains.annotations.NotNull() @@ -32,6 +36,10 @@ public abstract interface B /* B*/ { class Companion ... } +public static final class Companion /* B.Companion*/ { + private Companion();// .ctor() +} + public final class C /* C*/ { @kotlin.jvm.JvmField() @org.jetbrains.annotations.NotNull() @@ -44,11 +52,3 @@ public final class C /* C*/ { public C(@org.jetbrains.annotations.NotNull() java.util.Collection, int);// .ctor(java.util.Collection, int) } - -public static final class Companion /* A.Companion*/ { - private Companion();// .ctor() -} - -public static final class Companion /* B.Companion*/ { - private Companion();// .ctor() -} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmRecord.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmRecord.descriptors.java similarity index 93% rename from compiler/testData/asJava/lightClasses/lightClassByPsi/jvmRecord.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/jvmRecord.descriptors.java index 8f66d2ec126..ca4bb4fd883 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmRecord.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmRecord.descriptors.java @@ -7,7 +7,7 @@ public final class MyRec /* pkg.MyRec*/ { public final java.lang.String component1();// component1() @org.jetbrains.annotations.NotNull() - public final java.lang.String getName();// getName() + public final java.lang.String name();// name() @org.jetbrains.annotations.NotNull() public final pkg.MyRec copy(@org.jetbrains.annotations.NotNull() java.lang.String);// copy(java.lang.String) @@ -20,5 +20,4 @@ public final class MyRec /* pkg.MyRec*/ { public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object) public int hashCode();// hashCode() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmRecord.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmRecord.java index ca4bb4fd883..8f66d2ec126 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmRecord.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmRecord.java @@ -7,7 +7,7 @@ public final class MyRec /* pkg.MyRec*/ { public final java.lang.String component1();// component1() @org.jetbrains.annotations.NotNull() - public final java.lang.String name();// name() + public final java.lang.String getName();// getName() @org.jetbrains.annotations.NotNull() public final pkg.MyRec copy(@org.jetbrains.annotations.NotNull() java.lang.String);// copy(java.lang.String) @@ -20,4 +20,5 @@ public final class MyRec /* pkg.MyRec*/ { public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object) public int hashCode();// hashCode() + } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.fir.java index 377b7845e17..8f57f30665d 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.fir.java @@ -1,18 +1,3 @@ -public static final class Companion /* MyClass.Companion*/ { - @kotlin.jvm.JvmStatic() - @org.jetbrains.annotations.NotNull() - public final java.lang.String getProp2();// getProp2() - - @kotlin.jvm.JvmStatic() - public final void setProp(int);// setProp(int) - - private Companion();// .ctor() - - public final int getProp();// getProp() - - public final void setProp2(@org.jetbrains.annotations.NotNull() java.lang.String);// setProp2(java.lang.String) -} - public final class MyClass /* MyClass*/ { @org.jetbrains.annotations.NotNull() private static java.lang.String prop2 = "" /* initializer type: java.lang.String */; @@ -33,3 +18,18 @@ public final class MyClass /* MyClass*/ { class Companion ... } + +public static final class Companion /* MyClass.Companion*/ { + @kotlin.jvm.JvmStatic() + @org.jetbrains.annotations.NotNull() + public final java.lang.String getProp2();// getProp2() + + @kotlin.jvm.JvmStatic() + public final void setProp(int);// setProp(int) + + private Companion();// .ctor() + + public final int getProp();// getProp() + + public final void setProp2(@org.jetbrains.annotations.NotNull() java.lang.String);// setProp2(java.lang.String) +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.lib.java index abe28eb71f0..534629d7500 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmStaticOnPropertySetter.lib.java @@ -1,18 +1,3 @@ -public static final class Companion /* MyClass.Companion*/ { - @kotlin.jvm.JvmStatic() - @org.jetbrains.annotations.NotNull() - public final java.lang.String getProp2();// getProp2() - - @kotlin.jvm.JvmStatic() - public final void setProp(int);// setProp(int) - - private Companion();// .ctor() - - public final int getProp();// getProp() - - public final void setProp2(@org.jetbrains.annotations.NotNull() java.lang.String);// setProp2(java.lang.String) -} - public final class MyClass /* MyClass*/ { @org.jetbrains.annotations.NotNull() private static java.lang.String prop2; @@ -33,3 +18,18 @@ public final class MyClass /* MyClass*/ { class Companion ... } + +public static final class Companion /* MyClass.Companion*/ { + @kotlin.jvm.JvmStatic() + @org.jetbrains.annotations.NotNull() + public final java.lang.String getProp2();// getProp2() + + @kotlin.jvm.JvmStatic() + public final void setProp(int);// setProp(int) + + private Companion();// .ctor() + + public final int getProp();// getProp() + + public final void setProp2(@org.jetbrains.annotations.NotNull() java.lang.String);// setProp2(java.lang.String) +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.descriptors.java similarity index 77% rename from compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.descriptors.java index e47de9bb479..e77b7cc6a56 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.descriptors.java @@ -1,7 +1,5 @@ public final class A /* A*/ { - private int z = 1 /* initializer type: int */; - - public A f; + private int z; public A();// .ctor() diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.java index e77b7cc6a56..e47de9bb479 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSynthetic.java @@ -1,5 +1,7 @@ public final class A /* A*/ { - private int z; + private int z = 1 /* initializer type: int */; + + public A f; public A();// .ctor() diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSyntheticForAccessors.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSyntheticForAccessors.descriptors.java similarity index 58% rename from compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSyntheticForAccessors.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSyntheticForAccessors.descriptors.java index df89d6d5488..1692c330141 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSyntheticForAccessors.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSyntheticForAccessors.descriptors.java @@ -1,8 +1,4 @@ public final class X /* X*/ { - private int v = 1 /* initializer type: int */; - - private int w = 1 /* initializer type: int */; - public X();// .ctor() public final int getW();// getW() diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSyntheticForAccessors.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSyntheticForAccessors.java index 1692c330141..df89d6d5488 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSyntheticForAccessors.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmSyntheticForAccessors.java @@ -1,4 +1,8 @@ public final class X /* X*/ { + private int v = 1 /* initializer type: int */; + + private int w = 1 /* initializer type: int */; + public X();// .ctor() public final int getW();// getW() diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.descriptors.java index 7c207482f51..5f902365d1c 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.descriptors.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.descriptors.java @@ -101,10 +101,6 @@ private static final class Companion /* C1.Companion*/ { private Companion();// .ctor() } -public static final class Companion /* I.Companion*/ { - private Companion();// .ctor() -} - public static final class Companion /* C2.Companion*/ { private Companion();// .ctor() } @@ -113,6 +109,10 @@ public static final class Companion /* ClassWithConstContainer.Companion*/ { private Companion();// .ctor() } +public static final class Companion /* I.Companion*/ { + private Companion();// .ctor() +} + public final class ConstContainer /* ConstContainer*/ { @org.jetbrains.annotations.NotNull() public static final ConstContainer INSTANCE; diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.java index 7c513d7eb5c..0bf27759011 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.java @@ -28,48 +28,6 @@ public final class C /* C*/ { class Companion ... } -public final class C1 /* C1*/ { - @org.jetbrains.annotations.NotNull() - private static final C1.Companion Companion; - - public C1();// .ctor() - - class Companion ... -} - -public final class C2 /* C2*/ { - @org.jetbrains.annotations.NotNull() - public static final C2.Companion Companion; - - public C2();// .ctor() - - class Companion ... -} - -public final class ClassWithConstContainer /* ClassWithConstContainer*/ { - @org.jetbrains.annotations.NotNull() - public static final ClassWithConstContainer.Companion Companion; - - @org.jetbrains.annotations.NotNull() - public static final java.lang.String str = "one" /* initializer type: java.lang.String */ /* constant value one */; - - public static final double complexFloat = 5.118281745910645 /* initializer type: double */ /* constant value 5.118281745910645 */; - - public static final double e = 2.7182818284 /* initializer type: double */ /* constant value 2.7182818284 */; - - public static final float eFloat = 2.7182817f /* initializer type: float */ /* constant value 2.7182817 */; - - public static final int one = 1 /* initializer type: int */ /* constant value 1 */; - - public static final long complexLong = 2L /* initializer type: long */ /* constant value 2 */; - - public static final long oneLong = 1L /* initializer type: long */ /* constant value 1 */; - - public ClassWithConstContainer();// .ctor() - - class Companion ... -} - public static final class Companion /* C.Companion*/ { @java.lang.Deprecated() @kotlin.jvm.JvmStatic() @@ -101,18 +59,56 @@ public static final class Companion /* C.Companion*/ { public final void setX(@org.jetbrains.annotations.NotNull() java.lang.String);// setX(java.lang.String) } +public final class C1 /* C1*/ { + @org.jetbrains.annotations.NotNull() + private static final C1.Companion Companion; + + public C1();// .ctor() + + class Companion ... +} + private static final class Companion /* C1.Companion*/ { private Companion();// .ctor() } -public static final class Companion /* I.Companion*/ { - private Companion();// .ctor() +public final class C2 /* C2*/ { + @org.jetbrains.annotations.NotNull() + public static final C2.Companion Companion; + + public C2();// .ctor() + + class Companion ... } public static final class Companion /* C2.Companion*/ { private Companion();// .ctor() } +public final class ClassWithConstContainer /* ClassWithConstContainer*/ { + @org.jetbrains.annotations.NotNull() + public static final ClassWithConstContainer.Companion Companion; + + @org.jetbrains.annotations.NotNull() + public static final java.lang.String str = "one" /* initializer type: java.lang.String */ /* constant value one */; + + public static final double complexFloat = 5.118281745910645 /* initializer type: double */ /* constant value 5.118281745910645 */; + + public static final double e = 2.7182818284 /* initializer type: double */ /* constant value 2.7182818284 */; + + public static final float eFloat = 2.7182817f /* initializer type: float */ /* constant value 2.7182817 */; + + public static final int one = 1 /* initializer type: int */ /* constant value 1 */; + + public static final long complexLong = 2L /* initializer type: long */ /* constant value 2 */; + + public static final long oneLong = 1L /* initializer type: long */ /* constant value 1 */; + + public ClassWithConstContainer();// .ctor() + + class Companion ... +} + public static final class Companion /* ClassWithConstContainer.Companion*/ { private Companion();// .ctor() } @@ -146,6 +142,10 @@ public abstract interface I /* I*/ { class Companion ... } +public static final class Companion /* I.Companion*/ { + private Companion();// .ctor() +} + public final class Obj /* Obj*/ implements java.lang.Runnable { @org.jetbrains.annotations.NotNull() private static java.lang.String x = "" /* initializer type: java.lang.String */; diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.lib.java index bc0979f3c41..d5951462ece 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/objects.lib.java @@ -28,6 +28,33 @@ public final class C /* C*/ { class Companion ... } +public static final class Companion /* C.Companion*/ { + @kotlin.jvm.JvmStatic() + @org.jetbrains.annotations.NotNull() + public final java.lang.String getC(@org.jetbrains.annotations.NotNull() I);// getC(I) + + @kotlin.jvm.JvmStatic() + public final void foo();// foo() + + @kotlin.jvm.JvmStatic() + public final void setC(@org.jetbrains.annotations.NotNull() I, @org.jetbrains.annotations.NotNull() java.lang.String);// setC(I, java.lang.String) + + @kotlin.jvm.JvmStatic() + public final void setC1(@org.jetbrains.annotations.NotNull() java.lang.String);// setC1(java.lang.String) + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getC1();// getC1() + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getX();// getX() + + private Companion();// .ctor() + + public final void bar();// bar() + + public final void setX(@org.jetbrains.annotations.NotNull() java.lang.String);// setX(java.lang.String) +} + public final class C1 /* C1*/ { @org.jetbrains.annotations.NotNull() private static final C1.Companion Companion; @@ -37,6 +64,10 @@ public final class C1 /* C1*/ { class Companion ... } +private static final class Companion /* C1.Companion*/ { + private Companion();// .ctor() +} + public final class C2 /* C2*/ { @org.jetbrains.annotations.NotNull() public static final C2.Companion Companion; @@ -46,6 +77,10 @@ public final class C2 /* C2*/ { class Companion ... } +public static final class Companion /* C2.Companion*/ { + private Companion();// .ctor() +} + public final class ClassWithConstContainer /* ClassWithConstContainer*/ { @org.jetbrains.annotations.NotNull() public static final ClassWithConstContainer.Companion Companion; @@ -70,49 +105,10 @@ public final class ClassWithConstContainer /* ClassWithConstContainer*/ { class Companion ... } -private static final class Companion /* C1.Companion*/ { - private Companion();// .ctor() -} - -public static final class Companion /* C2.Companion*/ { - private Companion();// .ctor() -} - -public static final class Companion /* I.Companion*/ { - private Companion();// .ctor() -} - public static final class Companion /* ClassWithConstContainer.Companion*/ { private Companion();// .ctor() } -public static final class Companion /* C.Companion*/ { - @kotlin.jvm.JvmStatic() - @org.jetbrains.annotations.NotNull() - public final java.lang.String getC(@org.jetbrains.annotations.NotNull() I);// getC(I) - - @kotlin.jvm.JvmStatic() - public final void foo();// foo() - - @kotlin.jvm.JvmStatic() - public final void setC(@org.jetbrains.annotations.NotNull() I, @org.jetbrains.annotations.NotNull() java.lang.String);// setC(I, java.lang.String) - - @kotlin.jvm.JvmStatic() - public final void setC1(@org.jetbrains.annotations.NotNull() java.lang.String);// setC1(java.lang.String) - - @org.jetbrains.annotations.NotNull() - public final java.lang.String getC1();// getC1() - - @org.jetbrains.annotations.NotNull() - public final java.lang.String getX();// getX() - - private Companion();// .ctor() - - public final void bar();// bar() - - public final void setX(@org.jetbrains.annotations.NotNull() java.lang.String);// setX(java.lang.String) -} - public final class ConstContainer /* ConstContainer*/ { @org.jetbrains.annotations.NotNull() public static final ConstContainer INSTANCE; @@ -142,6 +138,10 @@ public abstract interface I /* I*/ { class Companion ... } +public static final class Companion /* I.Companion*/ { + private Companion();// .ctor() +} + public final class Obj /* Obj*/ implements java.lang.Runnable { @org.jetbrains.annotations.NotNull() private static java.lang.String x; diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.fir.java index 0f03d74a7fa..bc40a6c9925 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.fir.java @@ -6,18 +6,6 @@ public abstract interface A /* A*/ { public abstract void setInt2(int);// setInt2(int) } -public static final class Companion /* Foo.Companion*/ { - private Companion();// .ctor() - - public final int getF1();// getF1() - - public final int getProp3();// getProp3() - - public final int getProp7();// getProp7() - - public final void setProp7(int);// setProp7(int) -} - public final class Foo /* Foo*/ { @org.jetbrains.annotations.NotNull() private final Foo b; @@ -218,6 +206,18 @@ D'E"F\G$H */; class Companion ... } +public static final class Companion /* Foo.Companion*/ { + private Companion();// .ctor() + + public final int getF1();// getF1() + + public final int getProp3();// getProp3() + + public final int getProp7();// getProp7() + + public final void setProp7(int);// setProp7(int) +} + public final class Foo2 /* Foo2*/ { @org.jetbrains.annotations.NotNull() public final Foo getFoo();// getFoo() diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/propertyAnnotations.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/propertyAnnotations.descriptors.java similarity index 50% rename from compiler/testData/asJava/lightClasses/lightClassByPsi/propertyAnnotations.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/propertyAnnotations.descriptors.java index 35ecf2c2b49..868b1037890 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/propertyAnnotations.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/propertyAnnotations.descriptors.java @@ -7,9 +7,9 @@ public final class C /* C*/ { @org.jetbrains.annotations.NotNull() public static final C.Companion Companion; - private static final int x = 1 /* initializer type: int */; + private static final int x; - private static final int y = 2 /* initializer type: int */; + private static final int y; public C();// .ctor() @@ -19,15 +19,6 @@ public final class C /* C*/ { } public static final class Companion /* C.Companion*/ { - @Anno(p = "x") - @java.lang.Deprecated() - public static void getX$annotations();// getX$annotations() - - @Anno(p = "y") - @java.lang.Deprecated() - @kotlin.jvm.JvmStatic() - public static void getY$annotations();// getY$annotations() - private Companion();// .ctor() public final int getX();// getX() @@ -36,15 +27,7 @@ public static final class Companion /* C.Companion*/ { } public class O /* O*/ { - private final int protectedProperty = 1 /* initializer type: int */; - - @Anno(p = "private") - @java.lang.Deprecated() - private static void getPrivateProperty$annotations();// getPrivateProperty$annotations() - - @Anno(p = "protected") - @java.lang.Deprecated() - protected static void getProtectedProperty$annotations();// getProtectedProperty$annotations() + private final int protectedProperty; private final int getPrivateProperty();// getPrivateProperty() @@ -56,39 +39,15 @@ public class O /* O*/ { public final class PropertyAnnotationsKt /* PropertyAnnotationsKt*/ { @kotlin.jvm.Transient() @kotlin.jvm.Volatile() - private static transient volatile int jvmFlags = 0 /* initializer type: int */; + private static transient volatile int jvmFlags; @org.jetbrains.annotations.NotNull() - private static final java.lang.String nonNullable = "" /* initializer type: java.lang.String */; + private static final java.lang.String nonNullable; @org.jetbrains.annotations.Nullable() - private static final java.lang.String nullable = null /* initializer type: null */; + private static final java.lang.String nullable; - private static final int deprecated = 0 /* initializer type: int */; - - @Anno(p = "nonNullable") - @java.lang.Deprecated() - public static void getNonNullable$annotations();// getNonNullable$annotations() - - @Anno(p = "nullable") - @java.lang.Deprecated() - public static void getNullable$annotations();// getNullable$annotations() - - @Anno(p = "property") - @java.lang.Deprecated() - public static void getExtensionProperty1$annotations(java.lang.Object);// getExtensionProperty1$annotations(java.lang.Object) - - @Anno(p = "property") - @java.lang.Deprecated() - public static void getExtensionProperty2$annotations(java.util.List);// getExtensionProperty2$annotations(java.util.List) - - @Anno(p = "property") - @java.lang.Deprecated() - public static void getExtensionProperty3$annotations(java.util.Map);// getExtensionProperty3$annotations(java.util.Map) - - @java.lang.Deprecated() - @kotlin.Deprecated(message = "deprecated") - public static void getDeprecated$annotations();// getDeprecated$annotations() + private static final int deprecated; @org.jetbrains.annotations.NotNull() public static final java.lang.String getNonNullable();// getNonNullable() diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/propertyAnnotations.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/propertyAnnotations.java index 868b1037890..35ecf2c2b49 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/propertyAnnotations.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/propertyAnnotations.java @@ -7,9 +7,9 @@ public final class C /* C*/ { @org.jetbrains.annotations.NotNull() public static final C.Companion Companion; - private static final int x; + private static final int x = 1 /* initializer type: int */; - private static final int y; + private static final int y = 2 /* initializer type: int */; public C();// .ctor() @@ -19,6 +19,15 @@ public final class C /* C*/ { } public static final class Companion /* C.Companion*/ { + @Anno(p = "x") + @java.lang.Deprecated() + public static void getX$annotations();// getX$annotations() + + @Anno(p = "y") + @java.lang.Deprecated() + @kotlin.jvm.JvmStatic() + public static void getY$annotations();// getY$annotations() + private Companion();// .ctor() public final int getX();// getX() @@ -27,7 +36,15 @@ public static final class Companion /* C.Companion*/ { } public class O /* O*/ { - private final int protectedProperty; + private final int protectedProperty = 1 /* initializer type: int */; + + @Anno(p = "private") + @java.lang.Deprecated() + private static void getPrivateProperty$annotations();// getPrivateProperty$annotations() + + @Anno(p = "protected") + @java.lang.Deprecated() + protected static void getProtectedProperty$annotations();// getProtectedProperty$annotations() private final int getPrivateProperty();// getPrivateProperty() @@ -39,15 +56,39 @@ public class O /* O*/ { public final class PropertyAnnotationsKt /* PropertyAnnotationsKt*/ { @kotlin.jvm.Transient() @kotlin.jvm.Volatile() - private static transient volatile int jvmFlags; + private static transient volatile int jvmFlags = 0 /* initializer type: int */; @org.jetbrains.annotations.NotNull() - private static final java.lang.String nonNullable; + private static final java.lang.String nonNullable = "" /* initializer type: java.lang.String */; @org.jetbrains.annotations.Nullable() - private static final java.lang.String nullable; + private static final java.lang.String nullable = null /* initializer type: null */; - private static final int deprecated; + private static final int deprecated = 0 /* initializer type: int */; + + @Anno(p = "nonNullable") + @java.lang.Deprecated() + public static void getNonNullable$annotations();// getNonNullable$annotations() + + @Anno(p = "nullable") + @java.lang.Deprecated() + public static void getNullable$annotations();// getNullable$annotations() + + @Anno(p = "property") + @java.lang.Deprecated() + public static void getExtensionProperty1$annotations(java.lang.Object);// getExtensionProperty1$annotations(java.lang.Object) + + @Anno(p = "property") + @java.lang.Deprecated() + public static void getExtensionProperty2$annotations(java.util.List);// getExtensionProperty2$annotations(java.util.List) + + @Anno(p = "property") + @java.lang.Deprecated() + public static void getExtensionProperty3$annotations(java.util.Map);// getExtensionProperty3$annotations(java.util.Map) + + @java.lang.Deprecated() + @kotlin.Deprecated(message = "deprecated") + public static void getDeprecated$annotations();// getDeprecated$annotations() @org.jetbrains.annotations.NotNull() public static final java.lang.String getNonNullable();// getNonNullable() diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/FunsPropsAndFields.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/FunsPropsAndFields.descriptors.java similarity index 76% rename from compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/FunsPropsAndFields.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/FunsPropsAndFields.descriptors.java index c2c6d2045a6..d4803cde03d 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/FunsPropsAndFields.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/FunsPropsAndFields.descriptors.java @@ -1,10 +1,10 @@ public final class FunsPropsAndFields /* FunsPropsAndFields*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs { @kotlin.jvm.JvmField() - public final int testField = 42 /* initializer type: int */; + public final int testField; - private final int testPropVal = 42 /* initializer type: int */; + private final int testPropVal; - private int testPropVar = 42 /* initializer type: int */; + private int testPropVar; @org.jetbrains.annotations.NotNull() public final java.lang.String testFun(int);// testFun(int) diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/FunsPropsAndFields.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/FunsPropsAndFields.java index d4803cde03d..c2c6d2045a6 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/FunsPropsAndFields.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/FunsPropsAndFields.java @@ -1,10 +1,10 @@ public final class FunsPropsAndFields /* FunsPropsAndFields*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs { @kotlin.jvm.JvmField() - public final int testField; + public final int testField = 42 /* initializer type: int */; - private final int testPropVal; + private final int testPropVal = 42 /* initializer type: int */; - private int testPropVar; + private int testPropVar = 42 /* initializer type: int */; @org.jetbrains.annotations.NotNull() public final java.lang.String testFun(int);// testFun(int) diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.descriptors.java new file mode 100644 index 00000000000..848b4413b29 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.descriptors.java @@ -0,0 +1,29 @@ +public static final class Bar /* InnerClasses.Bar*/ { + private final int a; + + private final int b; + + public Bar(int);// .ctor(int) + + public final int getA();// getA() + + public final int getAPlusB();// getAPlusB() + + public final int getB();// getB() + + class Baz ... +} + +public static final class Baz /* InnerClasses.Bar.Baz*/ { + public Baz();// .ctor() + + public final void doSomething();// doSomething() +} + +public final class InnerClasses /* InnerClasses*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs { + public InnerClasses(java.lang.String[]);// .ctor(java.lang.String[]) + + public static final void main(java.lang.String[]);// main(java.lang.String[]) + + class Bar ... +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.java index 848b4413b29..cfbf3ec7680 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.java @@ -1,3 +1,11 @@ +public final class InnerClasses /* InnerClasses*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs { + public InnerClasses(java.lang.String[]);// .ctor(java.lang.String[]) + + public static final void main(java.lang.String[]);// main(java.lang.String[]) + + class Bar ... +} + public static final class Bar /* InnerClasses.Bar*/ { private final int a; @@ -19,11 +27,3 @@ public static final class Baz /* InnerClasses.Bar.Baz*/ { public final void doSomething();// doSomething() } - -public final class InnerClasses /* InnerClasses*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs { - public InnerClasses(java.lang.String[]);// .ctor(java.lang.String[]) - - public static final void main(java.lang.String[]);// main(java.lang.String[]) - - class Bar ... -} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.descriptors.java similarity index 97% rename from compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.descriptors.java index 773a516fa8e..fefc5d9cb52 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.descriptors.java @@ -32,12 +32,8 @@ public static final class C /* A B.C*/ { public enum StrangeEnum /* StrangeEnum*/ { InvalidFieldName; - @org.jetbrains.annotations.NotNull() private final java.lang.String size; - @org.jetbrains.annotations.NotNull() - public final java.lang.String getSize();// getSize() - @org.jetbrains.annotations.NotNull() public static StrangeEnum valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) @@ -48,6 +44,8 @@ public enum StrangeEnum /* StrangeEnum*/ { public static kotlin.enums.EnumEntries getEntries();// getEntries() private StrangeEnum(java.lang.String);// .ctor(java.lang.String) + + public final java.lang.String getSize();// getSize() } public final class Test /* Test*/ { diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.java index 5ba04c3904a..8f46ed7172e 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.java @@ -2,16 +2,16 @@ public final class !A@ /* !A@*/ { public !A@();// .ctor() } -public static final class (^_^) /* Test.(^_^)*/ { - public (^_^)();// .ctor() -} - public final class A B /* A B*/ { public A B();// .ctor() class C ... } +public static final class C /* A B.C*/ { + public C();// .ctor() +} + public final class A()B() /* A()B()*/ { public A()B()();// .ctor() } @@ -25,24 +25,25 @@ public abstract @interface Anno /* Anno*/ { public abstract java.lang.String name();// name() } -public static final class C /* A B.C*/ { - public C();// .ctor() -} - public enum StrangeEnum /* StrangeEnum*/ { InvalidFieldName; + @org.jetbrains.annotations.NotNull() private final java.lang.String size; + @org.jetbrains.annotations.NotNull() + public final java.lang.String getSize();// getSize() + @org.jetbrains.annotations.NotNull() public static StrangeEnum valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) @org.jetbrains.annotations.NotNull() public static StrangeEnum[] values();// values() - private StrangeEnum(java.lang.String);// .ctor(java.lang.String) + @org.jetbrains.annotations.NotNull() + public static kotlin.enums.EnumEntries getEntries();// getEntries() - public final java.lang.String getSize();// getSize() + private StrangeEnum(java.lang.String);// .ctor(java.lang.String) } public final class Test /* Test*/ { @@ -83,3 +84,7 @@ public final class Test /* Test*/ { class (^_^) ... } + +public static final class (^_^) /* Test.(^_^)*/ { + public (^_^)();// .ctor() +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.lib.java index 4bf69cf458f..92ca259b19a 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.lib.java @@ -2,16 +2,16 @@ public final class !A@ /* !A@*/ { public !A@();// .ctor() } -public static final class (^_^) /* Test.(^_^)*/ { - public (^_^)();// .ctor() -} - public final class A B /* A B*/ { public A B();// .ctor() class C ... } +public static final class C /* A B.C*/ { + public C();// .ctor() +} + public final class A()B() /* A()B()*/ { public A()B()();// .ctor() } @@ -25,10 +25,6 @@ public abstract @interface Anno /* Anno*/ { public abstract java.lang.String name();// name() } -public static final class C /* A B.C*/ { - public C();// .ctor() -} - public enum StrangeEnum /* StrangeEnum*/ { InvalidFieldName; @@ -88,3 +84,7 @@ public final class Test /* Test*/ { class (^_^) ... } + +public static final class (^_^) /* Test.(^_^)*/ { + public (^_^)();// .ctor() +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.descriptors.java similarity index 77% rename from compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.descriptors.java index 32d785bd198..1010244c3aa 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.descriptors.java @@ -3,13 +3,14 @@ public final class C /* C*/ { @org.jetbrains.annotations.NotNull() public final java.lang.String readFile(@org.jetbrains.annotations.NotNull() java.lang.String) throws java.io.IOException, MyException;// readFile(java.lang.String) + @kotlin.jvm.Throws(exceptionClasses = {java.lang.Exception.class}) + public C() throws java.lang.Exception;// .ctor() + @kotlin.jvm.Throws(exceptionClasses = {java.lang.Exception.class}) public C(int) throws java.lang.Exception;// .ctor(int) - @kotlin.jvm.Throws(exceptionClasses = {java.lang.Throwable.class}) + @kotlin.jvm.Throws(exceptionClasses = {kotlin.Throwable.class}) public final void baz() throws java.lang.Throwable;// baz() - - public C();// .ctor() } public final class MyException /* MyException*/ extends java.lang.Exception { diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.java index 1010244c3aa..32d785bd198 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/throwsAnnotation.java @@ -3,14 +3,13 @@ public final class C /* C*/ { @org.jetbrains.annotations.NotNull() public final java.lang.String readFile(@org.jetbrains.annotations.NotNull() java.lang.String) throws java.io.IOException, MyException;// readFile(java.lang.String) - @kotlin.jvm.Throws(exceptionClasses = {java.lang.Exception.class}) - public C() throws java.lang.Exception;// .ctor() - @kotlin.jvm.Throws(exceptionClasses = {java.lang.Exception.class}) public C(int) throws java.lang.Exception;// .ctor(int) - @kotlin.jvm.Throws(exceptionClasses = {kotlin.Throwable.class}) + @kotlin.jvm.Throws(exceptionClasses = {java.lang.Throwable.class}) public final void baz() throws java.lang.Throwable;// baz() + + public C();// .ctor() } public final class MyException /* MyException*/ extends java.lang.Exception { diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAnnotations.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAnnotations.descriptors.java similarity index 93% rename from compiler/testData/asJava/lightClasses/lightClassByPsi/typeAnnotations.fir.java rename to compiler/testData/asJava/lightClasses/lightClassByPsi/typeAnnotations.descriptors.java index d90725f5d66..925c8714762 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAnnotations.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAnnotations.descriptors.java @@ -53,17 +53,17 @@ public final class Y /* Y*/ { public final class klass /* klass*/ { @org.jetbrains.annotations.Nullable() - private final java.util.List y = null /* initializer type: null */; + private final java.util.List<@A0() java.lang.Integer> y; - private final int x = 2 /* initializer type: int */; + private final @A0() int x; @org.jetbrains.annotations.NotNull() public final @A6() X annotatedMethod(@org.jetbrains.annotations.NotNull() @A0() P<@A1() X, P<@A2() @A3() X, @A4() Y>>, @org.jetbrains.annotations.NotNull() @A5() Y[]);// annotatedMethod(@A0() P<@A1() X, P<@A2() @A3() X, @A4() Y>>, @A5() Y[]) @org.jetbrains.annotations.Nullable() - public final java.util.List getY();// getY() + public final java.util.List<@A0() java.lang.Integer> getY();// getY() public klass();// .ctor() - public final int getX();// getX() + public final @A0() int getX();// getX() } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAnnotations.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAnnotations.java index 925c8714762..d90725f5d66 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAnnotations.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAnnotations.java @@ -53,17 +53,17 @@ public final class Y /* Y*/ { public final class klass /* klass*/ { @org.jetbrains.annotations.Nullable() - private final java.util.List<@A0() java.lang.Integer> y; + private final java.util.List y = null /* initializer type: null */; - private final @A0() int x; + private final int x = 2 /* initializer type: int */; @org.jetbrains.annotations.NotNull() public final @A6() X annotatedMethod(@org.jetbrains.annotations.NotNull() @A0() P<@A1() X, P<@A2() @A3() X, @A4() Y>>, @org.jetbrains.annotations.NotNull() @A5() Y[]);// annotatedMethod(@A0() P<@A1() X, P<@A2() @A3() X, @A4() Y>>, @A5() Y[]) @org.jetbrains.annotations.Nullable() - public final java.util.List<@A0() java.lang.Integer> getY();// getY() + public final java.util.List getY();// getY() public klass();// .ctor() - public final @A0() int getX();// getX() + public final int getX();// getX() }