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

[AA LC] Add @java.lang.Override on override functions

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2022-07-28 12:29:27 +03:00
parent d60f3980b1
commit ab2aa3117b
41 changed files with 426 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/asJava/ultraLightClasses/coroutines.fir.java
Vendored
+36
View File
@@ -0,0 +1,36 @@
public final class Foo /* Foo*/ {
@org.jetbrains.annotations.Nullable()
public final java.lang.Object doSomething(@org.jetbrains.annotations.NotNull() Foo, @org.jetbrains.annotations.NotNull() kotlin.coroutines.Continuation<? super Bar>);// doSomething(Foo, kotlin.coroutines.Continuation<? super Bar>)
public Foo();// .ctor()
}
public final class Boo /* Boo*/ {
private final java.lang.Object doSomething(Foo, kotlin.coroutines.Continuation<? super Bar>);// doSomething(Foo, kotlin.coroutines.Continuation<? super Bar>)
public Boo();// .ctor()
}
public final class Bar /* Bar*/ {
public Bar();// .ctor()
public final <T> void async(@org.jetbrains.annotations.NotNull() kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super T>, ? extends java.lang.Object>);// <T> async(kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super T>, ? extends java.lang.Object>)
}
public abstract interface Base /* Base*/ {
@org.jetbrains.annotations.Nullable()
public abstract java.lang.Object foo(@org.jetbrains.annotations.NotNull() kotlin.coroutines.Continuation<? super kotlin.Unit>);// foo(kotlin.coroutines.Continuation<? super kotlin.Unit>)
}
public final class Derived /* Derived*/ implements Base {
@java.lang.Override()
@org.jetbrains.annotations.Nullable()
public java.lang.Object foo(@org.jetbrains.annotations.NotNull() kotlin.coroutines.Continuation<? super kotlin.Unit>);// foo(kotlin.coroutines.Continuation<? super kotlin.Unit>)
public Derived();// .ctor()
}
compiler/testData/asJava/ultraLightClasses/delegatesWithAnnotations.fir.java
Vendored
+1
View File
@@ -28,6 +28,7 @@ public abstract interface Base /* Base*/ {
public final class Derived /* Derived*/ implements Base {
@Ann(x = 1L, 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 = 2L, 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)
compiler/testData/asJava/ultraLightClasses/delegatingToInterfaces.fir.java
Vendored
+11 -6
View File
@@ -16,23 +16,28 @@ public abstract interface Base /* Base*/ {
public final class BaseImpl /* BaseImpl*/ implements Base {
private final int x;
@java.lang.Override()
public void printMessage();// printMessage()
@java.lang.Override()
public void printMessageLine();// printMessageLine()
public BaseImpl(int);// .ctor(int)
public final int getX();// getX()
public void printMessage();// printMessage()
public void printMessageLine();// printMessageLine()
}
public final class Derived /* Derived*/ implements Base {
public Derived(@org.jetbrains.annotations.NotNull() Base);// .ctor(Base)
@java.lang.Override()
public int foo(java.lang.String, @org.jetbrains.annotations.Nullable() java.lang.Object);// foo(java.lang.String, java.lang.Object)
@java.lang.Override()
public void printMessage();// printMessage()
@java.lang.Override()
public void printMessageLine();// printMessageLine()
public Derived(@org.jetbrains.annotations.NotNull() Base);// .ctor(Base)
}
compiler/testData/asJava/ultraLightClasses/enums.fir.java
Vendored
+4
View File
@@ -39,6 +39,7 @@ public enum ProtocolState /* ProtocolState*/ {
WAITING {
WAITING();// .ctor()
@java.lang.Override()
@org.jetbrains.annotations.NotNull()
public ProtocolState signal();// signal()
@@ -46,6 +47,7 @@ public enum ProtocolState /* ProtocolState*/ {
TALKING {
TALKING();// .ctor()
@java.lang.Override()
@org.jetbrains.annotations.NotNull()
public ProtocolState signal();// signal()
@@ -67,6 +69,7 @@ public enum ProtocolState /* ProtocolState*/ {
public static final class WAITING /* ProtocolState.WAITING*/ extends ProtocolState {
WAITING();// .ctor()
@java.lang.Override()
@org.jetbrains.annotations.NotNull()
public ProtocolState signal();// signal()
@@ -75,6 +78,7 @@ public static final class WAITING /* ProtocolState.WAITING*/ extends ProtocolSta
public static final class TALKING /* ProtocolState.TALKING*/ extends ProtocolState {
TALKING();// .ctor()
@java.lang.Override()
@org.jetbrains.annotations.NotNull()
public ProtocolState signal();// signal()
compiler/testData/asJava/ultraLightClasses/implementingKotlinCollections.fir.java
Vendored
+5 -2
View File
@@ -1,4 +1,5 @@
public final class MyList /* MyList*/ implements kotlin.collections.List<java.lang.String> {
@java.lang.Override()
@org.jetbrains.annotations.NotNull()
public java.lang.String get(int);// get(int)
@@ -17,11 +18,13 @@ public abstract class MySet /* MySet*/<T> implements ASet<T> {
}
public abstract class SmartSet /* SmartSet*/<T> extends kotlin.collections.AbstractMutableSet<T> {
@java.lang.Override()
@org.jetbrains.annotations.NotNull()
public java.util.Iterator<T> iterator();// iterator()
private SmartSet();// .ctor()
@java.lang.Override()
public boolean add(T);// add(T)
private SmartSet();// .ctor()
}
compiler/testData/asJava/ultraLightClasses/inferringAnonymousObjectTypes.fir.java
Vendored
+13 -8
View File
@@ -27,6 +27,7 @@ final class C /* C*/ {
}
final class null /* null*/ {
@java.lang.Override()
@org.jetbrains.annotations.NotNull()
public java.lang.String toString();// toString()
@@ -49,17 +50,19 @@ public final class ValidPublicSupertype /* ValidPublicSupertype*/ {
}
final class null /* null*/ implements java.lang.Runnable {
private ();// .ctor()
@java.lang.Override()
public void run();// run()
private ();// .ctor()
}
final class null /* null*/ implements java.lang.Runnable {
private ();// .ctor()
@java.lang.Override()
public void run();// run()
private ();// .ctor()
}
public abstract interface I /* I*/ {
@@ -80,15 +83,17 @@ public final class InvalidPublicSupertype /* InvalidPublicSupertype*/ {
}
final class null /* null*/ implements I, java.lang.Runnable {
private ();// .ctor()
@java.lang.Override()
public void run();// run()
private ();// .ctor()
}
final class null /* null*/ implements I, java.lang.Runnable {
private ();// .ctor()
@java.lang.Override()
public void run();// run()
private ();// .ctor()
}
compiler/testData/asJava/ultraLightClasses/inheritance.fir.java
Vendored
+5 -2
View File
@@ -37,12 +37,14 @@ public abstract class Base /* Base*/ {
public final class Derived /* Derived*/ extends Base implements IntfWithProp {
private final int x;
@java.lang.Override()
protected error.NonExistentClass v();// v()
public Derived(int);// .ctor(int)
@java.lang.Override()
public int abs();// abs()
public Derived(int);// .ctor(int)
public int getX$light_idea_test_case();// getX$light_idea_test_case()
}
@@ -54,6 +56,7 @@ public abstract class AnotherDerived /* AnotherDerived*/ extends Base {
private final int z;
@java.lang.Override()
protected final void v();// v()
protected int getZ();// getZ()
compiler/testData/asJava/ultraLightClasses/objects.fir.java
Vendored
+3 -2
View File
@@ -101,6 +101,9 @@ public final class Obj /* Obj*/ implements java.lang.Runnable {
@org.jetbrains.annotations.NotNull()
public static final Obj INSTANCE;
@java.lang.Override()
public void run();// run()
@kotlin.jvm.JvmStatic()
public static final int zoo();// zoo()
@@ -111,8 +114,6 @@ public final class Obj /* Obj*/ implements java.lang.Runnable {
public static final void setX(@org.jetbrains.annotations.NotNull() java.lang.String);// setX(java.lang.String)
public void run();// run()
}
public final class ConstContainer /* ConstContainer*/ {