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

KT-59293 [SLC] Fix generation of DefaultImpls classes

Browse Source
This commit is contained in:
Pavel Mikhailovskii
2023-06-23 08:01:52 +00:00
committed by Space Team
parent 896f8853ae
commit c3746652a4
9 changed files with 179 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/asJava/lightClasses/lightClassByFqName/ExtendingInterfaceWithDefaultImpls.descriptors.java
Vendored
+37
View File
@@ -0,0 +1,37 @@
public abstract interface C /* p.C*/<T> extends p.B {
@org.jetbrains.annotations.NotNull()
public abstract java.lang.String c();// c()
@org.jetbrains.annotations.NotNull()
public abstract java.lang.String more();// more()
public abstract int getProp3();// getProp3()
public abstract void setProp3(int);// setProp3(int)
public static final class DefaultImpls /* p.C.DefaultImpls*/ {
@org.jetbrains.annotations.NotNull()
public static java.lang.String a(@org.jetbrains.annotations.NotNull() p.C);// a(p.C)
@org.jetbrains.annotations.NotNull()
public static java.lang.String b(@org.jetbrains.annotations.NotNull() p.C);// b(p.C)
@org.jetbrains.annotations.NotNull()
public static java.lang.String c(@org.jetbrains.annotations.NotNull() p.C);// c(p.C)
@p.Anno()
public static void setProp1(@org.jetbrains.annotations.NotNull() p.C, int);// setProp1(p.C, int)
@p.Anno()
public static void setProp2(@org.jetbrains.annotations.NotNull() p.C, int);// setProp2(p.C, int)
@p.Anno()
public static void setProp3(@org.jetbrains.annotations.NotNull() p.C, int);// setProp3(p.C, int)
public static int getProp1(@org.jetbrains.annotations.NotNull() p.C);// getProp1(p.C)
public static int getProp2(@org.jetbrains.annotations.NotNull() p.C);// getProp2(p.C)
public static int getProp3(@org.jetbrains.annotations.NotNull() p.C);// getProp3(p.C)
}
}
compiler/testData/asJava/lightClasses/lightClassByFqName/ExtendingInterfaceWithDefaultImpls.fir.java
Vendored
+18 -2
View File
@@ -1,12 +1,28 @@
public abstract interface C /* p.C*/ extends p.B {
public abstract interface C /* p.C*/<T> extends p.B {
@java.lang.Deprecated()
@p.Anno()
public static void getProp3$annotations();// getProp3$annotations()
@org.jetbrains.annotations.NotNull()
public abstract java.lang.String c();// c()
@org.jetbrains.annotations.NotNull()
public abstract java.lang.String more();// more()
public abstract int getProp3();// getProp3()
public abstract void setProp3(int);// setProp3(int)
public static final class DefaultImpls /* p.C.DefaultImpls*/ {
@java.lang.Deprecated()
@p.Anno()
public static void getProp3$annotations();// getProp3$annotations()
@org.jetbrains.annotations.NotNull()
public java.lang.String c();// c()
public static java.lang.String c(@org.jetbrains.annotations.NotNull() p.C<T>);// c(p.C<T>)
public static int getProp3(@org.jetbrains.annotations.NotNull() p.C<T>);// getProp3(p.C<T>)
public static void setProp3(@org.jetbrains.annotations.NotNull() p.C<T>, int);// setProp3(p.C<T>, int)
}
}
compiler/testData/asJava/lightClasses/lightClassByFqName/ExtendingInterfaceWithDefaultImpls.java
Vendored
+20 -4
View File
@@ -1,18 +1,34 @@
public abstract interface C /* p.C*/ extends p.B {
public abstract interface C /* p.C*/<T> extends p.B {
@org.jetbrains.annotations.NotNull()
public abstract java.lang.String c();// c()
@org.jetbrains.annotations.NotNull()
public abstract java.lang.String more();// more()
public abstract int getProp3();// getProp3()
public abstract void setProp3(int);// setProp3(int)
public static final class DefaultImpls /* p.C.DefaultImpls*/ {
@org.jetbrains.annotations.NotNull()
public static java.lang.String a(@org.jetbrains.annotations.NotNull() p.C);// a(p.C)
public static <T> java.lang.String a(@org.jetbrains.annotations.NotNull() p.C<T>);// <T> a(p.C<T>)
@org.jetbrains.annotations.NotNull()
public static java.lang.String b(@org.jetbrains.annotations.NotNull() p.C);// b(p.C)
public static <T> java.lang.String b(@org.jetbrains.annotations.NotNull() p.C<T>);// <T> b(p.C<T>)
@org.jetbrains.annotations.NotNull()
public static java.lang.String c(@org.jetbrains.annotations.NotNull() p.C);// c(p.C)
public static <T> java.lang.String c(@org.jetbrains.annotations.NotNull() p.C<T>);// <T> c(p.C<T>)
public static <T> int getProp1(@org.jetbrains.annotations.NotNull() p.C<T>);// <T> getProp1(p.C<T>)
public static <T> int getProp2(@org.jetbrains.annotations.NotNull() p.C<T>);// <T> getProp2(p.C<T>)
public static <T> int getProp3(@org.jetbrains.annotations.NotNull() p.C<T>);// <T> getProp3(p.C<T>)
public static <T> void setProp1(@org.jetbrains.annotations.NotNull() p.C<T>, int);// <T> setProp1(p.C<T>, int)
public static <T> void setProp2(@org.jetbrains.annotations.NotNull() p.C<T>, int);// <T> setProp2(p.C<T>, int)
public static <T> void setProp3(@org.jetbrains.annotations.NotNull() p.C<T>, int);// <T> setProp3(p.C<T>, int)
}
}
compiler/testData/asJava/lightClasses/lightClassByFqName/ExtendingInterfaceWithDefaultImpls.kt
Vendored
+19 -1
View File
@@ -1,16 +1,34 @@
// p.C
// !GENERATE_PROPERTY_ANNOTATIONS_METHODS
package p
annotation class Anno
interface A {
@Anno
var prop1: Int
get() = 0
set(value) {}
fun a() = "a"
}
interface B: A {
@Anno
var prop2: Int
get() = 0
set(value) {}
fun b() = "b"
}
interface C : B {
interface C<T> : B {
fun c() = "c"
@Anno
var prop3: Int
get() = 0
set(value) {}
fun more(): String
}
compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/PrivateInTrait.fir.java
Vendored
+3 -3
View File
@@ -6,10 +6,10 @@ public abstract interface PrivateInTrait /* PrivateInTrait*/ {
private abstract void setNn(java.lang.String);// setNn(java.lang.String)
public static final class DefaultImpls /* PrivateInTrait.DefaultImpls*/ {
private final java.lang.String getN();// getN()
private static final java.lang.String getN(@org.jetbrains.annotations.NotNull() PrivateInTrait);// getN(PrivateInTrait)
private final java.lang.String getNn();// getNn()
private static final java.lang.String getNn(@org.jetbrains.annotations.NotNull() PrivateInTrait);// getNn(PrivateInTrait)
private final void setNn(java.lang.String);// setNn(java.lang.String)
private static final void setNn(@org.jetbrains.annotations.NotNull() PrivateInTrait, java.lang.String);// setNn(PrivateInTrait, java.lang.String)
}
}