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/lightClasses/DataClassWithCustomImplementedMembers.fir.java
Vendored
+76
View File
@@ -0,0 +1,76 @@
public final class Wrapper /* p.Wrapper*/ {
public Wrapper();// .ctor()
public static final class Equals /* p.Wrapper.Equals*/ {
@org.jetbrains.annotations.NotNull()
private final p.G code;
@java.lang.Override()
public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object)
@org.jetbrains.annotations.NotNull()
public final p.G component1();// component1()
@org.jetbrains.annotations.NotNull()
public final p.G getCode();// getCode()
@org.jetbrains.annotations.NotNull()
public final p.Wrapper.Equals copy(@org.jetbrains.annotations.NotNull() p.G);// copy(p.G)
@org.jetbrains.annotations.NotNull()
public java.lang.String toString();// toString()
public Equals(@org.jetbrains.annotations.NotNull() p.G);// .ctor(p.G)
public int hashCode();// hashCode()
}public static final class HashCode /* p.Wrapper.HashCode*/ {
@org.jetbrains.annotations.NotNull()
private final p.G code;
@java.lang.Override()
public int hashCode();// hashCode()
@org.jetbrains.annotations.NotNull()
public final p.G component1();// component1()
@org.jetbrains.annotations.NotNull()
public final p.G getCode();// getCode()
@org.jetbrains.annotations.NotNull()
public final p.Wrapper.HashCode copy(@org.jetbrains.annotations.NotNull() p.G);// copy(p.G)
@org.jetbrains.annotations.NotNull()
public java.lang.String toString();// toString()
public HashCode(@org.jetbrains.annotations.NotNull() p.G);// .ctor(p.G)
public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object)
}public static final class ToString /* p.Wrapper.ToString*/ {
@org.jetbrains.annotations.NotNull()
private final p.G code;
@java.lang.Override()
@org.jetbrains.annotations.NotNull()
public java.lang.String toString();// toString()
@org.jetbrains.annotations.NotNull()
public final p.G component1();// component1()
@org.jetbrains.annotations.NotNull()
public final p.G getCode();// getCode()
@org.jetbrains.annotations.NotNull()
public final p.Wrapper.ToString copy(@org.jetbrains.annotations.NotNull() p.G);// copy(p.G)
public ToString(@org.jetbrains.annotations.NotNull() p.G);// .ctor(p.G)
public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object)
public int hashCode();// hashCode()
}}
compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.java
Vendored
+1 -1
View File
@@ -70,4 +70,4 @@ public static final class Equals /* p.Wrapper.Equals*/ {
public int hashCode();// hashCode()
}}
}}
compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.lib.java
Vendored
+73
View File
@@ -0,0 +1,73 @@
public final class Wrapper /* p.Wrapper*/ {
public Wrapper();// .ctor()
public static final class Equals /* p.Wrapper.Equals*/ {
@org.jetbrains.annotations.NotNull()
private final p.G code;
@org.jetbrains.annotations.NotNull()
public final p.G component1();// component1()
@org.jetbrains.annotations.NotNull()
public final p.G getCode();// getCode()
@org.jetbrains.annotations.NotNull()
public final p.Wrapper.Equals copy(@org.jetbrains.annotations.NotNull() p.G);// copy(p.G)
@org.jetbrains.annotations.NotNull()
public java.lang.String toString();// toString()
public Equals(@org.jetbrains.annotations.NotNull() p.G);// .ctor(p.G)
public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object)
public int hashCode();// hashCode()
}public static final class HashCode /* p.Wrapper.HashCode*/ {
@org.jetbrains.annotations.NotNull()
private final p.G code;
@org.jetbrains.annotations.NotNull()
public final p.G component1();// component1()
@org.jetbrains.annotations.NotNull()
public final p.G getCode();// getCode()
@org.jetbrains.annotations.NotNull()
public final p.Wrapper.HashCode copy(@org.jetbrains.annotations.NotNull() p.G);// copy(p.G)
@org.jetbrains.annotations.NotNull()
public java.lang.String toString();// toString()
public HashCode(@org.jetbrains.annotations.NotNull() p.G);// .ctor(p.G)
public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object)
public int hashCode();// hashCode()
}public static final class ToString /* p.Wrapper.ToString*/ {
@org.jetbrains.annotations.NotNull()
private final p.G code;
@org.jetbrains.annotations.NotNull()
public final p.G component1();// component1()
@org.jetbrains.annotations.NotNull()
public final p.G getCode();// getCode()
@org.jetbrains.annotations.NotNull()
public final p.Wrapper.ToString copy(@org.jetbrains.annotations.NotNull() p.G);// copy(p.G)
@org.jetbrains.annotations.NotNull()
public java.lang.String toString();// toString()
public ToString(@org.jetbrains.annotations.NotNull() p.G);// .ctor(p.G)
public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object)
public int hashCode();// hashCode()
}}
compiler/testData/asJava/lightClasses/DelegatedNested.fir.java
Vendored
+17
View File
@@ -0,0 +1,17 @@
public final class B /* p.B*/ {
public B();// .ctor()
public static final class A /* p.B.A*/ implements p.I {
@org.jetbrains.annotations.NotNull()
private final p.I f;
@java.lang.Override()
public void f();// f()
@java.lang.Override()
public void g();// g()
public A(@org.jetbrains.annotations.NotNull() p.I);// .ctor(p.I)
}}
compiler/testData/asJava/lightClasses/DelegatedNested.java
Vendored
+1 -1
View File
@@ -12,4 +12,4 @@ public static final class A /* p.B.A*/ implements p.I {
public void g();// g()
}}
}}
compiler/testData/asJava/lightClasses/DelegatedNested.lib.java
Vendored
+15
View File
@@ -0,0 +1,15 @@
public final class B /* p.B*/ {
public B();// .ctor()
public static final class A /* p.B.A*/ implements p.I {
@org.jetbrains.annotations.NotNull()
private final p.I f;
public A(@org.jetbrains.annotations.NotNull() p.I);// .ctor(p.I)
public void f();// f()
public void g();// g()
}}
compiler/testData/asJava/lightClasses/Delegation.fir.java
Vendored
+13
View File
@@ -0,0 +1,13 @@
public final class B /* p.B*/ implements p.I {
@org.jetbrains.annotations.NotNull()
private final p.I f;
@java.lang.Override()
public void f();// f()
@java.lang.Override()
public void g();// g()
public B(@org.jetbrains.annotations.NotNull() p.I);// .ctor(p.I)
}
compiler/testData/asJava/lightClasses/Delegation.java
Vendored
+1 -1
View File
@@ -8,4 +8,4 @@ public final class B /* p.B*/ implements p.I {
public void g();// g()
}
}
compiler/testData/asJava/lightClasses/Delegation.lib.java
Vendored
+11
View File
@@ -0,0 +1,11 @@
public final class B /* p.B*/ implements p.I {
@org.jetbrains.annotations.NotNull()
private final p.I f;
public B(@org.jetbrains.annotations.NotNull() p.I);// .ctor(p.I)
public void f();// f()
public void g();// g()
}
compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.fir.java
Vendored
+9
View File
@@ -0,0 +1,9 @@
public final class Inheritor /* p.Inheritor*/ implements p.I, p.I2 {
@java.lang.Override()
public void g();// g()
public Inheritor();// .ctor()
public final void f();// f()
}
compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.java
Vendored
+1 -1
View File
@@ -5,4 +5,4 @@ public final class Inheritor /* p.Inheritor*/ implements p.I, p.I2 {
public void g();// g()
}
}
compiler/testData/asJava/lightClasses/NonDataClassWithComponentFunctions.fir.java
Vendored
+20
View File
@@ -0,0 +1,20 @@
public final class A /* p.A*/ {
private final int y;
@java.lang.Override()
@org.jetbrains.annotations.NotNull()
public java.lang.String toString();// toString()
@java.lang.Override()
public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object)
@java.lang.Override()
public int hashCode();// hashCode()
public A(int);// .ctor(int)
public final int component1();// component1()
public final int getY();// getY()
}
compiler/testData/asJava/lightClasses/NonDataClassWithComponentFunctions.java
Vendored
+1 -1
View File
@@ -14,4 +14,4 @@ public final class A /* p.A*/ {
public int hashCode();// hashCode()
}
}
compiler/testData/asJava/lightClasses/NonDataClassWithComponentFunctions.lib.java
Vendored
+17
View File
@@ -0,0 +1,17 @@
public final class A /* p.A*/ {
private final int y;
@org.jetbrains.annotations.NotNull()
public java.lang.String toString();// toString()
public A(int);// .ctor(int)
public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object)
public final int component1();// component1()
public final int getY();// getY()
public int hashCode();// hashCode()
}
compiler/testData/asJava/lightClasses/compilationErrors/TwoOverrides.fir.java
Vendored
+2
View File
@@ -1,7 +1,9 @@
public final class TwoOverrides /* TwoOverrides*/ implements kotlin.collections.Iterable<java.lang.String> {
@java.lang.Override()
@org.jetbrains.annotations.Nullable()
public java.lang.Void iterator();// iterator()
@java.lang.Override()
@org.jetbrains.annotations.Nullable()
public java.lang.Void iterator();// iterator()
compiler/testData/asJava/lightClasses/delegation/Function.fir.java
Vendored
+8
View File
@@ -0,0 +1,8 @@
public final class Derived /* Derived*/ implements Base {
@java.lang.Override()
@org.jetbrains.annotations.NotNull()
public java.lang.String baz(@org.jetbrains.annotations.NotNull() java.lang.String);// baz(java.lang.String)
public Derived(@org.jetbrains.annotations.NotNull() Base);// .ctor(Base)
}
compiler/testData/asJava/lightClasses/delegation/Function.java
Vendored
+1 -1
View File
@@ -4,4 +4,4 @@ public final class Derived /* Derived*/ implements Base {
public Derived(@org.jetbrains.annotations.NotNull() Base);// .ctor(Base)
}
}
compiler/testData/asJava/lightClasses/delegation/Function.lib.java
Vendored
+7
View File
@@ -0,0 +1,7 @@
public final class Derived /* Derived*/ implements Base {
@org.jetbrains.annotations.NotNull()
public java.lang.String baz(@org.jetbrains.annotations.NotNull() java.lang.String);// baz(java.lang.String)
public Derived(@org.jetbrains.annotations.NotNull() Base);// .ctor(Base)
}
compiler/testData/asJava/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.java
Vendored
+14 -5
View File
@@ -4,34 +4,43 @@ public final class Container /* p1.Container*/ {
public static final class MyNumber /* p1.Container.MyNumber*/ extends java.lang.Number {
public MyNumber();// .ctor()
@java.lang.Override()
public byte toByte();// toByte()
@java.lang.Override()
public char toChar();// toChar()
@java.lang.Override()
public double toDouble();// toDouble()
@java.lang.Override()
public float toFloat();// toFloat()
@java.lang.Override()
public int toInt();// toInt()
@java.lang.Override()
public long toLong();// toLong()
@java.lang.Override()
public short toShort();// toShort()
public MyNumber();// .ctor()
}public static final class MyString /* p1.Container.MyString*/ implements java.lang.CharSequence {
@java.lang.Override()
@org.jetbrains.annotations.NotNull()
public java.lang.CharSequence subSequence(int, int);// subSequence(int, int)
public MyString();// .ctor()
@java.lang.Override()
public char get(int);// get(int)
public MyString();// .ctor()
public error.NonExistentClass chars();// chars()
public error.NonExistentClass codePoints();// codePoints()
public int getLength();// getLength()
}}
}}
compiler/testData/asJava/lightClasses/ideRegression/ImplementingMap.fir.java
Vendored
+3 -2
View File
@@ -1,6 +1,7 @@
public final class TypeHierarchyMap /* p1.TypeHierarchyMap*/<TValue> implements kotlin.collections.Map<java.lang.Class<?>, TValue> {
public TypeHierarchyMap();// .ctor()
@java.lang.Override()
public boolean containsKey(@org.jetbrains.annotations.NotNull() java.lang.Class<?>);// containsKey(java.lang.Class<?>)
public TypeHierarchyMap();// .ctor()
}
compiler/testData/asJava/lightClasses/ideRegression/ImplementingMutableSet.fir.java
Vendored
+11 -8
View File
@@ -9,6 +9,16 @@ public final class SmartSet /* SmartSet*/<T> extends kotlin.collections.Abstrac
private static final int ARRAY_THRESHOLD;
@java.lang.Override()
@org.jetbrains.annotations.NotNull()
public java.util.Iterator<T> iterator();// iterator()
@java.lang.Override()
public boolean add(T);// add(T)
@java.lang.Override()
public void clear();// clear()
@kotlin.jvm.JvmStatic()
@org.jetbrains.annotations.NotNull()
public static final <T> SmartSet<T> create();// <T> create()
@@ -17,17 +27,10 @@ public final class SmartSet /* SmartSet*/<T> extends kotlin.collections.Abstrac
@org.jetbrains.annotations.NotNull()
public static final <T> SmartSet<T> create(@org.jetbrains.annotations.NotNull() java.util.Collection<? extends T>);// <T> create(java.util.Collection<? extends T>)
@org.jetbrains.annotations.NotNull()
public java.util.Iterator<T> iterator();// iterator()
private SmartSet();// .ctor()
public boolean add(T);// add(T)
public int getSize();// getSize()
public void clear();// clear()
public void setSize(int);// setSize(int)
@@ -42,4 +45,4 @@ public static final class Companion /* SmartSet.Companion*/ {
private Companion();// .ctor()
}}
}}
compiler/testData/asJava/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.java
Vendored
+4 -3
View File
@@ -1,8 +1,9 @@
public final class Inheritor /* p.Inheritor*/ implements p.I, p.I2 {
@java.lang.Override()
public void g();// g()
public Inheritor();// .ctor()
public final void f();// f()
public void g();// g()
}
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.fir.java
Vendored
+3 -2
View File
@@ -1,10 +1,11 @@
public final class C /* C*/ implements Tr {
private final int v;
public C();// .ctor()
@java.lang.Override()
public int foo();// foo()
public C();// .ctor()
public int getV();// getV()
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.fir.java
Vendored
+7
View File
@@ -0,0 +1,7 @@
public final class C /* C*/ implements Base {
@java.lang.Override()
public void foo();// foo()
public C();// .ctor()
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.java
Vendored
+1 -1
View File
@@ -3,4 +3,4 @@ public final class C /* C*/ implements Base {
public void foo();// foo()
}
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.lib.java
Vendored
+6
View File
@@ -0,0 +1,6 @@
public final class C /* C*/ implements Base {
public C();// .ctor()
public void foo();// foo()
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.fir.java
Vendored
+7
View File
@@ -0,0 +1,7 @@
public final class C /* C*/ implements Base<kotlin.Unit> {
@java.lang.Override()
public void foo(@org.jetbrains.annotations.NotNull() kotlin.Unit);// foo(kotlin.Unit)
public C();// .ctor()
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.java
Vendored
+1 -1
View File
@@ -3,4 +3,4 @@ public final class C /* C*/ implements Base<kotlin.Unit> {
public void foo(@org.jetbrains.annotations.NotNull() kotlin.Unit);// foo(kotlin.Unit)
}
}