From 32e44dfe914fe0677d362b9c69f5d01b88583bf1 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 20 Jul 2017 11:21:02 +0300 Subject: [PATCH] Fix searching serialized classes package contains multiple fragments Original commit: 1c4ada200856a69f10034c77aefd75358be83009 --- .../kotlin/jps/build/IncrementalJpsTestGenerated.java | 6 ++++++ .../pureKotlin/functionReferencingClass/A.kt | 1 + .../pureKotlin/functionReferencingClass/build.log | 11 +++++++++++ .../pureKotlin/functionReferencingClass/useA.kt | 1 + .../pureKotlin/functionReferencingClass/useA.kt.touch | 0 5 files changed, 19 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/A.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/useA.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/useA.kt.touch diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 6189ddf2a6f..3829cc8aadc 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -467,6 +467,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("functionReferencingClass") + public void testFunctionReferencingClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/"); + doTest(fileName); + } + @TestMetadata("independentClasses") public void testIndependentClasses() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/independentClasses/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/A.kt new file mode 100644 index 00000000000..109bca0ace7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/A.kt @@ -0,0 +1 @@ +class A(val x: Int) \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/build.log new file mode 100644 index 00000000000..33f783959c9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/build.log @@ -0,0 +1,11 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/UseAKt.class +End of files +Compiling files: + src/useA.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/useA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/useA.kt new file mode 100644 index 00000000000..c15c6153a60 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/useA.kt @@ -0,0 +1 @@ +fun useA(a: A) { a.x } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/useA.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/useA.kt.touch new file mode 100644 index 00000000000..e69de29bb2d