diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index d712367a8f0..cf616f82111 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -287,9 +287,57 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } - @TestMetadata("defaultArguments") - public void testDefaultArguments() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultArguments/"); + @TestMetadata("defaultArgumentInConstructorAdded") + public void testDefaultArgumentInConstructorAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/"); + doTest(fileName); + } + + @TestMetadata("defaultArgumentInConstructorRemoved") + public void testDefaultArgumentInConstructorRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/"); + doTest(fileName); + } + + @TestMetadata("defaultValueAdded") + public void testDefaultValueAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/"); + doTest(fileName); + } + + @TestMetadata("defaultValueChanged") + public void testDefaultValueChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/"); + doTest(fileName); + } + + @TestMetadata("defaultValueInConstructorAdded") + public void testDefaultValueInConstructorAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/"); + doTest(fileName); + } + + @TestMetadata("defaultValueInConstructorChanged") + public void testDefaultValueInConstructorChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/"); + doTest(fileName); + } + + @TestMetadata("defaultValueInConstructorRemoved") + public void testDefaultValueInConstructorRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/"); + doTest(fileName); + } + + @TestMetadata("defaultValueRemoved1") + public void testDefaultValueRemoved1() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/"); + doTest(fileName); + } + + @TestMetadata("defaultValueRemoved2") + public void testDefaultValueRemoved2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/"); doTest(fileName); } @@ -1231,6 +1279,18 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("multiModuleDefaultArgumentInConstructorRemoved") + public void testMultiModuleDefaultArgumentInConstructorRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/"); + doTest(fileName); + } + + @TestMetadata("multiModuleDefaultValueInConstructorRemoved") + public void testMultiModuleDefaultValueInConstructorRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/"); + doTest(fileName); + } + @TestMetadata("multiModuleExported") public void testMultiModuleExported() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/"); diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 4147bcbd732..cefa62c3483 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -287,9 +287,57 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - @TestMetadata("defaultArguments") - public void testDefaultArguments() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultArguments/"); + @TestMetadata("defaultArgumentInConstructorAdded") + public void testDefaultArgumentInConstructorAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/"); + doTest(fileName); + } + + @TestMetadata("defaultArgumentInConstructorRemoved") + public void testDefaultArgumentInConstructorRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/"); + doTest(fileName); + } + + @TestMetadata("defaultValueAdded") + public void testDefaultValueAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/"); + doTest(fileName); + } + + @TestMetadata("defaultValueChanged") + public void testDefaultValueChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/"); + doTest(fileName); + } + + @TestMetadata("defaultValueInConstructorAdded") + public void testDefaultValueInConstructorAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/"); + doTest(fileName); + } + + @TestMetadata("defaultValueInConstructorChanged") + public void testDefaultValueInConstructorChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/"); + doTest(fileName); + } + + @TestMetadata("defaultValueInConstructorRemoved") + public void testDefaultValueInConstructorRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/"); + doTest(fileName); + } + + @TestMetadata("defaultValueRemoved1") + public void testDefaultValueRemoved1() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/"); + doTest(fileName); + } + + @TestMetadata("defaultValueRemoved2") + public void testDefaultValueRemoved2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/"); doTest(fileName); } diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java b/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java index 8cd04959b04..32bbb470923 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java @@ -159,6 +159,12 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { doTest(fileName); } + @TestMetadata("defaultValues") + public void testDefaultValues() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/"); + doTest(fileName); + } + @TestMetadata("membersFlagsChanged") public void testMembersFlagsChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/"); @@ -181,6 +187,12 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers"), Pattern.compile("^([^\\.]+)$"), true); } + @TestMetadata("defaultValues") + public void testDefaultValues() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/packageMembers/defaultValues/"); + doTest(fileName); + } + @TestMetadata("membersFlagsChanged") public void testMembersFlagsChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/"); diff --git a/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/new.kt b/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/new.kt new file mode 100644 index 00000000000..b8fdf2c6d41 --- /dev/null +++ b/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/new.kt @@ -0,0 +1,17 @@ +package test + +class A { + fun argumentAdded(x: Int = 1) {} + fun argumentRemoved() {} + + fun valueAdded(x: Int = 3) {} + fun valueRemoved(x: Int) {} + fun valueChanged(x: Int = 6) {} +} + +class ConstructorValueAdded(x: Int = 7) +class ConstructorValueRemoved(x: Int) +class ConstructorValueChanged(x: Int = 20) + +class ConstructorArgumentAdded(x: Int = 9) +class ConstructorArgumentRemoved() \ No newline at end of file diff --git a/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/old.kt b/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/old.kt new file mode 100644 index 00000000000..e4bca5f4515 --- /dev/null +++ b/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/old.kt @@ -0,0 +1,17 @@ +package test + +class A { + fun argumentAdded() {} + fun argumentRemoved(x: Int = 2) {} + + fun valueAdded(x: Int) {} + fun valueRemoved(x: Int = 4) {} + fun valueChanged(x: Int = 5) {} +} + +class ConstructorValueAdded(x: Int) +class ConstructorValueRemoved(x: Int = 8) +class ConstructorValueChanged(x: Int = 19) + +class ConstructorArgumentAdded() +class ConstructorArgumentRemoved(x: Int = 10) \ No newline at end of file diff --git a/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/result.out b/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/result.out new file mode 100644 index 00000000000..38bb7923619 --- /dev/null +++ b/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/result.out @@ -0,0 +1,7 @@ +changes in test/A: MEMBERS + [argumentAdded, argumentRemoved, valueAdded, valueRemoved] +changes in test/ConstructorArgumentAdded: CLASS_SIGNATURE +changes in test/ConstructorArgumentRemoved: CLASS_SIGNATURE +changes in test/ConstructorValueAdded: CLASS_SIGNATURE +changes in test/ConstructorValueChanged: NONE +changes in test/ConstructorValueRemoved: CLASS_SIGNATURE diff --git a/jps-plugin/testData/comparison/packageMembers/defaultValues/new.kt b/jps-plugin/testData/comparison/packageMembers/defaultValues/new.kt new file mode 100644 index 00000000000..928941e3ec0 --- /dev/null +++ b/jps-plugin/testData/comparison/packageMembers/defaultValues/new.kt @@ -0,0 +1,8 @@ +package test + +fun argumentAdded(x: Int = 1) {} +fun argumentRemoved() {} + +fun valueAdded(x: Int = 3) {} +fun valueRemoved(x: Int) {} +fun valueChanged(x: Int = 6) {} \ No newline at end of file diff --git a/jps-plugin/testData/comparison/packageMembers/defaultValues/old.kt b/jps-plugin/testData/comparison/packageMembers/defaultValues/old.kt new file mode 100644 index 00000000000..5b95a0ab6a0 --- /dev/null +++ b/jps-plugin/testData/comparison/packageMembers/defaultValues/old.kt @@ -0,0 +1,8 @@ +package test + +fun argumentAdded() {} +fun argumentRemoved(x: Int = 2) {} + +fun valueAdded(x: Int) {} +fun valueRemoved(x: Int = 4) {} +fun valueChanged(x: Int = 5) {} \ No newline at end of file diff --git a/jps-plugin/testData/comparison/packageMembers/defaultValues/result.out b/jps-plugin/testData/comparison/packageMembers/defaultValues/result.out new file mode 100644 index 00000000000..3c50291bd28 --- /dev/null +++ b/jps-plugin/testData/comparison/packageMembers/defaultValues/result.out @@ -0,0 +1,2 @@ +changes in test/MainKt: MEMBERS + [argumentAdded, argumentRemoved, valueAdded, valueRemoved] diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/build.log new file mode 100644 index 00000000000..a5bdbe5bd98 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/build.log @@ -0,0 +1,38 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module1/foo/A.class +End of files +Compiling files: + module1/src/module1_A.kt +End of files +Marked as dirty by Kotlin: + module2/src/module2_createADefault.kt + module2/src/module2_createANonDefault.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/foo/Module2_createADefaultKt.class + out/production/module2/foo/Module2_createANonDefaultKt.class +End of files +Compiling files: + module2/src/module2_createADefault.kt + module2/src/module2_createANonDefault.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Too many arguments for public constructor A() defined in foo.A + +================ Step #2 ================= + +Exit code: NOTHING_DONE +------------------------------------------ +Compiling files: + module2/src/module2_createADefault.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/dependencies.txt b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/dependencies.txt new file mode 100644 index 00000000000..ec937d3cdd9 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/dependencies.txt @@ -0,0 +1,2 @@ +module1-> +module2->module1 \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module1_A.kt b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module1_A.kt new file mode 100644 index 00000000000..532efaa3af5 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module1_A.kt @@ -0,0 +1,3 @@ +package foo + +class A(x: Int = 10) \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module1_A.kt.new.1 b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module1_A.kt.new.1 new file mode 100644 index 00000000000..a772984c7e9 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module1_A.kt.new.1 @@ -0,0 +1,3 @@ +package foo + +class A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module2_createADefault.kt b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module2_createADefault.kt new file mode 100644 index 00000000000..0dd71808c10 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module2_createADefault.kt @@ -0,0 +1,5 @@ +package foo + +fun createADefault() { + A() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module2_createANonDefault.kt b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module2_createANonDefault.kt new file mode 100644 index 00000000000..592d4e7aea8 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module2_createANonDefault.kt @@ -0,0 +1,5 @@ +package foo + +fun createANonDefault() { + A(20) +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArguments/a.kt.touch b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module2_createANonDefault.kt.delete.2 similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/defaultArguments/a.kt.touch rename to jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module2_createANonDefault.kt.delete.2 diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/build.log new file mode 100644 index 00000000000..fd6e6c52645 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/build.log @@ -0,0 +1,38 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module1/foo/A.class +End of files +Compiling files: + module1/src/module1_A.kt +End of files +Marked as dirty by Kotlin: + module2/src/module2_createADefault.kt + module2/src/module2_createANonDefault.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/foo/Module2_createADefaultKt.class + out/production/module2/foo/Module2_createANonDefaultKt.class +End of files +Compiling files: + module2/src/module2_createADefault.kt + module2/src/module2_createANonDefault.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +No value passed for parameter x + +================ Step #2 ================= + +Exit code: NOTHING_DONE +------------------------------------------ +Compiling files: + module2/src/module2_createANonDefault.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/dependencies.txt b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/dependencies.txt new file mode 100644 index 00000000000..ec937d3cdd9 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/dependencies.txt @@ -0,0 +1,2 @@ +module1-> +module2->module1 \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module1_A.kt b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module1_A.kt new file mode 100644 index 00000000000..532efaa3af5 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module1_A.kt @@ -0,0 +1,3 @@ +package foo + +class A(x: Int = 10) \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module1_A.kt.new.1 b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module1_A.kt.new.1 new file mode 100644 index 00000000000..af03c523fef --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module1_A.kt.new.1 @@ -0,0 +1,3 @@ +package foo + +class A(x: Int) \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module2_createADefault.kt b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module2_createADefault.kt new file mode 100644 index 00000000000..0dd71808c10 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module2_createADefault.kt @@ -0,0 +1,5 @@ +package foo + +fun createADefault() { + A() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module2_createADefault.kt.delete.2 b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module2_createADefault.kt.delete.2 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module2_createANonDefault.kt b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module2_createANonDefault.kt new file mode 100644 index 00000000000..592d4e7aea8 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module2_createANonDefault.kt @@ -0,0 +1,5 @@ +package foo + +fun createANonDefault() { + A(20) +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/A.kt b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/A.kt new file mode 100644 index 00000000000..21a27277384 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/A.kt @@ -0,0 +1,3 @@ +package foo + +open class A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/A.kt.new.1 b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/A.kt.new.1 new file mode 100644 index 00000000000..e55b1518b83 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/A.kt.new.1 @@ -0,0 +1,3 @@ +package foo + +open class A(x: Int = 10) \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/B.kt b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/B.kt new file mode 100644 index 00000000000..eabe4db6463 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/B.kt @@ -0,0 +1,3 @@ +package foo + +open class B() : A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/C.kt b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/C.kt new file mode 100644 index 00000000000..1cf6ddc7b3b --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/C.kt @@ -0,0 +1,3 @@ +package foo + +class C : B() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/build.log b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/build.log new file mode 100644 index 00000000000..f0bdbb8c6f7 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/build.log @@ -0,0 +1,29 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/B.class + out/production/module/foo/C.class + out/production/module/foo/CreateAKt.class + out/production/module/foo/CreateBKt.class + out/production/module/foo/UseAKt.class + out/production/module/foo/UseBKt.class +End of files +Compiling files: + src/B.kt + src/C.kt + src/createA.kt + src/createB.kt + src/useA.kt + src/useB.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/createA.kt b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/createA.kt new file mode 100644 index 00000000000..0dd71808c10 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/createA.kt @@ -0,0 +1,5 @@ +package foo + +fun createADefault() { + A() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/createB.kt b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/createB.kt new file mode 100644 index 00000000000..b563c089603 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/createB.kt @@ -0,0 +1,5 @@ +package foo + +fun createB() { + B() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/experimental-ic-build.log new file mode 100644 index 00000000000..ed5652a5e41 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/experimental-ic-build.log @@ -0,0 +1,27 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt +End of files +Marked as dirty by Kotlin: + src/B.kt + src/createA.kt + src/useA.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/B.class + out/production/module/foo/CreateAKt.class + out/production/module/foo/UseAKt.class +End of files +Compiling files: + src/B.kt + src/createA.kt + src/useA.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/useA.kt b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/useA.kt new file mode 100644 index 00000000000..b156f1532ae --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/useA.kt @@ -0,0 +1,3 @@ +package foo + +fun useA(a: A) {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/useB.kt b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/useB.kt new file mode 100644 index 00000000000..3b441f0463c --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/useB.kt @@ -0,0 +1,3 @@ +package foo + +fun useB(b: B) {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/A.kt b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/A.kt new file mode 100644 index 00000000000..e55b1518b83 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/A.kt @@ -0,0 +1,3 @@ +package foo + +open class A(x: Int = 10) \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/A.kt.new.1 b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/A.kt.new.1 new file mode 100644 index 00000000000..21a27277384 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/A.kt.new.1 @@ -0,0 +1,3 @@ +package foo + +open class A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/B.kt b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/B.kt new file mode 100644 index 00000000000..eabe4db6463 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/B.kt @@ -0,0 +1,3 @@ +package foo + +open class B() : A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/C.kt b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/C.kt new file mode 100644 index 00000000000..1cf6ddc7b3b --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/C.kt @@ -0,0 +1,3 @@ +package foo + +class C : B() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/build.log new file mode 100644 index 00000000000..430625ca53d --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/build.log @@ -0,0 +1,50 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/B.class + out/production/module/foo/C.class + out/production/module/foo/CreateADefaultKt.class + out/production/module/foo/CreateANonDefaultKt.class + out/production/module/foo/CreateBKt.class + out/production/module/foo/UseAKt.class + out/production/module/foo/UseBKt.class +End of files +Compiling files: + src/B.kt + src/C.kt + src/createADefault.kt + src/createANonDefault.kt + src/createB.kt + src/useA.kt + src/useB.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Too many arguments for public constructor A() defined in foo.A + +================ Step #2 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt + src/B.kt + src/C.kt + src/createADefault.kt + src/createB.kt + src/useA.kt + src/useB.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createADefault.kt b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createADefault.kt new file mode 100644 index 00000000000..0dd71808c10 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createADefault.kt @@ -0,0 +1,5 @@ +package foo + +fun createADefault() { + A() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createANonDefault.kt b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createANonDefault.kt new file mode 100644 index 00000000000..30f71d1945d --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createANonDefault.kt @@ -0,0 +1,5 @@ +package foo + +fun createANonDefault() { + A(10) +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createANonDefault.kt.delete.2 b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createANonDefault.kt.delete.2 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createB.kt b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createB.kt new file mode 100644 index 00000000000..b563c089603 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createB.kt @@ -0,0 +1,5 @@ +package foo + +fun createB() { + B() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/experimental-ic-build.log new file mode 100644 index 00000000000..0ee15e9f36d --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/experimental-ic-build.log @@ -0,0 +1,46 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt +End of files +Marked as dirty by Kotlin: + src/B.kt + src/createADefault.kt + src/createANonDefault.kt + src/useA.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/B.class + out/production/module/foo/CreateADefaultKt.class + out/production/module/foo/CreateANonDefaultKt.class + out/production/module/foo/UseAKt.class +End of files +Compiling files: + src/B.kt + src/createADefault.kt + src/createANonDefault.kt + src/useA.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Too many arguments for public constructor A() defined in foo.A + +================ Step #2 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt + src/B.kt + src/createADefault.kt + src/useA.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/useA.kt b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/useA.kt new file mode 100644 index 00000000000..b156f1532ae --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/useA.kt @@ -0,0 +1,3 @@ +package foo + +fun useA(a: A) {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/useB.kt b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/useB.kt new file mode 100644 index 00000000000..3b441f0463c --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/useB.kt @@ -0,0 +1,3 @@ +package foo + +fun useB(b: B) {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArguments/a.kt b/jps-plugin/testData/incremental/pureKotlin/defaultArguments/a.kt deleted file mode 100644 index 1609642a906..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/defaultArguments/a.kt +++ /dev/null @@ -1,3 +0,0 @@ -fun a(p1: String, p2: String? = null) { - -} diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArguments/b.kt b/jps-plugin/testData/incremental/pureKotlin/defaultArguments/b.kt deleted file mode 100644 index 21bf9e204ba..00000000000 --- a/jps-plugin/testData/incremental/pureKotlin/defaultArguments/b.kt +++ /dev/null @@ -1,3 +0,0 @@ -fun b(p1: String, p2: String? = null) { - -} diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/build.log b/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/build.log new file mode 100644 index 00000000000..e5448796571 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/build.log @@ -0,0 +1,24 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/FunKt.class +End of files +Compiling files: + src/fun.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/other/OtherKt.class + out/production/module/test/UseDefaultKt.class + out/production/module/test/UseNonDefaultKt.class +End of files +Compiling files: + src/other.kt + src/useDefault.kt + src/useNonDefault.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/experimental-ic-build.log new file mode 100644 index 00000000000..9c5c62e65b4 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/experimental-ic-build.log @@ -0,0 +1,25 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/FunKt.class +End of files +Compiling files: + src/fun.kt +End of files +Marked as dirty by Kotlin: + src/useDefault.kt + src/useNonDefault.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/UseDefaultKt.class + out/production/module/test/UseNonDefaultKt.class +End of files +Compiling files: + src/useDefault.kt + src/useNonDefault.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/fun.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/fun.kt new file mode 100644 index 00000000000..1f588b0f8c3 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/fun.kt @@ -0,0 +1,9 @@ +package test + +fun f(x: Any) { + println("f(x: Any)") +} + +fun f(x: Int, y: Int) { + println("f(x=$x, y=$y)") +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/fun.kt.new.1 b/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/fun.kt.new.1 new file mode 100644 index 00000000000..e77870d39b3 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/fun.kt.new.1 @@ -0,0 +1,9 @@ +package test + +fun f(x: Any) { + println("f(x: Any)") +} + +fun f(x: Int, y: Int = 2) { + println("f(x=$x, y=$y)") +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/other.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/other.kt new file mode 100644 index 00000000000..567945cc9b5 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/other.kt @@ -0,0 +1,3 @@ +package other + +fun other() {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/useDefault.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/useDefault.kt new file mode 100644 index 00000000000..73e68e1b5e9 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/useDefault.kt @@ -0,0 +1,5 @@ +package test + +fun useDefault1() { + f(10) +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/useNonDefault.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/useNonDefault.kt new file mode 100644 index 00000000000..26114226465 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/useNonDefault.kt @@ -0,0 +1,5 @@ +package test + +fun useNonDefault() { + f(10, 20) +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log b/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/build.log similarity index 65% rename from jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log rename to jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/build.log index 7ff4e7fca9b..425c4a969b0 100644 --- a/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/build.log @@ -1,11 +1,11 @@ ================ Step #1 ================= Cleaning output files: - out/production/module/AKt.class out/production/module/META-INF/module.kotlin_module + out/production/module/foo/FunKt.class End of files Compiling files: - src/a.kt + src/fun.kt End of files Exit code: OK ------------------------------------------- +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/fun.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/fun.kt new file mode 100644 index 00000000000..edc19c98005 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/fun.kt @@ -0,0 +1,3 @@ +package foo + +fun f(x: Int = 10) {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/fun.kt.new b/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/fun.kt.new new file mode 100644 index 00000000000..4a286548bb2 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/fun.kt.new @@ -0,0 +1,3 @@ +package foo + +fun f(x: Int = 20) {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/useDefault.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/useDefault.kt new file mode 100644 index 00000000000..32cc748fe73 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/useDefault.kt @@ -0,0 +1,5 @@ +package foo + +fun useDefault() { + f() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/useNonDefault.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/useNonDefault.kt new file mode 100644 index 00000000000..a6201ac0864 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/useNonDefault.kt @@ -0,0 +1,5 @@ +package foo + +fun useNonDefault() { + f(15) +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/A.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/A.kt new file mode 100644 index 00000000000..1aa0cb739a3 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/A.kt @@ -0,0 +1,8 @@ +package foo + +open class A(x: Int) + +// The use of annotation here is intentional, so no change for "fun A" is detected, +// but after adding default value to A constructor, we want to force resolve to the constructor +@Deprecated("Warning", level = DeprecationLevel.WARNING) +fun A() = A(30) \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/A.kt.new.1 b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/A.kt.new.1 new file mode 100644 index 00000000000..9c989355cd0 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/A.kt.new.1 @@ -0,0 +1,8 @@ +package foo + +open class A(x: Int = 10) + +// The use of annotation here is intentional, so no change for "fun A" is detected, +// but after adding default value to A constructor, we want to force resolve to the constructor +@Deprecated("Hidden", level = DeprecationLevel.HIDDEN) +fun A() = A(30) \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/B.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/B.kt new file mode 100644 index 00000000000..a0a7d08e730 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/B.kt @@ -0,0 +1,3 @@ +package foo + +open class B() : A(20) \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/C.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/C.kt new file mode 100644 index 00000000000..1cf6ddc7b3b --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/C.kt @@ -0,0 +1,3 @@ +package foo + +class C : B() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/build.log b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/build.log new file mode 100644 index 00000000000..eb037521ebe --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/build.log @@ -0,0 +1,33 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/A.class + out/production/module/foo/AKt.class +End of files +Compiling files: + src/A.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/B.class + out/production/module/foo/C.class + out/production/module/foo/CreateADefaultKt.class + out/production/module/foo/CreateANonDefaultKt.class + out/production/module/foo/CreateBKt.class + out/production/module/foo/UseAKt.class + out/production/module/foo/UseBKt.class +End of files +Compiling files: + src/B.kt + src/C.kt + src/createADefault.kt + src/createANonDefault.kt + src/createB.kt + src/useA.kt + src/useB.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/createADefault.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/createADefault.kt new file mode 100644 index 00000000000..0dd71808c10 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/createADefault.kt @@ -0,0 +1,5 @@ +package foo + +fun createADefault() { + A() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/createANonDefault.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/createANonDefault.kt new file mode 100644 index 00000000000..e8df2c0192d --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/createANonDefault.kt @@ -0,0 +1,5 @@ +package foo + +fun createANonDefault() { + A(15) +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/createB.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/createB.kt new file mode 100644 index 00000000000..b563c089603 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/createB.kt @@ -0,0 +1,5 @@ +package foo + +fun createB() { + B() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/experimental-ic-build.log new file mode 100644 index 00000000000..ffa764fb740 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/experimental-ic-build.log @@ -0,0 +1,32 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/A.class + out/production/module/foo/AKt.class +End of files +Compiling files: + src/A.kt +End of files +Marked as dirty by Kotlin: + src/B.kt + src/createADefault.kt + src/createANonDefault.kt + src/useA.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/B.class + out/production/module/foo/CreateADefaultKt.class + out/production/module/foo/CreateANonDefaultKt.class + out/production/module/foo/UseAKt.class +End of files +Compiling files: + src/B.kt + src/createADefault.kt + src/createANonDefault.kt + src/useA.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/useA.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/useA.kt new file mode 100644 index 00000000000..b156f1532ae --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/useA.kt @@ -0,0 +1,3 @@ +package foo + +fun useA(a: A) {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/useB.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/useB.kt new file mode 100644 index 00000000000..3b441f0463c --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/useB.kt @@ -0,0 +1,3 @@ +package foo + +fun useB(b: B) {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/A.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/A.kt new file mode 100644 index 00000000000..e55b1518b83 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/A.kt @@ -0,0 +1,3 @@ +package foo + +open class A(x: Int = 10) \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/A.kt.new.1 b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/A.kt.new.1 new file mode 100644 index 00000000000..595bfd1ae98 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/A.kt.new.1 @@ -0,0 +1,3 @@ +package foo + +open class A(x: Int = 11) \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/B.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/B.kt new file mode 100644 index 00000000000..a0a7d08e730 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/B.kt @@ -0,0 +1,3 @@ +package foo + +open class B() : A(20) \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/C.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/C.kt new file mode 100644 index 00000000000..1cf6ddc7b3b --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/C.kt @@ -0,0 +1,3 @@ +package foo + +class C : B() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/build.log new file mode 100644 index 00000000000..0859bcf46fd --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/build.log @@ -0,0 +1,10 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createADefault.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createADefault.kt new file mode 100644 index 00000000000..0dd71808c10 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createADefault.kt @@ -0,0 +1,5 @@ +package foo + +fun createADefault() { + A() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createANonDefault.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createANonDefault.kt new file mode 100644 index 00000000000..e8df2c0192d --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createANonDefault.kt @@ -0,0 +1,5 @@ +package foo + +fun createANonDefault() { + A(15) +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createB.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createB.kt new file mode 100644 index 00000000000..b563c089603 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createB.kt @@ -0,0 +1,5 @@ +package foo + +fun createB() { + B() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/useA.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/useA.kt new file mode 100644 index 00000000000..b156f1532ae --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/useA.kt @@ -0,0 +1,3 @@ +package foo + +fun useA(a: A) {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/useB.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/useB.kt new file mode 100644 index 00000000000..3b441f0463c --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/useB.kt @@ -0,0 +1,3 @@ +package foo + +fun useB(b: B) {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/A.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/A.kt new file mode 100644 index 00000000000..e55b1518b83 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/A.kt @@ -0,0 +1,3 @@ +package foo + +open class A(x: Int = 10) \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/A.kt.new.1 b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/A.kt.new.1 new file mode 100644 index 00000000000..f9474759c7d --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/A.kt.new.1 @@ -0,0 +1,3 @@ +package foo + +open class A(x: Int) \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/B.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/B.kt new file mode 100644 index 00000000000..eabe4db6463 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/B.kt @@ -0,0 +1,3 @@ +package foo + +open class B() : A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/C.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/C.kt new file mode 100644 index 00000000000..1cf6ddc7b3b --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/C.kt @@ -0,0 +1,3 @@ +package foo + +class C : B() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/build.log new file mode 100644 index 00000000000..b84f9294680 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/build.log @@ -0,0 +1,52 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/B.class + out/production/module/foo/C.class + out/production/module/foo/CreateADefaultKt.class + out/production/module/foo/CreateANonDefaultKt.class + out/production/module/foo/CreateBKt.class + out/production/module/foo/UseAKt.class + out/production/module/foo/UseBKt.class +End of files +Compiling files: + src/B.kt + src/C.kt + src/createADefault.kt + src/createANonDefault.kt + src/createB.kt + src/useA.kt + src/useB.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +No value passed for parameter x +No value passed for parameter x + +================ Step #2 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt + src/B.kt + src/C.kt + src/createADefault.kt + src/createANonDefault.kt + src/createB.kt + src/useA.kt + src/useB.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createADefault.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createADefault.kt new file mode 100644 index 00000000000..0dd71808c10 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createADefault.kt @@ -0,0 +1,5 @@ +package foo + +fun createADefault() { + A() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createANonDefault.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createANonDefault.kt new file mode 100644 index 00000000000..30f71d1945d --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createANonDefault.kt @@ -0,0 +1,5 @@ +package foo + +fun createANonDefault() { + A(10) +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createB.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createB.kt new file mode 100644 index 00000000000..b563c089603 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createB.kt @@ -0,0 +1,5 @@ +package foo + +fun createB() { + B() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/experimental-ic-build.log new file mode 100644 index 00000000000..d3de59c7890 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/experimental-ic-build.log @@ -0,0 +1,48 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt +End of files +Marked as dirty by Kotlin: + src/B.kt + src/createADefault.kt + src/createANonDefault.kt + src/useA.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/B.class + out/production/module/foo/CreateADefaultKt.class + out/production/module/foo/CreateANonDefaultKt.class + out/production/module/foo/UseAKt.class +End of files +Compiling files: + src/B.kt + src/createADefault.kt + src/createANonDefault.kt + src/useA.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +No value passed for parameter x +No value passed for parameter x + +================ Step #2 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt + src/B.kt + src/createADefault.kt + src/createANonDefault.kt + src/useA.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/useA.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/useA.kt new file mode 100644 index 00000000000..b156f1532ae --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/useA.kt @@ -0,0 +1,3 @@ +package foo + +fun useA(a: A) {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/useB.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/useB.kt new file mode 100644 index 00000000000..3b441f0463c --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/useB.kt @@ -0,0 +1,3 @@ +package foo + +fun useB(b: B) {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/build.log b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/build.log new file mode 100644 index 00000000000..78a09c5c2cc --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/build.log @@ -0,0 +1,40 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/FunKt.class +End of files +Compiling files: + src/fun.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/other/OtherKt.class + out/production/module/test/UseDefaultKt.class + out/production/module/test/UseNonDefaultKt.class +End of files +Compiling files: + src/other.kt + src/useDefault.kt + src/useNonDefault.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +No value passed for parameter x + +================ Step #2 ================= + +Cleaning output files: + out/production/module/test/FunKt.class +End of files +Compiling files: + src/fun.kt + src/other.kt + src/useDefault.kt + src/useNonDefault.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/experimental-ic-build.log new file mode 100644 index 00000000000..16333b1de00 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/experimental-ic-build.log @@ -0,0 +1,40 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/FunKt.class +End of files +Compiling files: + src/fun.kt +End of files +Marked as dirty by Kotlin: + src/useDefault.kt + src/useNonDefault.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/UseDefaultKt.class + out/production/module/test/UseNonDefaultKt.class +End of files +Compiling files: + src/useDefault.kt + src/useNonDefault.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +No value passed for parameter x + +================ Step #2 ================= + +Cleaning output files: + out/production/module/test/FunKt.class +End of files +Compiling files: + src/fun.kt + src/useDefault.kt + src/useNonDefault.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/fun.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/fun.kt new file mode 100644 index 00000000000..1ca7cdfff4d --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/fun.kt @@ -0,0 +1,5 @@ +package test + +fun f(x: Int = 1) { + println(x) +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/fun.kt.new.1 b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/fun.kt.new.1 new file mode 100644 index 00000000000..93139f5a688 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/fun.kt.new.1 @@ -0,0 +1,5 @@ +package test + +fun f(x: Int) { + println(x) +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/other.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/other.kt new file mode 100644 index 00000000000..567945cc9b5 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/other.kt @@ -0,0 +1,3 @@ +package other + +fun other() {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useDefault.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useDefault.kt new file mode 100644 index 00000000000..ebf29c4495a --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useDefault.kt @@ -0,0 +1,5 @@ +package test + +fun useDefault() { + f() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useDefault.kt.new.2 b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useDefault.kt.new.2 new file mode 100644 index 00000000000..6b03cc95a85 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useDefault.kt.new.2 @@ -0,0 +1,5 @@ +package test + +fun useDefault() { + f(5) +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useNonDefault.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useNonDefault.kt new file mode 100644 index 00000000000..0d213872ad1 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useNonDefault.kt @@ -0,0 +1,5 @@ +package test + +fun useNonDefault() { + f(10) +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/build.log b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/build.log new file mode 100644 index 00000000000..9fa0f2e459e --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/build.log @@ -0,0 +1,44 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/FunKt.class +End of files +Compiling files: + src/fun.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/other/OtherKt.class + out/production/module/test/UseDefault1Kt.class + out/production/module/test/UseDefault2Kt.class + out/production/module/test/UseNonDefaultKt.class +End of files +Compiling files: + src/other.kt + src/useDefault1.kt + src/useDefault2.kt + src/useNonDefault.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +No value passed for parameter y +No value passed for parameter y + +================ Step #2 ================= + +Cleaning output files: + out/production/module/test/FunKt.class +End of files +Compiling files: + src/fun.kt + src/other.kt + src/useDefault1.kt + src/useDefault2.kt + src/useNonDefault.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/experimental-ic-build.log new file mode 100644 index 00000000000..e4c98e81655 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/experimental-ic-build.log @@ -0,0 +1,45 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/FunKt.class +End of files +Compiling files: + src/fun.kt +End of files +Marked as dirty by Kotlin: + src/useDefault1.kt + src/useDefault2.kt + src/useNonDefault.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/UseDefault1Kt.class + out/production/module/test/UseDefault2Kt.class + out/production/module/test/UseNonDefaultKt.class +End of files +Compiling files: + src/useDefault1.kt + src/useDefault2.kt + src/useNonDefault.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +No value passed for parameter y +No value passed for parameter y + +================ Step #2 ================= + +Cleaning output files: + out/production/module/test/FunKt.class +End of files +Compiling files: + src/fun.kt + src/useDefault1.kt + src/useDefault2.kt + src/useNonDefault.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/fun.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/fun.kt new file mode 100644 index 00000000000..3a7664d6786 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/fun.kt @@ -0,0 +1,5 @@ +package test + +fun f(x: Int = 1, y: Int = 2) { + println("f(x=$x, y=$y)") +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/fun.kt.new.1 b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/fun.kt.new.1 new file mode 100644 index 00000000000..75d53a41009 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/fun.kt.new.1 @@ -0,0 +1,5 @@ +package test + +fun f(x: Int = 1, y: Int) { + println("f(x=$x, y=$y)") +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/other.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/other.kt new file mode 100644 index 00000000000..567945cc9b5 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/other.kt @@ -0,0 +1,3 @@ +package other + +fun other() {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault1.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault1.kt new file mode 100644 index 00000000000..276164b5715 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault1.kt @@ -0,0 +1,5 @@ +package test + +fun useDefault1() { + f() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault1.kt.new.2 b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault1.kt.new.2 new file mode 100644 index 00000000000..4c4f45e0bf7 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault1.kt.new.2 @@ -0,0 +1,5 @@ +package test + +fun useDefault1() { + f(y=6) +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault2.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault2.kt new file mode 100644 index 00000000000..85d2ec30364 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault2.kt @@ -0,0 +1,5 @@ +package test + +fun useDefault2() { + f(5) +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault2.kt.new.2 b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault2.kt.new.2 new file mode 100644 index 00000000000..a551748a2d3 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault2.kt.new.2 @@ -0,0 +1,5 @@ +package test + +fun useDefault2() { + f(5, 6) +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useNonDefault.kt b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useNonDefault.kt new file mode 100644 index 00000000000..26114226465 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useNonDefault.kt @@ -0,0 +1,5 @@ +package test + +fun useNonDefault() { + f(10, 20) +} \ No newline at end of file