diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationClass.fir.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationClass.fir.java deleted file mode 100644 index 788e56feb51..00000000000 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationClass.fir.java +++ /dev/null @@ -1,15 +0,0 @@ -@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) -public abstract @interface Anno /* Anno*/ { - public abstract double d();// d() - - public abstract int i();// i() - - public abstract int j();// j() - - public abstract int[] ia();// ia() - - public abstract int[] ia2();// ia2() - - public abstract java.lang.String value();// value() - -} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationClass.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationClass.kt index 5afed81c530..bf464b4d4dc 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationClass.kt +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotationClass.kt @@ -1,6 +1,4 @@ // Anno -// IGNORE_FIR -// Ignored due to KT-53573 annotation class Anno( val i: Int, diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TopLevelDestructuring.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TopLevelDestructuring.kt index b71c425af9a..d1112069df0 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TopLevelDestructuring.kt +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TopLevelDestructuring.kt @@ -1,5 +1,4 @@ // TopLevelDestructuringKt -// IGNORE_FIR data class Pair(val x: Int, val y: Int) val (x, y) = Pair(1, 2) diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/dataClasses.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/dataClasses.fir.java new file mode 100644 index 00000000000..b82bc4d85df --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/dataClasses.fir.java @@ -0,0 +1,59 @@ +public final class Person /* Person*/ { + @org.jetbrains.annotations.NotNull() + private final java.lang.String name; + + private int age = 0 /* initializer type: int */; + + @org.jetbrains.annotations.NotNull() + public final Person copy(@org.jetbrains.annotations.NotNull() java.lang.String);// copy(java.lang.String) + + @org.jetbrains.annotations.NotNull() + public final java.lang.String component1();// component1() + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getName();// getName() + + @org.jetbrains.annotations.NotNull() + public java.lang.String toString();// toString() + + public Person(@org.jetbrains.annotations.NotNull() java.lang.String);// .ctor(java.lang.String) + + public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object) + + public final int getAge();// getAge() + + public final void setAge(int);// setAge(int) + + public int hashCode();// hashCode() +} + +public final class User /* User*/ { + @org.jetbrains.annotations.NotNull() + private final java.lang.String name = "" /* initializer type: java.lang.String */; + + private final int age = 0 /* initializer type: int */; + + @org.jetbrains.annotations.NotNull() + public final User copy(@org.jetbrains.annotations.NotNull() java.lang.String, int);// copy(java.lang.String, int) + + @org.jetbrains.annotations.NotNull() + public final java.lang.String component1();// component1() + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getName();// getName() + + @org.jetbrains.annotations.NotNull() + public java.lang.String toString();// toString() + + public User();// .ctor() + + public User(@org.jetbrains.annotations.NotNull() java.lang.String, int);// .ctor(java.lang.String, int) + + public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object) + + public final int component2();// component2() + + public final int getAge();// getAge() + + public int hashCode();// hashCode() +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/dataClasses.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/dataClasses.kt index b2b28560441..ea9648d622a 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/dataClasses.kt +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/dataClasses.kt @@ -1,5 +1,3 @@ -// IGNORE_FIR -// Ignored due to KT-53573 data class User(val name: String = "", val age: Int = 0) data class Person(val name: String) { diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/dataClasses.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/dataClasses.lib.java deleted file mode 100644 index 63b55acd695..00000000000 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/dataClasses.lib.java +++ /dev/null @@ -1,29 +0,0 @@ -public final class Person /* Person*/ { - @org.jetbrains.annotations.NotNull() - private final java.lang.String name; - - private int age; - - @org.jetbrains.annotations.NotNull() - public final Person copy(@org.jetbrains.annotations.NotNull() java.lang.String);// copy(java.lang.String) - - @org.jetbrains.annotations.NotNull() - public final java.lang.String component1();// component1() - - @org.jetbrains.annotations.NotNull() - public final java.lang.String getName();// getName() - - @org.jetbrains.annotations.NotNull() - public java.lang.String toString();// toString() - - public Person(@org.jetbrains.annotations.NotNull() java.lang.String);// .ctor(java.lang.String) - - public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object) - - public final int getAge();// getAge() - - public final void setAge(int);// setAge(int) - - public int hashCode();// hashCode() - -} diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmField.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmField.fir.java index 972cbb75298..056ad0acfe3 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmField.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmField.fir.java @@ -8,24 +8,17 @@ public final class A /* A*/ { public static final java.util.Collection c; @kotlin.jvm.JvmField() - public int b; + public int b = 1 /* initializer type: int */; @kotlin.jvm.JvmField() - public static int d; + public static int d = 1 /* initializer type: int */; @org.jetbrains.annotations.NotNull() public static final A.Companion Companion; public A();// .ctor() - class Companion ... - - } - -public static final class Companion /* A.Companion*/ { - private Companion();// .ctor() - } public abstract interface B /* B*/ { @@ -36,14 +29,7 @@ public abstract interface B /* B*/ { @org.jetbrains.annotations.NotNull() public static final B.Companion Companion; - class Companion ... - - } - -public static final class Companion /* B.Companion*/ { - private Companion();// .ctor() - } public final class C /* C*/ { @@ -52,10 +38,17 @@ public final class C /* C*/ { public final java.util.Collection a; @kotlin.jvm.JvmField() - public int b; + public int b = 1 /* initializer type: int */; public C();// .ctor() - public C(@kotlin.jvm.JvmField() @org.jetbrains.annotations.NotNull() java.util.Collection, @kotlin.jvm.JvmField() int);// .ctor(java.util.Collection, int) - + 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/jvmField.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmField.kt index e9c2c389217..198df27b8ab 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmField.kt +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmField.kt @@ -1,5 +1,3 @@ -// IGNORE_FIR -// Ignored due to KT-53573 class A { @JvmField val a: Collection<*> = emptyList() diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.fir.java index 266a2d9c3c7..89b2911ef3c 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.fir.java @@ -1,12 +1,41 @@ -public final class Foo /* Foo*/ { - @org.jetbrains.annotations.NotNull() - private error.NonExistentClass delegatedProp$delegate; +public abstract interface A /* A*/ { + protected abstract int getInt1();// getInt1() + public abstract int getInt2();// getInt2() + + 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; @org.jetbrains.annotations.NotNull() - private final java.lang.Object arrayConst; + private final MyProperty delegatedProp2$delegate; + + @org.jetbrains.annotations.NotNull() + private final error.NonExistentClass delegatedProp$delegate; + + @org.jetbrains.annotations.NotNull() + private final error.NonExistentClass privateDelegated$delegate; + + @org.jetbrains.annotations.NotNull() + private final java.lang.Object arrayConst = {1, 2} /* initializer type: null */; + + @org.jetbrains.annotations.NotNull() + private final kotlin.Lazy lazyProp$delegate; @org.jetbrains.annotations.NotNull() private final kotlin.jvm.functions.Function1 sum; @@ -15,22 +44,21 @@ public final class Foo /* Foo*/ { private java.lang.Object privateVarWithGet; @org.jetbrains.annotations.NotNull() - private java.lang.String name; + private java.lang.String name = "x" /* initializer type: java.lang.String */; @org.jetbrains.annotations.NotNull() private java.lang.String noAccessors; @org.jetbrains.annotations.NotNull() - private java.lang.String protectedWithPrivateSet; + private java.lang.String protectedWithPrivateSet = "" /* initializer type: java.lang.String */; @org.jetbrains.annotations.NotNull() - private kotlin.Lazy lazyProp$delegate; + public final java.lang.String CONSTANT_WITH_ESCAPES = "A\tB\nC\rD'E\"F\\G$H" /* initializer type: java.lang.String */ /* constant value A B + C +D'E"F\G$H */; @org.jetbrains.annotations.NotNull() - public final java.lang.String CONSTANT_WITH_ESCAPES = "A\tB\nC\rD'E\"F\\G$H" /* initializer type: java.lang.String */; - - @org.jetbrains.annotations.NotNull() - public final java.lang.String SUBSYSTEM_DEPRECATED = "This subsystem is deprecated" /* initializer type: java.lang.String */; + public final java.lang.String SUBSYSTEM_DEPRECATED = "This subsystem is deprecated" /* initializer type: java.lang.String */ /* constant value This subsystem is deprecated */; @org.jetbrains.annotations.NotNull() public static final Foo.Companion Companion; @@ -41,40 +69,35 @@ public final class Foo /* Foo*/ { @org.jetbrains.annotations.Nullable() private java.lang.Boolean islowercase; - @org.jetbrains.annotations.Nullable() - private java.lang.Integer counter2; - @org.jetbrains.annotations.Nullable() private java.lang.Integer getInt; @org.jetbrains.annotations.Nullable() private java.lang.Integer isEmptyInt; - private MyProperty delegatedProp2$delegate; - private boolean c; - private error.NonExistentClass privateDelegated$delegate; - private final error.NonExistentClass d; - private final error.NonExistentClass intConst; + private final error.NonExistentClass intConst = 30 /* initializer type: int */; - private final int f1; + private final int f1 = 2 /* initializer type: int */; - private final long e; + private final long e = 2L /* initializer type: long */; - private int counter; + private int counter = 0 /* initializer type: int */; - private int f2; + private int f2 = 3 /* initializer type: int */; - private int internalWithPrivateSet; + private int internalWithPrivateSet = 1 /* initializer type: int */; private int privateVarWithPrivateSet; + private java.lang.String internalVarPrivateSet; + private static final error.NonExistentClass contextBean; - private static final int f1; + private static final int f1 = 4 /* initializer type: int */; private static final int prop3; @@ -82,9 +105,7 @@ public final class Foo /* Foo*/ { protected java.lang.String protectedLateinitVar; - public error.NonExistentClass subject; - - public java.lang.String internalVarPrivateSet; + public Unresolved subject; @org.jetbrains.annotations.NotNull() protected final java.lang.String getProtectedLateinitVar();// getProtectedLateinitVar() @@ -95,6 +116,9 @@ public final class Foo /* Foo*/ { @org.jetbrains.annotations.NotNull() public final Foo getB();// getB() + @org.jetbrains.annotations.NotNull() + public final Unresolved getSubject();// getSubject() + @org.jetbrains.annotations.NotNull() public final java.lang.Object getArrayConst();// getArrayConst() @@ -153,15 +177,13 @@ public final class Foo /* Foo*/ { public final error.NonExistentClass getIntConst();// getIntConst() - public final error.NonExistentClass getSubject();// getSubject() - public final int getCounter();// getCounter() public final int getDelegatedProp2();// getDelegatedProp2() public final int getF1();// getF1() - public final int getIntProp(@org.jetbrains.annotations.NotNull() int);// getIntProp(int) + public final int getIntProp(int);// getIntProp(int) public final int getInternalWithPrivateSet$light_idea_test_case();// getInternalWithPrivateSet$light_idea_test_case() @@ -189,24 +211,30 @@ public final class Foo /* Foo*/ { public final void setStringRepresentation$light_idea_test_case(@org.jetbrains.annotations.NotNull() java.lang.String);// setStringRepresentation$light_idea_test_case(java.lang.String) - public final void setSubject(error.NonExistentClass);// setSubject(error.NonExistentClass) - + public final void setSubject(@org.jetbrains.annotations.NotNull() Unresolved);// setSubject(Unresolved) class Companion ... +} - } +public final class Foo2 /* Foo2*/ { + @org.jetbrains.annotations.NotNull() + public final Foo getFoo();// getFoo() -public static final class Companion /* Foo.Companion*/ { - private Companion();// .ctor() + @org.jetbrains.annotations.NotNull() + public final Foo getFoo2();// getFoo2() - public final int getF1();// getF1() + @org.jetbrains.annotations.NotNull() + public final Foo getMeNonNullFoo();// getMeNonNullFoo() - public final int getProp3();// getProp3() + public Foo2();// .ctor() +} - public final int getProp7();// getProp7() +public final class Modifiers /* Modifiers*/ { + private final int plainField = 1 /* initializer type: int */; - public final void setProp7(int);// setProp7(int) + public Modifiers();// .ctor() + public final int getPlainField();// getPlainField() } public final class MyProperty /* MyProperty*/ { @@ -215,36 +243,4 @@ public final class MyProperty /* MyProperty*/ { public final int getValue(T, @org.jetbrains.annotations.NotNull() kotlin.reflect.KProperty);// getValue(T, kotlin.reflect.KProperty) public final void setValue(T, @org.jetbrains.annotations.NotNull() kotlin.reflect.KProperty, int);// setValue(T, kotlin.reflect.KProperty, int) - -} - -public final class Modifiers /* Modifiers*/ { - private final int plainField; - - public Modifiers();// .ctor() - - public final int getPlainField();// getPlainField() - -} - -public abstract interface A /* A*/ { - protected abstract int getInt1();// getInt1() - - public abstract int getInt2();// getInt2() - - public abstract void setInt2(int);// setInt2(int) - -} - -public final class Foo /* Foo*/ { - @org.jetbrains.annotations.NotNull() - public final Foo getFoo2();// getFoo2() - - @org.jetbrains.annotations.NotNull() - public final Foo getMeNonNullFoo();// getMeNonNullFoo() - - public Foo();// .ctor() - - public final error.NonExistentClass getFoo();// getFoo() - } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.java index 54468af3027..fe974afb2ea 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.java @@ -212,7 +212,7 @@ D'E"F\G$H */; class Companion ... } -public final class Foo /* Foo*/ { +public final class Foo2 /* Foo2*/ { @org.jetbrains.annotations.NotNull() public final Foo getFoo();// getFoo() @@ -222,7 +222,7 @@ public final class Foo /* Foo*/ { @org.jetbrains.annotations.NotNull() public final Foo getMeNonNullFoo();// getMeNonNullFoo() - public Foo();// .ctor() + public Foo2();// .ctor() } public final class Modifiers /* Modifiers*/ { diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.kt index 47d4d10961e..3ee22e3b51b 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.kt +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/properties.kt @@ -1,5 +1,3 @@ -// IGNORE_FIR -// Ignored due to KT-53573 import kotlin.reflect.KProperty class Foo(a: Int, val b:Foo, var c:Boolean, private val d: List, protected val e: Long = 2) { @@ -103,7 +101,7 @@ interface A { internal set } -class Foo { +class Foo2 { val foo get() = getMeNonNullFoo() val foo2: Foo get() = getMeNonNullFoo() fun getMeNonNullFoo() : Foo = Foo()