From eb1f04c29dacc35c26e5284ef582e24b4419d77d Mon Sep 17 00:00:00 2001
From: Zalim Bashorov <Zalim.Bashorov@jetbrains.com>
Date: Wed, 30 Sep 2015 23:06:16 +0300
Subject: [PATCH] Move visibility check for toplevel private declarations to
 Visibilities.PRIVATE and fix it.

Original commit: a36e4abf4d2ea6cbbf0840ce8d774591c1388c99
---
 .../build/IncrementalJpsTestGenerated.java    |  6 ++++++
 .../topLevelPrivateValUsageAdded/build.log    | 19 +++++++++++++++++++
 .../topLevelPrivateValUsageAdded/foo.kt       |  3 +++
 .../topLevelPrivateValUsageAdded/usage.kt     |  4 ++++
 .../usage.kt.new.1                            |  5 +++++
 .../usage.kt.new.2                            |  4 ++++
 6 files changed, 41 insertions(+)
 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log
 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/foo.kt
 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt
 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt.new.1
 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt.new.2

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 d2f1a958083..53efe232f9d 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
@@ -599,6 +599,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
             doTest(fileName);
         }
 
+        @TestMetadata("topLevelPrivateValUsageAdded")
+        public void testTopLevelPrivateValUsageAdded() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/");
+            doTest(fileName);
+        }
+
         @TestMetadata("traitClassObjectConstantChanged")
         public void testTraitClassObjectConstantChanged() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/");
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log
new file mode 100644
index 00000000000..992db6b386d
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log
@@ -0,0 +1,19 @@
+Cleaning output files:
+out/production/module/META-INF/module.kotlin_module
+out/production/module/test/TestPackage.class
+out/production/module/test/UsageKt.class
+End of files
+Compiling files:
+src/usage.kt
+End of files
+COMPILATION FAILED
+Cannot access 'foo': it is 'private' in file
+
+
+Cleaning output files:
+out/production/module/test/FooKt.class
+End of files
+Compiling files:
+src/foo.kt
+src/usage.kt
+End of files
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/foo.kt b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/foo.kt
new file mode 100644
index 00000000000..5715a620ced
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/foo.kt
@@ -0,0 +1,3 @@
+package test
+
+private fun foo() = 1
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt
new file mode 100644
index 00000000000..6bdc11105c7
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt
@@ -0,0 +1,4 @@
+package test
+
+fun usage() {
+}
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt.new.1
new file mode 100644
index 00000000000..e62a20dd934
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt.new.1
@@ -0,0 +1,5 @@
+package test
+
+fun usage() {
+    println(foo())
+}
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt.new.2
new file mode 100644
index 00000000000..6bdc11105c7
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt.new.2
@@ -0,0 +1,4 @@
+package test
+
+fun usage() {
+}