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

[SLC] AbstractSymbolLightClassesByPsiTest: add more stable order

Browse Source 
Now more diff between sources and libraries are readable.
Also prefer .descriptors to .fir as FIR is a first-class support

^KT-62892
This commit is contained in:
Dmitrii Gridin
2024-01-03 19:41:34 +01:00
committed by Space Team
parent d64f18eaa9
commit af5f76048b
68 changed files with 891 additions and 745 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.descriptors.java
Vendored
+5
View File
@@ -0,0 +1,5 @@
public final class InlineOnlyKt /* InlineOnlyKt*/ {
@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"})
@kotlin.internal.InlineOnly()
private static final void foo();// foo()
}
compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.fir.java
Vendored
-2
View File
@@ -1,2 +0,0 @@
public final class InlineOnlyKt /* InlineOnlyKt*/ {
}
compiler/testData/asJava/lightClasses/lightClassByPsi/facades/inlineOnly.java
Vendored
-3
View File
@@ -1,5 +1,2 @@
public final class InlineOnlyKt /* InlineOnlyKt*/ {
@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"})
@kotlin.internal.InlineOnly()
private static final void foo();// foo()
}
compiler/testData/asJava/lightClasses/lightClassByPsi/facades/reifiedInlineReturnsObject.fir.java → compiler/testData/asJava/lightClasses/lightClassByPsi/facades/reifiedInlineReturnsObject.descriptors.java
Vendored
-1
View File
@@ -1,5 +1,4 @@
final class null /* null*/ extends PaginatedTableModel<R> {
@java.lang.Override()
@org.jetbrains.annotations.NotNull()
public java.util.List<R> getRows();// getRows()
compiler/testData/asJava/lightClasses/lightClassByPsi/facades/reifiedInlineReturnsObject.java
Vendored
+8 -7
View File
@@ -1,10 +1,3 @@
final class null /* null*/ extends PaginatedTableModel<R> {
@org.jetbrains.annotations.NotNull()
public java.util.List<R> getRows();// getRows()
private ();// .ctor()
}
public abstract class PaginatedTableModel /* PaginatedTableModel*/<R> {
@org.jetbrains.annotations.NotNull()
public abstract java.util.List<R> getRows();// getRows()
@@ -14,3 +7,11 @@ public abstract class PaginatedTableModel /* PaginatedTableModel*/<R> {
public final class ReifiedInlineReturnsObjectKt /* ReifiedInlineReturnsObjectKt*/ {
}
final class null /* null*/ extends PaginatedTableModel<R> {
@java.lang.Override()
@org.jetbrains.annotations.NotNull()
public java.util.List<R> getRows();// getRows()
private ();// .ctor()
}
compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.fir.java → compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.descriptors.java
Vendored
+1 -1
View File
@@ -7,6 +7,6 @@ public final class ThrowsAnnotationKt /* ThrowsAnnotationKt*/ {
@org.jetbrains.annotations.NotNull()
public static final java.lang.String readFile(@org.jetbrains.annotations.NotNull() java.lang.String) throws java.io.IOException, MyException;// readFile(java.lang.String)
@kotlin.jvm.Throws(exceptionClasses = {java.lang.Throwable.class})
@kotlin.jvm.Throws(exceptionClasses = {kotlin.Throwable.class})
public static final void baz() throws java.lang.Throwable;// baz()
}
compiler/testData/asJava/lightClasses/lightClassByPsi/facades/throwsAnnotation.java
Vendored
+1 -1
View File
@@ -7,6 +7,6 @@ public final class ThrowsAnnotationKt /* ThrowsAnnotationKt*/ {
@org.jetbrains.annotations.NotNull()
public static final java.lang.String readFile(@org.jetbrains.annotations.NotNull() java.lang.String) throws java.io.IOException, MyException;// readFile(java.lang.String)
@kotlin.jvm.Throws(exceptionClasses = {kotlin.Throwable.class})
@kotlin.jvm.Throws(exceptionClasses = {java.lang.Throwable.class})
public static final void baz() throws java.lang.Throwable;// baz()
}
compiler/testData/asJava/lightClasses/lightClassByPsi/facades/valueClassInSignature.descriptors.java
Vendored
+74
View File
@@ -0,0 +1,74 @@
@kotlin.jvm.JvmInline()
public final class Some /* Some*/ {
@org.jetbrains.annotations.NotNull()
private final java.lang.String value;
@org.jetbrains.annotations.NotNull()
public final java.lang.String getValue();// getValue()
public Some(@org.jetbrains.annotations.NotNull() java.lang.String);// .ctor(java.lang.String)
}
public final class SomeClass /* SomeClass*/ {
@org.jetbrains.annotations.NotNull()
private java.lang.String memberProp;
@org.jetbrains.annotations.NotNull()
public final java.lang.String getMemberProp();// getMemberProp()
@org.jetbrains.annotations.NotNull()
public final java.lang.String memberFunInReturn();// memberFunInReturn()
public SomeClass();// .ctor()
public final int getMemberPropInExtension(@org.jetbrains.annotations.NotNull() java.lang.String);// getMemberPropInExtension(java.lang.String)
public final void memberFunInExtension(@org.jetbrains.annotations.NotNull() java.lang.String);// memberFunInExtension(java.lang.String)
public final void memberFunInParameter(@org.jetbrains.annotations.NotNull() java.lang.String);// memberFunInParameter(java.lang.String)
public final void setMemberProp(@org.jetbrains.annotations.NotNull() java.lang.String);// setMemberProp(java.lang.String)
public final void setMemberPropInExtension(@org.jetbrains.annotations.NotNull() java.lang.String, int);// setMemberPropInExtension(java.lang.String, int)
}
public abstract interface SomeInterface /* SomeInterface*/ {
@org.jetbrains.annotations.NotNull()
public abstract java.lang.String getMemberProp();// getMemberProp()
@org.jetbrains.annotations.NotNull()
public abstract java.lang.String memberFunInReturn();// memberFunInReturn()
public abstract int getMemberPropInExtension(@org.jetbrains.annotations.NotNull() java.lang.String);// getMemberPropInExtension(java.lang.String)
public abstract void memberFunInExtension(@org.jetbrains.annotations.NotNull() java.lang.String);// memberFunInExtension(java.lang.String)
public abstract void memberFunInParameter(@org.jetbrains.annotations.NotNull() java.lang.String);// memberFunInParameter(java.lang.String)
public abstract void setMemberProp(@org.jetbrains.annotations.NotNull() java.lang.String);// setMemberProp(java.lang.String)
public abstract void setMemberPropInExtension(@org.jetbrains.annotations.NotNull() java.lang.String, int);// setMemberPropInExtension(java.lang.String, int)
class DefaultImpls ...
}
public final class ValueClassInSignatureKt /* ValueClassInSignatureKt*/ {
@org.jetbrains.annotations.NotNull()
private static java.lang.String topLevelProp;
@org.jetbrains.annotations.NotNull()
public static final java.lang.String getTopLevelProp();// getTopLevelProp()
@org.jetbrains.annotations.NotNull()
public static final java.lang.String topLevelFunInReturn();// topLevelFunInReturn()
public static final int getTopLevelPropInExtension(@org.jetbrains.annotations.NotNull() java.lang.String);// getTopLevelPropInExtension(java.lang.String)
public static final void setTopLevelProp(@org.jetbrains.annotations.NotNull() java.lang.String);// setTopLevelProp(java.lang.String)
public static final void setTopLevelPropInExtension(@org.jetbrains.annotations.NotNull() java.lang.String, int);// setTopLevelPropInExtension(java.lang.String, int)
public static final void topLevelFunInExtension(@org.jetbrains.annotations.NotNull() java.lang.String);// topLevelFunInExtension(java.lang.String)
public static final void topLevelFunInParameter(@org.jetbrains.annotations.NotNull() java.lang.String);// topLevelFunInParameter(java.lang.String)
}
compiler/testData/asJava/lightClasses/lightClassByPsi/facades/valueClassInSignature.fir.java
Vendored
-32
View File
@@ -1,32 +0,0 @@
@kotlin.jvm.JvmInline()
public final class Some /* Some*/ {
@org.jetbrains.annotations.NotNull()
private final java.lang.String value;
@org.jetbrains.annotations.NotNull()
public final java.lang.String getValue();// getValue()
public Some(@org.jetbrains.annotations.NotNull() java.lang.String);// .ctor(java.lang.String)
}
public final class SomeClass /* SomeClass*/ {
@org.jetbrains.annotations.NotNull()
private java.lang.String memberProp;
public SomeClass();// .ctor()
}
public abstract interface SomeInterface /* SomeInterface*/ {
class DefaultImpls ...
}
public final class ValueClassInSignatureKt /* ValueClassInSignatureKt*/ {
@org.jetbrains.annotations.NotNull()
private static java.lang.String topLevelProp;
@org.jetbrains.annotations.NotNull()
public static final java.lang.String getTopLevelProp();// getTopLevelProp()
@org.jetbrains.annotations.NotNull()
public static final java.lang.String topLevelFunInReturn();// topLevelFunInReturn()
}
compiler/testData/asJava/lightClasses/lightClassByPsi/facades/valueClassInSignature.java
Vendored
-42
View File
@@ -13,42 +13,10 @@ public final class SomeClass /* SomeClass*/ {
@org.jetbrains.annotations.NotNull()
private java.lang.String memberProp;
@org.jetbrains.annotations.NotNull()
public final java.lang.String getMemberProp();// getMemberProp()
@org.jetbrains.annotations.NotNull()
public final java.lang.String memberFunInReturn();// memberFunInReturn()
public SomeClass();// .ctor()
public final int getMemberPropInExtension(@org.jetbrains.annotations.NotNull() java.lang.String);// getMemberPropInExtension(java.lang.String)
public final void memberFunInExtension(@org.jetbrains.annotations.NotNull() java.lang.String);// memberFunInExtension(java.lang.String)
public final void memberFunInParameter(@org.jetbrains.annotations.NotNull() java.lang.String);// memberFunInParameter(java.lang.String)
public final void setMemberProp(@org.jetbrains.annotations.NotNull() java.lang.String);// setMemberProp(java.lang.String)
public final void setMemberPropInExtension(@org.jetbrains.annotations.NotNull() java.lang.String, int);// setMemberPropInExtension(java.lang.String, int)
}
public abstract interface SomeInterface /* SomeInterface*/ {
@org.jetbrains.annotations.NotNull()
public abstract java.lang.String getMemberProp();// getMemberProp()
@org.jetbrains.annotations.NotNull()
public abstract java.lang.String memberFunInReturn();// memberFunInReturn()
public abstract int getMemberPropInExtension(@org.jetbrains.annotations.NotNull() java.lang.String);// getMemberPropInExtension(java.lang.String)
public abstract void memberFunInExtension(@org.jetbrains.annotations.NotNull() java.lang.String);// memberFunInExtension(java.lang.String)
public abstract void memberFunInParameter(@org.jetbrains.annotations.NotNull() java.lang.String);// memberFunInParameter(java.lang.String)
public abstract void setMemberProp(@org.jetbrains.annotations.NotNull() java.lang.String);// setMemberProp(java.lang.String)
public abstract void setMemberPropInExtension(@org.jetbrains.annotations.NotNull() java.lang.String, int);// setMemberPropInExtension(java.lang.String, int)
class DefaultImpls ...
}
@@ -61,14 +29,4 @@ public final class ValueClassInSignatureKt /* ValueClassInSignatureKt*/ {
@org.jetbrains.annotations.NotNull()
public static final java.lang.String topLevelFunInReturn();// topLevelFunInReturn()
public static final int getTopLevelPropInExtension(@org.jetbrains.annotations.NotNull() java.lang.String);// getTopLevelPropInExtension(java.lang.String)
public static final void setTopLevelProp(@org.jetbrains.annotations.NotNull() java.lang.String);// setTopLevelProp(java.lang.String)
public static final void setTopLevelPropInExtension(@org.jetbrains.annotations.NotNull() java.lang.String, int);// setTopLevelPropInExtension(java.lang.String, int)
public static final void topLevelFunInExtension(@org.jetbrains.annotations.NotNull() java.lang.String);// topLevelFunInExtension(java.lang.String)
public static final void topLevelFunInParameter(@org.jetbrains.annotations.NotNull() java.lang.String);// topLevelFunInParameter(java.lang.String)
}