From a295a34d77ac1eb9fa602c6aeaac9a64293f343c Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Mon, 11 Dec 2023 10:19:59 +0100 Subject: [PATCH] K2 IC tests: reenable incremental tests with PSI #KT-64228 fixed --- ...tIncrementalK2PsiJvmCompilerRunnerTest.kt} | 4 +- ...lK2PsiJvmCompilerRunnerTestGenerated.java} | 214 +++++++++--------- .../kotlin/generators/tests/GenerateTests.kt | 2 +- 3 files changed, 110 insertions(+), 110 deletions(-) rename compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/{AbstractIncrementalFirLightTreeJvmCompilerRunnerTest.kt => AbstractIncrementalK2PsiJvmCompilerRunnerTest.kt} (85%) rename compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/{IncrementalFirLightTreeJvmCompilerRunnerTestGenerated.java => IncrementalK2PsiJvmCompilerRunnerTestGenerated.java} (96%) diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalFirLightTreeJvmCompilerRunnerTest.kt b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalK2PsiJvmCompilerRunnerTest.kt similarity index 85% rename from compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalFirLightTreeJvmCompilerRunnerTest.kt rename to compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalK2PsiJvmCompilerRunnerTest.kt index 727830fffa1..2b64b72e8c4 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalFirLightTreeJvmCompilerRunnerTest.kt +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalK2PsiJvmCompilerRunnerTest.kt @@ -9,12 +9,12 @@ import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments import org.jetbrains.kotlin.incremental.testingUtils.BuildLogFinder import java.io.File -abstract class AbstractIncrementalFirLightTreeJvmCompilerRunnerTest : AbstractIncrementalJvmCompilerRunnerTest() { +abstract class AbstractIncrementalK2PsiJvmCompilerRunnerTest : AbstractIncrementalJvmCompilerRunnerTest() { override fun createCompilerArguments(destinationDir: File, testDir: File): K2JVMCompilerArguments = super.createCompilerArguments(destinationDir, testDir).apply { languageVersion = "2.0" useFirIC = false - useFirLT = true + useFirLT = false } override val buildLogFinder: BuildLogFinder diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirLightTreeJvmCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK2PsiJvmCompilerRunnerTestGenerated.java similarity index 96% rename from compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirLightTreeJvmCompilerRunnerTestGenerated.java rename to compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK2PsiJvmCompilerRunnerTestGenerated.java index c8e2ac673db..db79e08de4b 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirLightTreeJvmCompilerRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK2PsiJvmCompilerRunnerTestGenerated.java @@ -19,11 +19,11 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateTestsKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @RunWith(JUnit3RunnerWithInners.class) -public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { +public class IncrementalK2PsiJvmCompilerRunnerTestGenerated extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { @TestMetadata("jps/jps-plugin/testData/incremental/pureKotlin") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PureKotlin extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class PureKotlin extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -691,7 +691,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/classHierarchyAffected") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ClassHierarchyAffected extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class ClassHierarchyAffected extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -909,7 +909,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class InlineFunCallSite extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class InlineFunCallSite extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -996,7 +996,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ClassProperty extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class ClassProperty extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1009,7 +1009,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class CompanionObjectProperty extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class CompanionObjectProperty extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1022,7 +1022,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Coroutine extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class Coroutine extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1035,7 +1035,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/function") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Function extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class Function extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1048,7 +1048,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/functionIndirect") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FunctionIndirect extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class FunctionIndirect extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1061,7 +1061,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/getter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Getter extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class Getter extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1074,7 +1074,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Lambda extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class Lambda extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1087,7 +1087,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class LocalFun extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class LocalFun extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1100,7 +1100,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/method") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Method extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class Method extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1113,7 +1113,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ParameterDefaultValue extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class ParameterDefaultValue extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1126,7 +1126,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PrimaryConstructorParameterDefaultValue extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class PrimaryConstructorParameterDefaultValue extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1139,7 +1139,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SuperCall extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class SuperCall extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1152,7 +1152,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ThisCall extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class ThisCall extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1165,7 +1165,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TopLevelObjectProperty extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class TopLevelObjectProperty extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1178,7 +1178,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TopLevelProperty extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class TopLevelProperty extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1192,7 +1192,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class WithJava extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class WithJava extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1204,7 +1204,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConvertBetweenJavaAndKotlin extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class ConvertBetweenJavaAndKotlin extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1236,7 +1236,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaToKotlin extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class JavaToKotlin extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1249,7 +1249,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaToKotlinAndBack extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class JavaToKotlinAndBack extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1262,7 +1262,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaToKotlinAndRemove extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class JavaToKotlinAndRemove extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1275,7 +1275,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class KotlinToJava extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class KotlinToJava extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1289,7 +1289,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaUsedInKotlin extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class JavaUsedInKotlin extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1411,7 +1411,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeFieldType extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class ChangeFieldType extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1424,7 +1424,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeNotUsedSignature extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class ChangeNotUsedSignature extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1437,7 +1437,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangePropertyOverrideType extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class ChangePropertyOverrideType extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1450,7 +1450,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeSignature extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class ChangeSignature extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1463,7 +1463,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeSignaturePackagePrivate extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class ChangeSignaturePackagePrivate extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1476,7 +1476,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeSignaturePackagePrivateNonRoot extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class ChangeSignaturePackagePrivateNonRoot extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1489,7 +1489,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeSignatureStatic extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class ChangeSignatureStatic extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1502,7 +1502,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConstantChanged extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class ConstantChanged extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1515,7 +1515,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConstantPropertyChanged extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class ConstantPropertyChanged extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1528,7 +1528,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConstantUnchanged extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class ConstantUnchanged extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1541,7 +1541,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class EnumEntryAdded extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class EnumEntryAdded extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1554,7 +1554,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class EnumEntryRemoved extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class EnumEntryRemoved extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1567,7 +1567,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaAndKotlinChangedSimultaneously extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class JavaAndKotlinChangedSimultaneously extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1580,7 +1580,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaFieldNullabilityChanged extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class JavaFieldNullabilityChanged extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1593,7 +1593,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaMethodParamNullabilityChanged extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class JavaMethodParamNullabilityChanged extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1606,7 +1606,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaMethodReturnTypeNullabilityChanged extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class JavaMethodReturnTypeNullabilityChanged extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1619,7 +1619,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodAddedInSuper extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class MethodAddedInSuper extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1632,7 +1632,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodRenamed extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class MethodRenamed extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1645,7 +1645,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MixedInheritance extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class MixedInheritance extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1658,7 +1658,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class NotChangeSignature extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class NotChangeSignature extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1671,7 +1671,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/rawErrorTypeDuringSerialization") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class RawErrorTypeDuringSerialization extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class RawErrorTypeDuringSerialization extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1684,7 +1684,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/removeAnnotation") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class RemoveAnnotation extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class RemoveAnnotation extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1697,7 +1697,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SamConversions extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class SamConversions extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1734,7 +1734,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodAddDefault extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class MethodAddDefault extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1747,7 +1747,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodAdded extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class MethodAdded extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1760,7 +1760,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodAddedSamAdapter extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class MethodAddedSamAdapter extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1773,7 +1773,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodSignatureChanged extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class MethodSignatureChanged extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1786,7 +1786,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodSignatureChangedSamAdapter extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class MethodSignatureChangedSamAdapter extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1801,7 +1801,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class KotlinUsedInJava extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class KotlinUsedInJava extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1883,7 +1883,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AddOptionalParameter extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class AddOptionalParameter extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1896,7 +1896,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeNotUsedSignature extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class ChangeNotUsedSignature extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1909,7 +1909,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeSignature extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class ChangeSignature extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1922,7 +1922,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConstantChanged extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class ConstantChanged extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1935,7 +1935,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConstantUnchanged extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class ConstantUnchanged extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1948,7 +1948,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FunRenamed extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class FunRenamed extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1961,7 +1961,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JvmFieldChanged extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class JvmFieldChanged extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1974,7 +1974,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JvmFieldUnchanged extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class JvmFieldUnchanged extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -1987,7 +1987,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodAddedInSuper extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class MethodAddedInSuper extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2000,7 +2000,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class NotChangeSignature extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class NotChangeSignature extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2013,7 +2013,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class OnlyTopLevelFunctionInFileRemoved extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class OnlyTopLevelFunctionInFileRemoved extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2026,7 +2026,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PackageFileAdded extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class PackageFileAdded extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2039,7 +2039,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PrivateChanges extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class PrivateChanges extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2052,7 +2052,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PropertyRenamed extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class PropertyRenamed extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2066,7 +2066,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Other extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class Other extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2233,7 +2233,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AccessingFunctionsViaRenamedFileClass extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class AccessingFunctionsViaRenamedFileClass extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2246,7 +2246,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AllKotlinFilesRemovedThenNewAdded extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class AllKotlinFilesRemovedThenNewAdded extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2259,7 +2259,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/classRedeclaration") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ClassRedeclaration extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class ClassRedeclaration extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2272,7 +2272,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ClassToPackageFacade extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class ClassToPackageFacade extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2285,7 +2285,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConflictingPlatformDeclarations extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class ConflictingPlatformDeclarations extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2298,7 +2298,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DefaultValueInConstructorAdded extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class DefaultValueInConstructorAdded extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2311,7 +2311,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class InlineFunctionWithJvmNameInClass extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class InlineFunctionWithJvmNameInClass extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2324,7 +2324,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class InlineTopLevelFunctionWithJvmName extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class InlineTopLevelFunctionWithJvmName extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2337,7 +2337,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class InlineTopLevelValPropertyWithJvmName extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class InlineTopLevelValPropertyWithJvmName extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2350,7 +2350,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class InnerClassNotGeneratedWhenRebuilding extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class InnerClassNotGeneratedWhenRebuilding extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2363,7 +2363,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/jvmNameChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JvmNameChanged extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class JvmNameChanged extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2376,7 +2376,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/mainRedeclaration") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MainRedeclaration extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class MainRedeclaration extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2389,7 +2389,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassAddTopLevelFunWithDefault extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class MultifileClassAddTopLevelFunWithDefault extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2402,7 +2402,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassFileAdded extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class MultifileClassFileAdded extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2415,7 +2415,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassFileChanged extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class MultifileClassFileChanged extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2428,7 +2428,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassFileMovedToAnotherMultifileClass extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class MultifileClassFileMovedToAnotherMultifileClass extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2441,7 +2441,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassInlineFunction extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class MultifileClassInlineFunction extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2454,7 +2454,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassInlineFunctionAccessingField extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class MultifileClassInlineFunctionAccessingField extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2467,7 +2467,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifileClassRecreated") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassRecreated extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class MultifileClassRecreated extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2480,7 +2480,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassRecreatedAfterRenaming extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class MultifileClassRecreatedAfterRenaming extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2493,7 +2493,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifileClassRemoved") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileClassRemoved extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class MultifileClassRemoved extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2506,7 +2506,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifileDependantUsage extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class MultifileDependantUsage extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2519,7 +2519,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifilePackagePartMethodAdded extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class MultifilePackagePartMethodAdded extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2532,7 +2532,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultifilePartsWithProperties extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class MultifilePartsWithProperties extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2545,7 +2545,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/optionalParameter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class OptionalParameter extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class OptionalParameter extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2558,7 +2558,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PackageFacadeToClass extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class PackageFacadeToClass extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2571,7 +2571,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PackageMultifileClassOneFileWithPublicChanges extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class PackageMultifileClassOneFileWithPublicChanges extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2584,7 +2584,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PackageMultifileClassPrivateOnlyChanged extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class PackageMultifileClassPrivateOnlyChanged extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2597,7 +2597,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PublicPropertyWithPrivateSetterMultiFileFacade extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class PublicPropertyWithPrivateSetterMultiFileFacade extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2610,7 +2610,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TopLevelFunctionWithJvmName extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class TopLevelFunctionWithJvmName extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2623,7 +2623,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TopLevelPropertyWithJvmName extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class TopLevelPropertyWithJvmName extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2638,7 +2638,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class IncrementalJvmCompilerOnly extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class IncrementalJvmCompilerOnly extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2675,7 +2675,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AddAnnotationToJavaClass extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class AddAnnotationToJavaClass extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2688,7 +2688,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AddNestedClass extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class AddNestedClass extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2701,7 +2701,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ChangeAnnotationInJavaClass extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class ChangeAnnotationInJavaClass extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2714,7 +2714,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class InlineFunctionRegeneratedObjectStability extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class InlineFunctionRegeneratedObjectStability extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @@ -2727,7 +2727,7 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr @TestMetadata("jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class InlineFunctionSmapStability extends AbstractIncrementalFirLightTreeJvmCompilerRunnerTest { + public static class InlineFunctionSmapStability extends AbstractIncrementalK2PsiJvmCompilerRunnerTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index a79cf0ae652..3b492b6192a 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -99,7 +99,7 @@ fun main(args: Array) { ) ) ) - testClass( + testClass( init = incrementalJvmTestData( TargetBackend.JVM_IR, folderToExcludePatternMap = mapOf(