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

[SLC] fix modality for methods and property accessors

Browse Source 
^KTIJ-23783
This commit is contained in:
Dmitrii Gridin
2022-12-01 12:16:31 +01:00
committed by Space Team
parent 00ab33bbf9
commit 7bfa900ce6
24 changed files with 62 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.fir.java
Vendored
+3 -3
View File
@@ -9,7 +9,7 @@ public static final class Equals /* p.Wrapper.Equals*/ {
private final p.G code;
@java.lang.Override()
public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object)
public final boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object)
@org.jetbrains.annotations.NotNull()
public final p.G component1();// component1()
@@ -32,7 +32,7 @@ public static final class Equals /* p.Wrapper.Equals*/ {
private final p.G code;
@java.lang.Override()
public int hashCode();// hashCode()
public final int hashCode();// hashCode()
@org.jetbrains.annotations.NotNull()
public final p.G component1();// component1()
@@ -56,7 +56,7 @@ public static final class Equals /* p.Wrapper.Equals*/ {
@java.lang.Override()
@org.jetbrains.annotations.NotNull()
public java.lang.String toString();// toString()
public final java.lang.String toString();// toString()
@org.jetbrains.annotations.NotNull()
public final p.G component1();// component1()
compiler/testData/asJava/lightClasses/EnumEntry.fir.java
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ static final class FirstEntry /* p.KotlinEnum.FirstEntry*/ extends p.KotlinEnum
FirstEntry();// .ctor()
@java.lang.Override()
public void abstractFun();// abstractFun()
public final void abstractFun();// abstractFun()
public final int getFirstEntryProp();// getFirstEntryProp()
compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.fir.java
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
public final class Inheritor /* p.Inheritor*/ implements p.I, p.I2 {
@java.lang.Override()
public void g();// g()
public final void g();// g()
public Inheritor();// .ctor()
compiler/testData/asJava/lightClasses/NonDataClassWithComponentFunctions.fir.java
Vendored
+3 -3
View File
@@ -3,13 +3,13 @@ public final class A /* p.A*/ {
@java.lang.Override()
@org.jetbrains.annotations.NotNull()
public java.lang.String toString();// toString()
public final java.lang.String toString();// toString()
@java.lang.Override()
public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object)
public final boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object)
@java.lang.Override()
public int hashCode();// hashCode()
public final int hashCode();// hashCode()
public A(int);// .ctor(int)
compiler/testData/asJava/lightClasses/compilationErrors/TwoOverrides.fir.java
Vendored
+2 -2
View File
@@ -1,11 +1,11 @@
public final class TwoOverrides /* TwoOverrides*/ implements java.lang.Iterable<java.lang.String>, kotlin.collections.Iterable<java.lang.String>, kotlin.jvm.internal.markers.KMappedMarker {
@java.lang.Override()
@org.jetbrains.annotations.Nullable()
public java.lang.Void iterator();// iterator()
public final java.lang.Void iterator();// iterator()
@java.lang.Override()
@org.jetbrains.annotations.Nullable()
public java.lang.Void iterator();// iterator()
public final java.lang.Void iterator();// iterator()
public TwoOverrides();// .ctor()
compiler/testData/asJava/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.fir.java
Vendored
+12 -12
View File
@@ -5,42 +5,42 @@ public final class Container /* p1.Container*/ {
public static final class MyNumber /* p1.Container.MyNumber*/ extends java.lang.Number {
@java.lang.Override()
public byte toByte();// toByte()
public final byte toByte();// toByte()
@java.lang.Override()
public char toChar();// toChar()
public final char toChar();// toChar()
@java.lang.Override()
public double toDouble();// toDouble()
public final double toDouble();// toDouble()
@java.lang.Override()
public float toFloat();// toFloat()
public final float toFloat();// toFloat()
@java.lang.Override()
public int toInt();// toInt()
public final int toInt();// toInt()
@java.lang.Override()
public long toLong();// toLong()
public final long toLong();// toLong()
@java.lang.Override()
public short toShort();// toShort()
public final 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 final java.lang.CharSequence subSequence(int, int);// subSequence(int, int)
@java.lang.Override()
public char get(int);// get(int)
public final char get(int);// get(int)
public MyString();// .ctor()
public error.NonExistentClass chars();// chars()
public final error.NonExistentClass chars();// chars()
public error.NonExistentClass codePoints();// codePoints()
public final error.NonExistentClass codePoints();// codePoints()
public int getLength();// getLength()
public final int getLength();// getLength()
}}
compiler/testData/asJava/lightClasses/ideRegression/ImplementingMap.fir.java
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
public final class TypeHierarchyMap /* p1.TypeHierarchyMap*/<TValue> implements java.util.Map<java.lang.Class<?>, TValue>, kotlin.collections.Map<java.lang.Class<?>, TValue>, kotlin.jvm.internal.markers.KMappedMarker {
@java.lang.Override()
public boolean containsKey(@org.jetbrains.annotations.NotNull() java.lang.Class<?>);// containsKey(java.lang.Class<?>)
public final 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
+5 -5
View File
@@ -11,13 +11,13 @@ public final class SmartSet /* SmartSet*/<T> extends kotlin.collections.Abstrac
@java.lang.Override()
@org.jetbrains.annotations.NotNull()
public java.util.Iterator<T> iterator();// iterator()
public final java.util.Iterator<T> iterator();// iterator()
@java.lang.Override()
public boolean add(T);// add(T)
public final boolean add(T);// add(T)
@java.lang.Override()
public void clear();// clear()
public final void clear();// clear()
@kotlin.jvm.JvmStatic()
@org.jetbrains.annotations.NotNull()
@@ -29,9 +29,9 @@ public final class SmartSet /* SmartSet*/<T> extends kotlin.collections.Abstrac
private SmartSet();// .ctor()
public int getSize();// getSize()
public final int getSize();// getSize()
public void setSize(int);// setSize(int)
public final void setSize(int);// setSize(int)
public static final class Companion /* SmartSet.Companion*/ {
compiler/testData/asJava/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.fir.java
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
public final class Inheritor /* p.Inheritor*/ implements p.I, p.I2 {
@java.lang.Override()
public void g();// g()
public final void g();// g()
public Inheritor();// .ctor()
compiler/testData/asJava/lightClasses/ideRegression/OverridingFinalInternal.fir.java
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
public final class C /* p.C*/ {
public C();// .ctor()
public int af();// af()
public final int af();// af()
public int getAp();// getAp()
public final int getAp();// getAp()
}
compiler/testData/asJava/lightClasses/ideRegression/OverridingInternal.fir.java
Vendored
+3 -3
View File
@@ -3,10 +3,10 @@ public final class C /* p.C*/ {
public C();// .ctor()
public int af();// af()
public final int af();// af()
public int getAp();// getAp()
public final int getAp();// getAp()
public int getIp();// getIp()
public final int getIp();// getIp()
}
compiler/testData/asJava/lightClasses/ideRegression/OverridingProtected.fir.java
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
public final class C /* p.C*/ {
public C();// .ctor()
public int af();// af()
public final int af();// af()
public int getAp();// getAp()
public final int getAp();// getAp()
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.fir.java
Vendored
+2 -2
View File
@@ -2,10 +2,10 @@ public final class C /* C*/ implements Tr {
private final int v;
@java.lang.Override()
public int foo();// foo()
public final int foo();// foo()
public C();// .ctor()
public int getV();// getV()
public final int getV();// getV()
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.fir.java
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
public final class C /* C*/ implements Base {
@java.lang.Override()
public void foo();// foo()
public final void foo();// foo()
public C();// .ctor()
compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.fir.java
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
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 final void foo(@org.jetbrains.annotations.NotNull() kotlin.Unit);// foo(kotlin.Unit)
public C();// .ctor()