From 2e607335dbdbe18f9513bd7721f690212c799079 Mon Sep 17 00:00:00 2001 From: Andrey Uskov Date: Wed, 9 Dec 2020 17:33:51 +0300 Subject: [PATCH] Add tests for incremental compilation of sealed interfaces --- .../incremental/BuildDiffsStorageTest.kt | 2 +- ...rementalJsCompilerRunnerTestGenerated.java | 25 ++++++++++++ ...erRunnerWithMetadataOnlyTestGenerated.java | 25 ++++++++++++ ...ntalJsKlibCompilerRunnerTestGenerated.java | 25 ++++++++++++ ...WithScopeExpansionRunnerTestGenerated.java | 27 +++++++++++++ ...ementalJvmCompilerRunnerTestGenerated.java | 25 ++++++++++++ ...ementalJvmCompilerRunnerTestGenerated.java | 25 ++++++++++++ .../build/IncrementalJvmJpsTestGenerated.java | 25 ++++++++++++ .../classFlagsChanged/result-js.out | 12 ++++-- .../classFlagsChanged/result.out | 12 ++++-- .../classWithSuperTypeListChanged/result.out | 3 +- .../nestedClassSignatureChanged/result.out | 3 +- .../sealedClassImplAdded/result.out | 3 +- .../sealedClassImplRemoved/result.out | 3 +- .../sealedClassNestedImplAdded/result.out | 3 +- .../sealedClassNestedImplAddedDeep/result.out | 3 +- .../sealedClassNestedImplRemoved/result.out | 3 +- .../expected-kotlin-caches.txt | 3 ++ .../class/expected-kotlin-caches.txt | 1 + .../expected-kotlin-caches.txt | 1 + .../sealedClassesAddImplements/A.kt | 3 ++ .../sealedClassesAddImplements/B.kt | 3 ++ .../sealedClassesAddImplements/B.kt.new | 3 ++ .../sealedClassesAddImplements/Base.kt | 3 ++ .../sealedClassesAddImplements/args.txt | 1 + .../sealedClassesAddImplements/build.log | 28 +++++++++++++ .../sealedClassesAddImplements.jsklib.mute | 1 + .../sealedClassesAddImplements/С.kt | 3 ++ .../pureKotlin/sealedClassesAddInheritor/A.kt | 3 ++ .../pureKotlin/sealedClassesAddInheritor/B.kt | 3 ++ .../sealedClassesAddInheritor/Base.kt | 3 ++ .../sealedClassesAddInheritor/C.kt.new | 3 ++ .../sealedClassesAddInheritor/args.txt | 1 + .../sealedClassesAddInheritor/build.log | 27 +++++++++++++ .../sealedClassesAddInheritor.jsklib.mute | 1 + .../sealedClassesRemoveImplements/A.kt | 3 ++ .../sealedClassesRemoveImplements/B.kt | 3 ++ .../sealedClassesRemoveImplements/B.kt.new | 4 ++ .../sealedClassesRemoveImplements/Base.kt | 3 ++ .../BaseUsage.kt | 5 +++ .../sealedClassesRemoveImplements/args.txt | 1 + .../sealedClassesRemoveImplements/build.log | 39 +++++++++++++++++++ .../sealedClassesRemoveImplements.jsklib.mute | 1 + .../sealedClassesRemoveInheritor/A.kt | 3 ++ .../sealedClassesRemoveInheritor/B.kt | 3 ++ .../sealedClassesRemoveInheritor/B.kt.delete | 0 .../sealedClassesRemoveInheritor/Base.kt | 3 ++ .../sealedClassesRemoveInheritor/BaseUsage.kt | 5 +++ .../sealedClassesRemoveInheritor/args.txt | 1 + .../sealedClassesRemoveInheritor/build.log | 35 +++++++++++++++++ .../sealedClassesRemoveInheritor.jsklib.mute | 1 + .../pureKotlin/sealedClassesUseSwitch/A.kt | 3 ++ .../pureKotlin/sealedClassesUseSwitch/B.kt | 3 ++ .../pureKotlin/sealedClassesUseSwitch/Base.kt | 3 ++ .../sealedClassesUseSwitch/C.kt.new | 3 ++ .../pureKotlin/sealedClassesUseSwitch/D.kt | 5 +++ .../pureKotlin/sealedClassesUseSwitch/E.kt | 4 ++ .../sealedClassesUseSwitch/args.txt | 1 + .../sealedClassesUseSwitch/build.log | 38 ++++++++++++++++++ .../sealedClassesUseSwitch.jsklib.mute | 1 + 60 files changed, 470 insertions(+), 16 deletions(-) create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/A.kt create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/B.kt create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/B.kt.new create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/Base.kt create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/args.txt create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/build.log create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/sealedClassesAddImplements.jsklib.mute create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/С.kt create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/A.kt create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/B.kt create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/Base.kt create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/C.kt.new create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/args.txt create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/build.log create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/sealedClassesAddInheritor.jsklib.mute create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/A.kt create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/B.kt create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/B.kt.new create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/Base.kt create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/BaseUsage.kt create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/args.txt create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/build.log create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/sealedClassesRemoveImplements.jsklib.mute create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/A.kt create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/B.kt create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/B.kt.delete create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/Base.kt create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/BaseUsage.kt create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/args.txt create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/build.log create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/sealedClassesRemoveInheritor.jsklib.mute create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/A.kt create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/B.kt create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/Base.kt create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/C.kt.new create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/D.kt create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/E.kt create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/args.txt create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/build.log create mode 100644 jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/sealedClassesUseSwitch.jsklib.mute diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/BuildDiffsStorageTest.kt b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/BuildDiffsStorageTest.kt index 90afd6eae67..0b80724f435 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/BuildDiffsStorageTest.kt +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/BuildDiffsStorageTest.kt @@ -46,7 +46,7 @@ class BuildDiffsStorageTest { val diff = BuildDifference(100, true, DirtyData(lookupSymbols, fqNames)) val diffs = BuildDiffsStorage(listOf(diff)) Assert.assertEquals( - "BuildDiffsStorage(buildDiffs=[BuildDifference(ts=100, isIncremental=true, dirtyData=DirtyData(dirtyLookupSymbols=[LookupSymbol(name=foo, scope=bar)], dirtyClassesFqNames=[fizz.Buzz]))])", + "BuildDiffsStorage(buildDiffs=[BuildDifference(ts=100, isIncremental=true, dirtyData=DirtyData(dirtyLookupSymbols=[LookupSymbol(name=foo, scope=bar)], dirtyClassesFqNames=[fizz.Buzz], dirtyClassesFqNamesForceRecompile=[]))])", diffs.toString() ) } diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerTestGenerated.java index 77389396c57..b3db196aac5 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerTestGenerated.java @@ -570,6 +570,31 @@ public class IncrementalJsCompilerRunnerTestGenerated extends AbstractIncrementa runTest("jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/"); } + @TestMetadata("sealedClassesAddImplements") + public void testSealedClassesAddImplements() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/"); + } + + @TestMetadata("sealedClassesAddInheritor") + public void testSealedClassesAddInheritor() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/"); + } + + @TestMetadata("sealedClassesRemoveImplements") + public void testSealedClassesRemoveImplements() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/"); + } + + @TestMetadata("sealedClassesRemoveInheritor") + public void testSealedClassesRemoveInheritor() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/"); + } + + @TestMetadata("sealedClassesUseSwitch") + public void testSealedClassesUseSwitch() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/"); + } + @TestMetadata("secondaryConstructorInlined") public void testSecondaryConstructorInlined() throws Exception { runTest("jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/"); diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerWithMetadataOnlyTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerWithMetadataOnlyTestGenerated.java index 8ffd5078d1b..510e72b96cc 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerWithMetadataOnlyTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerWithMetadataOnlyTestGenerated.java @@ -570,6 +570,31 @@ public class IncrementalJsCompilerRunnerWithMetadataOnlyTestGenerated extends Ab runTest("jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/"); } + @TestMetadata("sealedClassesAddImplements") + public void testSealedClassesAddImplements() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/"); + } + + @TestMetadata("sealedClassesAddInheritor") + public void testSealedClassesAddInheritor() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/"); + } + + @TestMetadata("sealedClassesRemoveImplements") + public void testSealedClassesRemoveImplements() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/"); + } + + @TestMetadata("sealedClassesRemoveInheritor") + public void testSealedClassesRemoveInheritor() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/"); + } + + @TestMetadata("sealedClassesUseSwitch") + public void testSealedClassesUseSwitch() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/"); + } + @TestMetadata("secondaryConstructorInlined") public void testSecondaryConstructorInlined() throws Exception { runTest("jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/"); diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerRunnerTestGenerated.java index a209b922641..f9b1a487a46 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerRunnerTestGenerated.java @@ -572,6 +572,31 @@ public class IncrementalJsKlibCompilerRunnerTestGenerated extends AbstractIncrem runTest("jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/"); } + @TestMetadata("sealedClassesAddImplements") + public void testSealedClassesAddImplements() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/"); + } + + @TestMetadata("sealedClassesAddInheritor") + public void testSealedClassesAddInheritor() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/"); + } + + @TestMetadata("sealedClassesRemoveImplements") + public void testSealedClassesRemoveImplements() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/"); + } + + @TestMetadata("sealedClassesRemoveInheritor") + public void testSealedClassesRemoveInheritor() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/"); + } + + @TestMetadata("sealedClassesUseSwitch") + public void testSealedClassesUseSwitch() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/"); + } + @TestMetadata("secondaryConstructorInlined") public void testSecondaryConstructorInlined() throws Exception { runTest("jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/"); diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated.java index ea168c53f62..4e71e9f4dc3 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated.java @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.incremental; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.MuteExtraSuffix; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -19,6 +20,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated extends AbstractIncrementalJsKlibCompilerWithScopeExpansionRunnerTest { @TestMetadata("jps-plugin/testData/incremental/pureKotlin") + @MuteExtraSuffix(".jsklib") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class PureKotlin extends AbstractIncrementalJsKlibCompilerWithScopeExpansionRunnerTest { @@ -570,6 +572,31 @@ public class IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated exte runTest("jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/"); } + @TestMetadata("sealedClassesAddImplements") + public void testSealedClassesAddImplements() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/"); + } + + @TestMetadata("sealedClassesAddInheritor") + public void testSealedClassesAddInheritor() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/"); + } + + @TestMetadata("sealedClassesRemoveImplements") + public void testSealedClassesRemoveImplements() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/"); + } + + @TestMetadata("sealedClassesRemoveInheritor") + public void testSealedClassesRemoveInheritor() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/"); + } + + @TestMetadata("sealedClassesUseSwitch") + public void testSealedClassesUseSwitch() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/"); + } + @TestMetadata("secondaryConstructorInlined") public void testSecondaryConstructorInlined() throws Exception { runTest("jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/"); diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java index f9084401e4d..ba32279d9cb 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java @@ -571,6 +571,31 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement runTest("jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/"); } + @TestMetadata("sealedClassesAddImplements") + public void testSealedClassesAddImplements() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/"); + } + + @TestMetadata("sealedClassesAddInheritor") + public void testSealedClassesAddInheritor() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/"); + } + + @TestMetadata("sealedClassesRemoveImplements") + public void testSealedClassesRemoveImplements() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/"); + } + + @TestMetadata("sealedClassesRemoveInheritor") + public void testSealedClassesRemoveInheritor() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/"); + } + + @TestMetadata("sealedClassesUseSwitch") + public void testSealedClassesUseSwitch() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/"); + } + @TestMetadata("secondaryConstructorInlined") public void testSecondaryConstructorInlined() throws Exception { runTest("jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/"); diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IrIncrementalJvmCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IrIncrementalJvmCompilerRunnerTestGenerated.java index f08e1497aca..71389f82926 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IrIncrementalJvmCompilerRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IrIncrementalJvmCompilerRunnerTestGenerated.java @@ -571,6 +571,31 @@ public class IrIncrementalJvmCompilerRunnerTestGenerated extends AbstractIrIncre runTest("jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/"); } + @TestMetadata("sealedClassesAddImplements") + public void testSealedClassesAddImplements() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/"); + } + + @TestMetadata("sealedClassesAddInheritor") + public void testSealedClassesAddInheritor() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/"); + } + + @TestMetadata("sealedClassesRemoveImplements") + public void testSealedClassesRemoveImplements() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/"); + } + + @TestMetadata("sealedClassesRemoveInheritor") + public void testSealedClassesRemoveInheritor() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/"); + } + + @TestMetadata("sealedClassesUseSwitch") + public void testSealedClassesUseSwitch() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/"); + } + @TestMetadata("secondaryConstructorInlined") public void testSecondaryConstructorInlined() throws Exception { runTest("jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/"); diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java index 8c4310c99cf..d0ce519c09c 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java @@ -1239,6 +1239,31 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes runTest("jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/"); } + @TestMetadata("sealedClassesAddImplements") + public void testSealedClassesAddImplements() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/"); + } + + @TestMetadata("sealedClassesAddInheritor") + public void testSealedClassesAddInheritor() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/"); + } + + @TestMetadata("sealedClassesRemoveImplements") + public void testSealedClassesRemoveImplements() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/"); + } + + @TestMetadata("sealedClassesRemoveInheritor") + public void testSealedClassesRemoveInheritor() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/"); + } + + @TestMetadata("sealedClassesUseSwitch") + public void testSealedClassesUseSwitch() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/"); + } + @TestMetadata("secondaryConstructorInlined") public void testSecondaryConstructorInlined() throws Exception { runTest("jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/"); diff --git a/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result-js.out b/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result-js.out index 6fcbece9a43..95f7d8309bc 100644 --- a/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result-js.out +++ b/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result-js.out @@ -3,9 +3,11 @@ CHANGES in test/AbstractFlagAdded: CLASS_SIGNATURE PROTO DIFFERENCE in test/AbstractFlagRemoved: FLAGS CHANGES in test/AbstractFlagRemoved: CLASS_SIGNATURE PROTO DIFFERENCE in test/AnnotationFlagAdded: FLAGS, SUPERTYPE_LIST -CHANGES in test/AnnotationFlagAdded: CLASS_SIGNATURE +CHANGES in test/AnnotationFlagAdded: CLASS_SIGNATURE, PARENTS + [kotlin.Annotation, kotlin.Any] PROTO DIFFERENCE in test/AnnotationFlagRemoved: FLAGS, SUPERTYPE_LIST -CHANGES in test/AnnotationFlagRemoved: CLASS_SIGNATURE +CHANGES in test/AnnotationFlagRemoved: CLASS_SIGNATURE, PARENTS + [kotlin.Annotation, kotlin.Any] PROTO DIFFERENCE in test/DataFlagAdded: FLAGS, FUNCTION_LIST CHANGES in test/DataFlagAdded: CLASS_SIGNATURE, MEMBERS [component1, copy, equals, hashCode, toString] @@ -13,9 +15,11 @@ PROTO DIFFERENCE in test/DataFlagRemoved: FLAGS, FUNCTION_LIST CHANGES in test/DataFlagRemoved: CLASS_SIGNATURE, MEMBERS [component1, copy, equals, hashCode, toString] PROTO DIFFERENCE in test/EnumFlagAdded: CONSTRUCTOR_LIST, FLAGS, SUPERTYPE_LIST -CHANGES in test/EnumFlagAdded: CLASS_SIGNATURE +CHANGES in test/EnumFlagAdded: CLASS_SIGNATURE, PARENTS + [kotlin.Any, kotlin.Enum] PROTO DIFFERENCE in test/EnumFlagRemoved: CONSTRUCTOR_LIST, FLAGS, SUPERTYPE_LIST -CHANGES in test/EnumFlagRemoved: CLASS_SIGNATURE +CHANGES in test/EnumFlagRemoved: CLASS_SIGNATURE, PARENTS + [kotlin.Any, kotlin.Enum] PROTO DIFFERENCE in test/InnerClassHolder.InnerFlagAdded: FLAGS CHANGES in test/InnerClassHolder.InnerFlagAdded: CLASS_SIGNATURE PROTO DIFFERENCE in test/InnerClassHolder.InnerFlagRemoved: FLAGS diff --git a/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result.out b/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result.out index 9dbebfba115..f00772bb93a 100644 --- a/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result.out +++ b/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result.out @@ -3,9 +3,11 @@ CHANGES in test/AbstractFlagAdded: CLASS_SIGNATURE PROTO DIFFERENCE in test/AbstractFlagRemoved: FLAGS CHANGES in test/AbstractFlagRemoved: CLASS_SIGNATURE PROTO DIFFERENCE in test/AnnotationFlagAdded: CONSTRUCTOR_LIST, FLAGS, SUPERTYPE_LIST -CHANGES in test/AnnotationFlagAdded: CLASS_SIGNATURE +CHANGES in test/AnnotationFlagAdded: CLASS_SIGNATURE, PARENTS + [kotlin.Annotation, kotlin.Any] PROTO DIFFERENCE in test/AnnotationFlagRemoved: CONSTRUCTOR_LIST, FLAGS, SUPERTYPE_LIST -CHANGES in test/AnnotationFlagRemoved: CLASS_SIGNATURE +CHANGES in test/AnnotationFlagRemoved: CLASS_SIGNATURE, PARENTS + [kotlin.Annotation, kotlin.Any] PROTO DIFFERENCE in test/DataFlagAdded: FLAGS, FUNCTION_LIST CHANGES in test/DataFlagAdded: CLASS_SIGNATURE, MEMBERS [component1, copy, equals, hashCode, toString] @@ -13,9 +15,11 @@ PROTO DIFFERENCE in test/DataFlagRemoved: FLAGS, FUNCTION_LIST CHANGES in test/DataFlagRemoved: CLASS_SIGNATURE, MEMBERS [component1, copy, equals, hashCode, toString] PROTO DIFFERENCE in test/EnumFlagAdded: CONSTRUCTOR_LIST, FLAGS, SUPERTYPE_LIST -CHANGES in test/EnumFlagAdded: CLASS_SIGNATURE +CHANGES in test/EnumFlagAdded: CLASS_SIGNATURE, PARENTS + [kotlin.Any, kotlin.Enum] PROTO DIFFERENCE in test/EnumFlagRemoved: CONSTRUCTOR_LIST, FLAGS, SUPERTYPE_LIST -CHANGES in test/EnumFlagRemoved: CLASS_SIGNATURE +CHANGES in test/EnumFlagRemoved: CLASS_SIGNATURE, PARENTS + [kotlin.Any, kotlin.Enum] PROTO DIFFERENCE in test/InnerClassHolder.InnerFlagAdded: CONSTRUCTOR_LIST, FLAGS CHANGES in test/InnerClassHolder.InnerFlagAdded: CLASS_SIGNATURE PROTO DIFFERENCE in test/InnerClassHolder.InnerFlagRemoved: CONSTRUCTOR_LIST, FLAGS diff --git a/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/result.out b/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/result.out index e57a591aafe..b1c4bef6ae7 100644 --- a/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/result.out +++ b/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/result.out @@ -1,2 +1,3 @@ PROTO DIFFERENCE in test/ClassWithSuperTypeListChanged: SUPERTYPE_LIST -CHANGES in test/ClassWithSuperTypeListChanged: CLASS_SIGNATURE +CHANGES in test/ClassWithSuperTypeListChanged: CLASS_SIGNATURE, PARENTS + [kotlin.Any, kotlin.Throwable] diff --git a/jps-plugin/testData/comparison/classSignatureChange/nestedClassSignatureChanged/result.out b/jps-plugin/testData/comparison/classSignatureChange/nestedClassSignatureChanged/result.out index 51e6416c9e4..d6e8eed1c39 100644 --- a/jps-plugin/testData/comparison/classSignatureChange/nestedClassSignatureChanged/result.out +++ b/jps-plugin/testData/comparison/classSignatureChange/nestedClassSignatureChanged/result.out @@ -1,2 +1,3 @@ PROTO DIFFERENCE in test/Base.Nested1.Nested2: SUPERTYPE_LIST -CHANGES in test/Base.Nested1.Nested2: CLASS_SIGNATURE +CHANGES in test/Base.Nested1.Nested2: CLASS_SIGNATURE, PARENTS + [kotlin.Any, test.Base] diff --git a/jps-plugin/testData/comparison/classSignatureChange/sealedClassImplAdded/result.out b/jps-plugin/testData/comparison/classSignatureChange/sealedClassImplAdded/result.out index 027ee98b281..9c70f14d0aa 100644 --- a/jps-plugin/testData/comparison/classSignatureChange/sealedClassImplAdded/result.out +++ b/jps-plugin/testData/comparison/classSignatureChange/sealedClassImplAdded/result.out @@ -4,4 +4,5 @@ CHANGES in test/Base1: CLASS_SIGNATURE PROTO DIFFERENCE in test/Base2: SEALED_SUBCLASS_FQ_NAME_LIST CHANGES in test/Base2: CLASS_SIGNATURE PROTO DIFFERENCE in test/Impl22: SUPERTYPE_LIST -CHANGES in test/Impl22: CLASS_SIGNATURE +CHANGES in test/Impl22: CLASS_SIGNATURE, PARENTS + [kotlin.Any, test.Base2] diff --git a/jps-plugin/testData/comparison/classSignatureChange/sealedClassImplRemoved/result.out b/jps-plugin/testData/comparison/classSignatureChange/sealedClassImplRemoved/result.out index 07cefb49155..2fa142e3f9b 100644 --- a/jps-plugin/testData/comparison/classSignatureChange/sealedClassImplRemoved/result.out +++ b/jps-plugin/testData/comparison/classSignatureChange/sealedClassImplRemoved/result.out @@ -4,4 +4,5 @@ CHANGES in test/Base1: CLASS_SIGNATURE PROTO DIFFERENCE in test/Base2: SEALED_SUBCLASS_FQ_NAME_LIST CHANGES in test/Base2: CLASS_SIGNATURE PROTO DIFFERENCE in test/Impl22: SUPERTYPE_LIST -CHANGES in test/Impl22: CLASS_SIGNATURE +CHANGES in test/Impl22: CLASS_SIGNATURE, PARENTS + [kotlin.Any, test.Base2] diff --git a/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAdded/result.out b/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAdded/result.out index c7661b6ed2c..e64c6353c17 100644 --- a/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAdded/result.out +++ b/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAdded/result.out @@ -5,4 +5,5 @@ CHANGES in test/Base1: CLASS_SIGNATURE, MEMBERS PROTO DIFFERENCE in test/Base2: SEALED_SUBCLASS_FQ_NAME_LIST CHANGES in test/Base2: CLASS_SIGNATURE PROTO DIFFERENCE in test/Base2.Nested2: SUPERTYPE_LIST -CHANGES in test/Base2.Nested2: CLASS_SIGNATURE +CHANGES in test/Base2.Nested2: CLASS_SIGNATURE, PARENTS + [kotlin.Any, test.Base2] diff --git a/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep/result.out b/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep/result.out index 3363b854df1..24ddda10d1c 100644 --- a/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep/result.out +++ b/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep/result.out @@ -9,4 +9,5 @@ CHANGES in test/Base2.Nested1: CLASS_SIGNATURE, MEMBERS PROTO DIFFERENCE in test/Base3.Nested1: SEALED_SUBCLASS_FQ_NAME_LIST CHANGES in test/Base3.Nested1: CLASS_SIGNATURE PROTO DIFFERENCE in test/Base3.Nested1.Nested2: SUPERTYPE_LIST -CHANGES in test/Base3.Nested1.Nested2: CLASS_SIGNATURE +CHANGES in test/Base3.Nested1.Nested2: CLASS_SIGNATURE, PARENTS + [kotlin.Any, test.Base3.Nested1] diff --git a/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved/result.out b/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved/result.out index 87fa076f273..c3d77972774 100644 --- a/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved/result.out +++ b/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved/result.out @@ -5,4 +5,5 @@ CHANGES in test/Base1: CLASS_SIGNATURE, MEMBERS PROTO DIFFERENCE in test/Base2: SEALED_SUBCLASS_FQ_NAME_LIST CHANGES in test/Base2: CLASS_SIGNATURE PROTO DIFFERENCE in test/Base2.Nested2: SUPERTYPE_LIST -CHANGES in test/Base2.Nested2: CLASS_SIGNATURE +CHANGES in test/Base2.Nested2: CLASS_SIGNATURE, PARENTS + [kotlin.Any, test.Base2] diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt b/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt index afaffa21b44..d44fbba4050 100644 --- a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt +++ b/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt @@ -7,6 +7,7 @@ kotlin-data-container Module 'module1' production format-version.txt jvm-build-meta-info.txt + class-attributes.tab class-fq-name-to-source.tab internal-name-to-source.tab proto.tab @@ -24,6 +25,7 @@ Module 'module2' tests Module 'module3' production format-version.txt jvm-build-meta-info.txt + class-attributes.tab class-fq-name-to-source.tab internal-name-to-source.tab proto.tab @@ -32,6 +34,7 @@ Module 'module3' tests Module 'module4' production format-version.txt jvm-build-meta-info.txt + class-attributes.tab class-fq-name-to-source.tab internal-name-to-source.tab proto.tab diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt b/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt index f49b588520e..1572f363a50 100644 --- a/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt +++ b/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt @@ -7,6 +7,7 @@ kotlin-data-container Module 'module' production format-version.txt jvm-build-meta-info.txt + class-attributes.tab class-fq-name-to-source.tab internal-name-to-source.tab proto.tab diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt b/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt index b4e54efb164..6ece0df56da 100644 --- a/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt +++ b/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt @@ -7,6 +7,7 @@ kotlin-data-container Module 'module' production format-version.txt jvm-build-meta-info.txt + class-attributes.tab class-fq-name-to-source.tab internal-name-to-source.tab proto.tab diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/A.kt b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/A.kt new file mode 100644 index 00000000000..e41a06d2875 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/A.kt @@ -0,0 +1,3 @@ +package test + +interface A : Base diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/B.kt b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/B.kt new file mode 100644 index 00000000000..324aaa75684 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/B.kt @@ -0,0 +1,3 @@ +package test + +interface B diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/B.kt.new b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/B.kt.new new file mode 100644 index 00000000000..cdc33c843df --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/B.kt.new @@ -0,0 +1,3 @@ +package test + +interface B : Base diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/Base.kt b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/Base.kt new file mode 100644 index 00000000000..4e5675b150a --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/Base.kt @@ -0,0 +1,3 @@ +package test + +sealed interface Base diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/args.txt b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/args.txt new file mode 100644 index 00000000000..56ea44cbedd --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/args.txt @@ -0,0 +1 @@ +-XXLanguage:+FreedomForSealedClasses -XXLanguage:+SealedInterfaces diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/build.log b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/build.log new file mode 100644 index 00000000000..2b7405353a6 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/build.log @@ -0,0 +1,28 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/B.class +End of files +Compiling files: + src/B.kt +End of files +Marked as dirty by Kotlin: + src/A.kt + src/B.kt + src/Base.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/A.class + out/production/module/test/B.class + out/production/module/test/Base.class +End of files +Compiling files: + src/A.kt + src/B.kt + src/Base.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/sealedClassesAddImplements.jsklib.mute b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/sealedClassesAddImplements.jsklib.mute new file mode 100644 index 00000000000..45f4097dd42 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/sealedClassesAddImplements.jsklib.mute @@ -0,0 +1 @@ +IC of sealed interfaces are not supported in JS diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/С.kt b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/С.kt new file mode 100644 index 00000000000..755dfbd73d4 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/С.kt @@ -0,0 +1,3 @@ +package test + +interface С diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/A.kt b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/A.kt new file mode 100644 index 00000000000..e41a06d2875 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/A.kt @@ -0,0 +1,3 @@ +package test + +interface A : Base diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/B.kt b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/B.kt new file mode 100644 index 00000000000..cdc33c843df --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/B.kt @@ -0,0 +1,3 @@ +package test + +interface B : Base diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/Base.kt b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/Base.kt new file mode 100644 index 00000000000..4e5675b150a --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/Base.kt @@ -0,0 +1,3 @@ +package test + +sealed interface Base diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/C.kt.new b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/C.kt.new new file mode 100644 index 00000000000..da276aa99da --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/C.kt.new @@ -0,0 +1,3 @@ +package test + +interface C : Base diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/args.txt b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/args.txt new file mode 100644 index 00000000000..56ea44cbedd --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/args.txt @@ -0,0 +1 @@ +-XXLanguage:+FreedomForSealedClasses -XXLanguage:+SealedInterfaces diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/build.log b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/build.log new file mode 100644 index 00000000000..59554ef9cfa --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/build.log @@ -0,0 +1,27 @@ +================ Step #1 ================= + +Compiling files: + src/C.kt +End of files +Marked as dirty by Kotlin: + src/A.kt + src/B.kt + src/Base.kt + src/C.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/A.class + out/production/module/test/B.class + out/production/module/test/Base.class + out/production/module/test/C.class +End of files +Compiling files: + src/A.kt + src/B.kt + src/Base.kt + src/C.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/sealedClassesAddInheritor.jsklib.mute b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/sealedClassesAddInheritor.jsklib.mute new file mode 100644 index 00000000000..45f4097dd42 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/sealedClassesAddInheritor.jsklib.mute @@ -0,0 +1 @@ +IC of sealed interfaces are not supported in JS diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/A.kt b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/A.kt new file mode 100644 index 00000000000..e41a06d2875 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/A.kt @@ -0,0 +1,3 @@ +package test + +interface A : Base diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/B.kt b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/B.kt new file mode 100644 index 00000000000..cdc33c843df --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/B.kt @@ -0,0 +1,3 @@ +package test + +interface B : Base diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/B.kt.new b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/B.kt.new new file mode 100644 index 00000000000..25bf4d005ba --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/B.kt.new @@ -0,0 +1,4 @@ +package test + +interface B + diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/Base.kt b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/Base.kt new file mode 100644 index 00000000000..4e5675b150a --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/Base.kt @@ -0,0 +1,3 @@ +package test + +sealed interface Base diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/BaseUsage.kt b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/BaseUsage.kt new file mode 100644 index 00000000000..f2533e11978 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/BaseUsage.kt @@ -0,0 +1,5 @@ +package test + +class C { + lateinit var base: Base +} diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/args.txt b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/args.txt new file mode 100644 index 00000000000..56ea44cbedd --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/args.txt @@ -0,0 +1 @@ +-XXLanguage:+FreedomForSealedClasses -XXLanguage:+SealedInterfaces diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/build.log b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/build.log new file mode 100644 index 00000000000..379d4b734e1 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/build.log @@ -0,0 +1,39 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/B.class +End of files +Compiling files: + src/B.kt +End of files +Marked as dirty by Kotlin: + src/A.kt + src/B.kt + src/Base.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/A.class + out/production/module/test/B.class + out/production/module/test/Base.class +End of files +Compiling files: + src/A.kt + src/B.kt + src/Base.kt +End of files +Marked as dirty by Kotlin: + src/BaseUsage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/C.class +End of files +Compiling files: + src/BaseUsage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/sealedClassesRemoveImplements.jsklib.mute b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/sealedClassesRemoveImplements.jsklib.mute new file mode 100644 index 00000000000..45f4097dd42 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/sealedClassesRemoveImplements.jsklib.mute @@ -0,0 +1 @@ +IC of sealed interfaces are not supported in JS diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/A.kt b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/A.kt new file mode 100644 index 00000000000..e41a06d2875 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/A.kt @@ -0,0 +1,3 @@ +package test + +interface A : Base diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/B.kt b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/B.kt new file mode 100644 index 00000000000..cdc33c843df --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/B.kt @@ -0,0 +1,3 @@ +package test + +interface B : Base diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/B.kt.delete b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/B.kt.delete new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/Base.kt b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/Base.kt new file mode 100644 index 00000000000..4e5675b150a --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/Base.kt @@ -0,0 +1,3 @@ +package test + +sealed interface Base diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/BaseUsage.kt b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/BaseUsage.kt new file mode 100644 index 00000000000..f2533e11978 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/BaseUsage.kt @@ -0,0 +1,5 @@ +package test + +class C { + lateinit var base: Base +} diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/args.txt b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/args.txt new file mode 100644 index 00000000000..56ea44cbedd --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/args.txt @@ -0,0 +1 @@ +-XXLanguage:+FreedomForSealedClasses -XXLanguage:+SealedInterfaces diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/build.log b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/build.log new file mode 100644 index 00000000000..cb874b1df7b --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/build.log @@ -0,0 +1,35 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/B.class +End of files +Compiling files: +End of files +Marked as dirty by Kotlin: + src/A.kt + src/Base.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/A.class + out/production/module/test/Base.class +End of files +Compiling files: + src/A.kt + src/Base.kt +End of files +Marked as dirty by Kotlin: + src/BaseUsage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/C.class +End of files +Compiling files: + src/BaseUsage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/sealedClassesRemoveInheritor.jsklib.mute b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/sealedClassesRemoveInheritor.jsklib.mute new file mode 100644 index 00000000000..45f4097dd42 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/sealedClassesRemoveInheritor.jsklib.mute @@ -0,0 +1 @@ +IC of sealed interfaces are not supported in JS diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/A.kt b/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/A.kt new file mode 100644 index 00000000000..e41a06d2875 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/A.kt @@ -0,0 +1,3 @@ +package test + +interface A : Base diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/B.kt b/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/B.kt new file mode 100644 index 00000000000..cdc33c843df --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/B.kt @@ -0,0 +1,3 @@ +package test + +interface B : Base diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/Base.kt b/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/Base.kt new file mode 100644 index 00000000000..4e5675b150a --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/Base.kt @@ -0,0 +1,3 @@ +package test + +sealed interface Base diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/C.kt.new b/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/C.kt.new new file mode 100644 index 00000000000..da276aa99da --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/C.kt.new @@ -0,0 +1,3 @@ +package test + +interface C : Base diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/D.kt b/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/D.kt new file mode 100644 index 00000000000..71237657cd9 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/D.kt @@ -0,0 +1,5 @@ +package test + +class D { + lateinit var x: Base +} diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/E.kt b/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/E.kt new file mode 100644 index 00000000000..7a1c3583390 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/E.kt @@ -0,0 +1,4 @@ +package test + +class E { +} diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/args.txt b/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/args.txt new file mode 100644 index 00000000000..56ea44cbedd --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/args.txt @@ -0,0 +1 @@ +-XXLanguage:+FreedomForSealedClasses -XXLanguage:+SealedInterfaces diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/build.log b/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/build.log new file mode 100644 index 00000000000..d1581952b1f --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/build.log @@ -0,0 +1,38 @@ +================ Step #1 ================= + +Compiling files: + src/C.kt +End of files +Marked as dirty by Kotlin: + src/A.kt + src/B.kt + src/Base.kt + src/C.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/A.class + out/production/module/test/B.class + out/production/module/test/Base.class + out/production/module/test/C.class +End of files +Compiling files: + src/A.kt + src/B.kt + src/Base.kt + src/C.kt +End of files +Marked as dirty by Kotlin: + src/D.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/D.class +End of files +Compiling files: + src/D.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/sealedClassesUseSwitch.jsklib.mute b/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/sealedClassesUseSwitch.jsklib.mute new file mode 100644 index 00000000000..45f4097dd42 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/sealedClassesUseSwitch.jsklib.mute @@ -0,0 +1 @@ +IC of sealed interfaces are not supported in JS