From 20622ebe51fccf5b28e3ce1a0383d160bc13de5f Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 11 Jun 2015 18:58:32 +0300 Subject: [PATCH] Allowed accessing private members from same package, but different package fragment instance. Original commit: 0ddfedba498d073ed55db4dfe31354fdac27231e --- .../kotlin/jps/build/IncrementalJpsTestGenerated.java | 6 ++++++ .../incremental/pureKotlin/accessPrivateMembers/bar.kt | 7 +++++++ .../pureKotlin/accessPrivateMembers/bar.kt.new | 7 +++++++ .../pureKotlin/accessPrivateMembers/build.log | 7 +++++++ .../incremental/pureKotlin/accessPrivateMembers/foo.kt | 9 +++++++++ 5 files changed, 36 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/bar.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/bar.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/foo.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 da0f6d5dd2c..27102441062 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 @@ -109,6 +109,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class PureKotlin extends AbstractIncrementalJpsTest { + @TestMetadata("accessPrivateMembers") + public void testAccessPrivateMembers() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/"); + doTest(fileName); + } + @TestMetadata("accessingFunctionsViaPackagePart") public void testAccessingFunctionsViaPackagePart() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/bar.kt b/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/bar.kt new file mode 100644 index 00000000000..8c016666552 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/bar.kt @@ -0,0 +1,7 @@ +package test + +fun main(args: Array) { + val x: Foo = Foo() + foo() + c +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/bar.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/bar.kt.new new file mode 100644 index 00000000000..8c016666552 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/bar.kt.new @@ -0,0 +1,7 @@ +package test + +fun main(args: Array) { + val x: Foo = Foo() + foo() + c +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log new file mode 100644 index 00000000000..6fabb2be215 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log @@ -0,0 +1,7 @@ +Cleaning output files: +out/production/module/test/TestPackage$bar$*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/bar.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/foo.kt b/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/foo.kt new file mode 100644 index 00000000000..5f83a146f9d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/foo.kt @@ -0,0 +1,9 @@ +package test + +private class Foo + +private fun foo() { + +} + +private val c = 1 \ No newline at end of file