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

[Analysis API] support Java compilation in tests

Browse Source 
Previously we just skipped Java sources.
The order of classes in light classes test data is changed due to
differences in implementations of `compileLibraryToJar` and `runJvmCompiler`

^KT-62892
This commit is contained in:
Dmitrii Gridin
2024-01-03 14:23:48 +01:00
committed by Space Team
parent a9f85d75f4
commit 6c7d1babf0
14 changed files with 448 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.fir.java → compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.descriptors.java
Vendored
-8
View File
@@ -24,10 +24,6 @@ public abstract class AbstractKotlinClass /* AbstractKotlinClass*/ {
}
public static final class Companion /* KotlinClass.Companion*/ {
@java.lang.Deprecated()
@kotlin.jvm.JvmStatic()
public static void getCompanionLateinitStaticVariable$annotations();// getCompanionLateinitStaticVariable$annotations()
@org.jetbrains.annotations.NotNull()
public final Custom getCompanionLateinitStaticVariable();// getCompanionLateinitStaticVariable()
@@ -42,10 +38,6 @@ public static final class Companion /* KotlinClass.Companion*/ {
}
public static final class Companion /* AbstractKotlinClass.Companion*/ {
@java.lang.Deprecated()
@kotlin.jvm.JvmStatic()
public static void getCompanionLateinitStaticVariable$annotations();// getCompanionLateinitStaticVariable$annotations()
@org.jetbrains.annotations.NotNull()
public final Custom getCompanionLateinitStaticVariable();// getCompanionLateinitStaticVariable()
compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.java
Vendored
+8
View File
@@ -24,6 +24,10 @@ public abstract class AbstractKotlinClass /* AbstractKotlinClass*/ {
}
public static final class Companion /* KotlinClass.Companion*/ {
@java.lang.Deprecated()
@kotlin.jvm.JvmStatic()
public static void getCompanionLateinitStaticVariable$annotations();// getCompanionLateinitStaticVariable$annotations()
@org.jetbrains.annotations.NotNull()
public final Custom getCompanionLateinitStaticVariable();// getCompanionLateinitStaticVariable()
@@ -38,6 +42,10 @@ public static final class Companion /* KotlinClass.Companion*/ {
}
public static final class Companion /* AbstractKotlinClass.Companion*/ {
@java.lang.Deprecated()
@kotlin.jvm.JvmStatic()
public static void getCompanionLateinitStaticVariable$annotations();// getCompanionLateinitStaticVariable$annotations()
@org.jetbrains.annotations.NotNull()
public final Custom getCompanionLateinitStaticVariable();// getCompanionLateinitStaticVariable()
compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.lib.java
Vendored
+90
View File
@@ -0,0 +1,90 @@
public abstract class AbstractKotlinClass /* AbstractKotlinClass*/ {
@org.jetbrains.annotations.NotNull()
public static final AbstractKotlinClass.Companion Companion;
public Custom classLateinitVariable;
public static Custom companionLateinitStaticVariable;
public static Custom companionLateinitVariable;
@org.jetbrains.annotations.NotNull()
public final Custom getClassLateinitVariable();// getClassLateinitVariable()
@org.jetbrains.annotations.NotNull()
public static final Custom getCompanionLateinitStaticVariable();// getCompanionLateinitStaticVariable()
public AbstractKotlinClass();// .ctor()
public final void setClassLateinitVariable(@org.jetbrains.annotations.NotNull() Custom);// setClassLateinitVariable(Custom)
public static final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitStaticVariable(Custom)
class Companion ...
}
public static final class Companion /* AbstractKotlinClass.Companion*/ {
@org.jetbrains.annotations.NotNull()
public final Custom getCompanionLateinitStaticVariable();// getCompanionLateinitStaticVariable()
@org.jetbrains.annotations.NotNull()
public final Custom getCompanionLateinitVariable();// getCompanionLateinitVariable()
private Companion();// .ctor()
public final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitStaticVariable(Custom)
public final void setCompanionLateinitVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitVariable(Custom)
}
public static final class Companion /* KotlinClass.Companion*/ {
@org.jetbrains.annotations.NotNull()
public final Custom getCompanionLateinitStaticVariable();// getCompanionLateinitStaticVariable()
@org.jetbrains.annotations.NotNull()
public final Custom getCompanionLateinitVariable();// getCompanionLateinitVariable()
private Companion();// .ctor()
public final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitStaticVariable(Custom)
public final void setCompanionLateinitVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitVariable(Custom)
}
public final class Custom /* Custom*/ {
public Custom();// .ctor()
}
public final class KotlinClass /* KotlinClass*/ {
@org.jetbrains.annotations.NotNull()
public static final KotlinClass.Companion Companion;
public Custom classLateinitVariable;
public static Custom companionLateinitStaticVariable;
public static Custom companionLateinitVariable;
@org.jetbrains.annotations.NotNull()
public final Custom getClassLateinitVariable();// getClassLateinitVariable()
@org.jetbrains.annotations.NotNull()
public static final Custom getCompanionLateinitStaticVariable();// getCompanionLateinitStaticVariable()
public KotlinClass();// .ctor()
public final void setClassLateinitVariable(@org.jetbrains.annotations.NotNull() Custom);// setClassLateinitVariable(Custom)
public static final void setCompanionLateinitStaticVariable(@org.jetbrains.annotations.NotNull() Custom);// setCompanionLateinitStaticVariable(Custom)
class Companion ...
}
public final class LateinitPropertiesKt /* LateinitPropertiesKt*/ {
public static Custom topLevelLateinit;
@org.jetbrains.annotations.NotNull()
public static final Custom getTopLevelLateinit();// getTopLevelLateinit()
public static final void setTopLevelLateinit(@org.jetbrains.annotations.NotNull() Custom);// setTopLevelLateinit(Custom)
}
compiler/testData/asJava/lightClasses/lightClassByPsi/enumMembers.lib.java
Vendored
+6 -6
View File
@@ -1,3 +1,9 @@
public static final class Companion /* State.Companion*/ {
private Companion();// .ctor()
public final boolean done(@org.jetbrains.annotations.NotNull() State);// done(State)
}
public static final class Companion /* Event.Companion*/ {
@kotlin.jvm.JvmStatic()
@org.jetbrains.annotations.Nullable()
@@ -6,12 +12,6 @@ public static final class Companion /* Event.Companion*/ {
private Companion();// .ctor()
}
public static final class Companion /* State.Companion*/ {
private Companion();// .ctor()
public final boolean done(@org.jetbrains.annotations.NotNull() State);// done(State)
}
public enum Event /* Event*/ {
ON_CREATE,
ON_START,
compiler/testData/asJava/lightClasses/lightClassByPsi/objects.lib.java
Vendored
+8 -8
View File
@@ -78,6 +78,14 @@ public static final class Companion /* C2.Companion*/ {
private Companion();// .ctor()
}
public static final class Companion /* I.Companion*/ {
private Companion();// .ctor()
}
public static final class Companion /* ClassWithConstContainer.Companion*/ {
private Companion();// .ctor()
}
public static final class Companion /* C.Companion*/ {
@kotlin.jvm.JvmStatic()
@org.jetbrains.annotations.NotNull()
@@ -105,14 +113,6 @@ public static final class Companion /* C.Companion*/ {
public final void setX(@org.jetbrains.annotations.NotNull() java.lang.String);// setX(java.lang.String)
}
public static final class Companion /* I.Companion*/ {
private Companion();// .ctor()
}
public static final class Companion /* ClassWithConstContainer.Companion*/ {
private Companion();// .ctor()
}
public final class ConstContainer /* ConstContainer*/ {
@org.jetbrains.annotations.NotNull()
public static final ConstContainer INSTANCE;