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

FIR LC: revisit when to add fields to companion and/or containing class

Browse Source
This commit is contained in:
Jinseong Jeon
2022-05-17 11:21:53 -07:00
committed by Ilya Kirillov
parent 89d1a6bc0f
commit 63fb00fa21
8 changed files with 41 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/asJava/lightClasses/compilationErrors/TraitClassObjectField.fir.java
Vendored
+3
View File
@@ -7,6 +7,9 @@ public abstract interface TraitClassObjectField /* TraitClassObjectField*/ {
public static final class Companion /* TraitClassObjectField.Companion*/ {
@org.jetbrains.annotations.Nullable()
private final java.lang.String x = "" /* initializer type: java.lang.String */;
@org.jetbrains.annotations.Nullable()
private final java.lang.String y;
compiler/testData/asJava/lightClasses/ideRegression/ImplementingMutableSet.fir.java
Vendored
+3 -3
View File
@@ -7,6 +7,8 @@ public final class SmartSet /* SmartSet*/<T> extends kotlin.collections.Abstrac
private int size;
private static final int ARRAY_THRESHOLD;
@kotlin.jvm.JvmStatic()
@org.jetbrains.annotations.NotNull()
public static final <T> SmartSet<T> create();// <T> create()
@@ -30,8 +32,6 @@ public final class SmartSet /* SmartSet*/<T> extends kotlin.collections.Abstrac
public static final class Companion /* SmartSet.Companion*/ {
private final int ARRAY_THRESHOLD;
@kotlin.jvm.JvmStatic()
@org.jetbrains.annotations.NotNull()
public final <T> SmartSet<T> create();// <T> create()
@@ -42,4 +42,4 @@ public static final class Companion /* SmartSet.Companion*/ {
private Companion();// .ctor()
}}
}}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.fir.java
Vendored
+6 -6
View File
@@ -2,16 +2,16 @@ public final class ClassObjectField /* ClassObjectField*/ {
@org.jetbrains.annotations.NotNull()
public static final ClassObjectField.Companion Companion;
@org.jetbrains.annotations.Nullable()
private static final java.lang.String y;
@org.jetbrains.annotations.Nullable()
public static final java.lang.String x;
public ClassObjectField();// .ctor()
public static final class Companion /* ClassObjectField.Companion*/ {
@org.jetbrains.annotations.Nullable()
private final java.lang.String x;
@org.jetbrains.annotations.Nullable()
private final java.lang.String y;
@org.jetbrains.annotations.Nullable()
public final java.lang.String getX();// getX()
compiler/testData/asJava/ultraLightClasses/jvmField.fir.java
Vendored
+4
View File
@@ -29,6 +29,10 @@ public static final class Companion /* A.Companion*/ {
}
public abstract interface B /* B*/ {
@kotlin.jvm.JvmField()
@org.jetbrains.annotations.NotNull()
public static final java.util.Collection<?> a;
@org.jetbrains.annotations.NotNull()
public static final B.Companion Companion;
compiler/testData/asJava/ultraLightClasses/objects.fir.java
Vendored
+7 -5
View File
@@ -1,11 +1,17 @@
public final class C /* C*/ {
@kotlin.jvm.JvmStatic()
@org.jetbrains.annotations.NotNull()
public java.lang.String x;
public static java.lang.String x;
@org.jetbrains.annotations.NotNull()
public static final C.Companion Companion;
@org.jetbrains.annotations.NotNull()
public static java.lang.String c1;
@org.jetbrains.annotations.NotNull()
public static java.lang.String c;
@kotlin.jvm.JvmStatic()
public static final void foo();// foo()
@@ -20,10 +26,6 @@ public final class C /* C*/ {
}
public static final class Companion /* C.Companion*/ {
@kotlin.jvm.JvmStatic()
@org.jetbrains.annotations.NotNull()
private java.lang.String x;
@kotlin.jvm.JvmStatic()
@org.jetbrains.annotations.NotNull()
public final java.lang.String getC(I);// getC(I)
compiler/testData/asJava/ultraLightClasses/properties.fir.java
Vendored
+6 -6
View File
@@ -80,6 +80,12 @@ public final class Foo /* Foo*/ {
public java.lang.String internalVarPrivateSet;
public static final int f1;
public static final int prop3;
public static int prop7;
@org.jetbrains.annotations.NotNull()
protected final java.lang.String getProtectedLateinitVar();// getProtectedLateinitVar()
@@ -191,12 +197,6 @@ public final class Foo /* Foo*/ {
}
public static final class Companion /* Foo.Companion*/ {
private final int f1;
private final int prop3;
private int prop7;
private Companion();// .ctor()
public final int getF1();// getF1()