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

[FIR] Properly setup java parser version for CLI pipeline with light tree

Browse Source 
^KT-56549 Fixed
This commit is contained in:
Dmitriy Novozhilov
2023-02-20 14:34:51 +02:00
committed by Space Team
parent f836d16dc6
commit e0fa1e64b9
12 changed files with 69 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipeline.kt
+2
View File
@@ -518,6 +518,8 @@ fun createProjectEnvironment(
project.registerService(MetadataFinderFactory::class.java, finderFactory)
project.registerService(VirtualFileFinderFactory::class.java, finderFactory)
project.setupHighestLanguageLevel()
return ProjectEnvironmentWithCoreEnvironmentEmulation(
project,
localFileSystem,
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxModernJdkCodegenTestGenerated.java
Generated
+6
View File
@@ -766,6 +766,12 @@ public class FirLightTreeBlackBoxModernJdkCodegenTestGenerated extends AbstractF
runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/javaSealedInterface.kt");
}
@Test
@TestMetadata("kotlinExhaustiveWhenOnJavaSealedClass.kt")
public void testKotlinExhaustiveWhenOnJavaSealedClass() throws Exception {
runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/kotlinExhaustiveWhenOnJavaSealedClass.kt");
}
@Test
@TestMetadata("permittedSubclassesOfSealedKotlinClass.kt")
public void testPermittedSubclassesOfSealedKotlinClass() throws Exception {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxModernJdkCodegenTestGenerated.java
Generated
+12
View File
@@ -340,6 +340,12 @@ public class FirPsiBlackBoxModernJdkCodegenTestGenerated extends AbstractFirPsiB
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxModernJdk/testsWithJava17/records"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
}
@Test
@TestMetadata("binaryRecord.kt")
public void testBinaryRecord() throws Exception {
runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/binaryRecord.kt");
}
@Test
@TestMetadata("bytecodeShapeForJava.kt")
public void testBytecodeShapeForJava() throws Exception {
@@ -760,6 +766,12 @@ public class FirPsiBlackBoxModernJdkCodegenTestGenerated extends AbstractFirPsiB
runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/javaSealedInterface.kt");
}
@Test
@TestMetadata("kotlinExhaustiveWhenOnJavaSealedClass.kt")
public void testKotlinExhaustiveWhenOnJavaSealedClass() throws Exception {
runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/kotlinExhaustiveWhenOnJavaSealedClass.kt");
}
@Test
@TestMetadata("permittedSubclassesOfSealedKotlinClass.kt")
public void testPermittedSubclassesOfSealedKotlinClass() throws Exception {
compiler/testData/cli/jvm/javaSealedClass.args
Vendored
+8
View File
@@ -0,0 +1,8 @@
$TESTDATA_DIR$/javaSealedClass/SealedJava.java
$TESTDATA_DIR$/javaSealedClass/SubSealedAJava.java
$TESTDATA_DIR$/javaSealedClass/SubSealedBJava.java
$TESTDATA_DIR$/javaSealedClass/javaSealedClass.kt
-d
$TEMP_DIR$
-language-version
2.0
compiler/testData/cli/jvm/javaSealedClass.out
Vendored
+2
View File
@@ -0,0 +1,2 @@
warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features
OK
compiler/testData/cli/jvm/javaSealedClass/SealedJava.java
Vendored
+1
View File
@@ -0,0 +1 @@
public abstract sealed class SealedJava permits SubSealedAJava, SubSealedBJava {}
compiler/testData/cli/jvm/javaSealedClass/SubSealedAJava.java
Vendored
+1
View File
@@ -0,0 +1 @@
public final class SubSealedAJava extends SealedJava {}
compiler/testData/cli/jvm/javaSealedClass/SubSealedBJava.java
Vendored
+1
View File
@@ -0,0 +1 @@
public non-sealed class SubSealedBJava extends SealedJava {}
compiler/testData/cli/jvm/javaSealedClass/javaSealedClass.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
fun test(sj: SealedJava) = when (sj) {
is SubSealedAJava -> "O"
is SubSealedBJava -> "K"
}
compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/kotlinExhaustiveWhenOnJavaSealedClass.kt
Vendored
+21
View File
@@ -0,0 +1,21 @@
// TARGET_BACKEND: JVM_IR
// ISSUE: KT-56549
// FILE: SealedJava.java
public abstract sealed class SealedJava permits SubSealedAJava, SubSealedBJava {}
// FILE: SubSealedAJava.java
public final class SubSealedAJava extends SealedJava {}
// FILE: SubSealedBJava.java
public non-sealed class SubSealedBJava extends SealedJava {}
// FILE: main.kt
fun test(sj: SealedJava) = when (sj) {
is SubSealedAJava -> "O"
is SubSealedBJava -> "K"
}
fun box(): String {
return test(SubSealedAJava()) + test(SubSealedBJava())
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxModernJdkCodegenTestGenerated.java
Generated
+6
View File
@@ -766,6 +766,12 @@ public class IrBlackBoxModernJdkCodegenTestGenerated extends AbstractIrBlackBoxC
runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/javaSealedInterface.kt");
}
@Test
@TestMetadata("kotlinExhaustiveWhenOnJavaSealedClass.kt")
public void testKotlinExhaustiveWhenOnJavaSealedClass() throws Exception {
runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/sealed/kotlinExhaustiveWhenOnJavaSealedClass.kt");
}
@Test
@TestMetadata("permittedSubclassesOfSealedKotlinClass.kt")
public void testPermittedSubclassesOfSealedKotlinClass() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java
Generated
+5
View File
@@ -680,6 +680,11 @@ public class CliTestGenerated extends AbstractCliTest {
runTest("compiler/testData/cli/jvm/irSupported.args");
}
@TestMetadata("javaSealedClass.args")
public void testJavaSealedClass() throws Exception {
runTest("compiler/testData/cli/jvm/javaSealedClass.args");
}
@TestMetadata("javaSrcWrongPackage.args")
public void testJavaSrcWrongPackage() throws Exception {
runTest("compiler/testData/cli/jvm/javaSrcWrongPackage.args");