From c445089f2107146ee19076967e12dcab5734797d Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 13 May 2015 16:21:13 +0300 Subject: [PATCH] KT-7587 Overloads are not generated during partial compilation of package #KT-7587 fixed Original commit: 0498bd7739a5d26f4738e82652f64ee7025f52dc --- .../jps/build/IncrementalJpsTestGenerated.java | 12 ++++++++++++ .../pureKotlin/optionalParameter/build.log | 7 +++++++ .../pureKotlin/optionalParameter/fun.kt | 6 ++++++ .../pureKotlin/optionalParameter/other.kt | 5 +++++ .../pureKotlin/optionalParameter/other.kt.new | 5 +++++ .../addOptionalParameter/JavaUsage.java | 5 +++++ .../addOptionalParameter/build.log | 18 ++++++++++++++++++ .../addOptionalParameter/fun.kt | 5 +++++ .../addOptionalParameter/fun.kt.new | 6 ++++++ .../addOptionalParameter/other.kt | 5 +++++ 10 files changed, 74 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/fun.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt.new create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/JavaUsage.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt.new create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/other.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 9d89e84f6b2..5b7d3b434ea 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -299,6 +299,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("optionalParameter") + public void testOptionalParameter() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/optionalParameter/"); + doTest(fileName); + } + @TestMetadata("ourClassReferenced") public void testOurClassReferenced() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/"); @@ -552,6 +558,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class KotlinUsedInJava extends AbstractIncrementalJpsTest { + @TestMetadata("addOptionalParameter") + public void testAddOptionalParameter() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/"); + doTest(fileName); + } + public void testAllFilesPresentInKotlinUsedInJava() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava"), Pattern.compile("^([^\\.]+)$"), true); } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log new file mode 100644 index 00000000000..830fd9d2ae7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log @@ -0,0 +1,7 @@ +Cleaning output files: +out/production/module/test/TestPackage$other$*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/other.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/fun.kt new file mode 100644 index 00000000000..1b8d4e731e4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/fun.kt @@ -0,0 +1,6 @@ +package test + +kotlin.jvm.overloads +fun f(a: String, b: Int = 5) { + +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt new file mode 100644 index 00000000000..d2639425252 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt @@ -0,0 +1,5 @@ +package test + +fun other() { + +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt.new new file mode 100644 index 00000000000..d2639425252 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt.new @@ -0,0 +1,5 @@ +package test + +fun other() { + +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/JavaUsage.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/JavaUsage.java new file mode 100644 index 00000000000..da2f9b63512 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/JavaUsage.java @@ -0,0 +1,5 @@ +class JavaUsage { + public static void main(String[] args) { + test.TestPackage.f("x"); + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log new file mode 100644 index 00000000000..2a0d68e2bd0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log @@ -0,0 +1,18 @@ +Cleaning output files: +out/production/module/test/TestPackage$fun$*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/fun.kt +End of files +Cleaning output files: +out/production/module/JavaUsage.class +out/production/module/test/TestPackage$other$*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/other.kt +End of files +Compiling files: +src/JavaUsage.java +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt new file mode 100644 index 00000000000..15105c825ed --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt @@ -0,0 +1,5 @@ +package test + +fun f(a: String) { + +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt.new new file mode 100644 index 00000000000..1b8d4e731e4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt.new @@ -0,0 +1,6 @@ +package test + +kotlin.jvm.overloads +fun f(a: String, b: Int = 5) { + +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/other.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/other.kt new file mode 100644 index 00000000000..d2639425252 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/other.kt @@ -0,0 +1,5 @@ +package test + +fun other() { + +} \ No newline at end of file