From ce22d1cf9b9bb288dc5cf6ec5408e3d5e9aff738 Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Tue, 18 Apr 2017 18:38:40 +0300
Subject: [PATCH] Fix internal visibility check for deserialized typealiases

    #KT-15495 fixed

Original commit: 50085722d1a714bc87188122c434fccb69b689fb
---
 .../ExperimentalIncrementalJpsTestGenerated.java      |  6 ++++++
 .../kotlin/jps/build/IncrementalJpsTestGenerated.java |  6 ++++++
 .../pureKotlin/internalTypealias/TypeAlias.kt         |  3 +++
 .../pureKotlin/internalTypealias/build.log            | 11 +++++++++++
 .../pureKotlin/internalTypealias/useTypeAlias.kt      |  5 +++++
 .../internalTypealias/useTypeAlias.kt.touch           |  0
 6 files changed, 31 insertions(+)
 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/internalTypealias/TypeAlias.kt
 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/internalTypealias/build.log
 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/internalTypealias/useTypeAlias.kt
 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/internalTypealias/useTypeAlias.kt.touch

diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java
index 98968612f81..973d6634b13 100644
--- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java
+++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java
@@ -552,6 +552,12 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta
             doTest(fileName);
         }
 
+        @TestMetadata("internalTypealias")
+        public void testInternalTypealias() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/internalTypealias/");
+            doTest(fileName);
+        }
+
         @TestMetadata("localClassChanged")
         public void testLocalClassChanged() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/localClassChanged/");
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 904047b95c1..f10f0b46907 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
@@ -552,6 +552,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
             doTest(fileName);
         }
 
+        @TestMetadata("internalTypealias")
+        public void testInternalTypealias() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/internalTypealias/");
+            doTest(fileName);
+        }
+
         @TestMetadata("localClassChanged")
         public void testLocalClassChanged() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/localClassChanged/");
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/internalTypealias/TypeAlias.kt b/jps/jps-plugin/testData/incremental/pureKotlin/internalTypealias/TypeAlias.kt
new file mode 100644
index 00000000000..43ff16c5829
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/internalTypealias/TypeAlias.kt
@@ -0,0 +1,3 @@
+package foo
+
+internal typealias TypeAlias = Int
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/internalTypealias/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/internalTypealias/build.log
new file mode 100644
index 00000000000..01bfe530691
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/internalTypealias/build.log
@@ -0,0 +1,11 @@
+================ Step #1 =================
+
+Cleaning output files:
+  out/production/module/META-INF/module.kotlin_module
+  out/production/module/foo/UseTypeAliasKt.class
+End of files
+Compiling files:
+  src/useTypeAlias.kt
+End of files
+Exit code: OK
+------------------------------------------
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/internalTypealias/useTypeAlias.kt b/jps/jps-plugin/testData/incremental/pureKotlin/internalTypealias/useTypeAlias.kt
new file mode 100644
index 00000000000..2cd8e56b071
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/internalTypealias/useTypeAlias.kt
@@ -0,0 +1,5 @@
+package foo
+
+internal fun useTypeAlias(x: TypeAlias) {
+    x.toString()
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/internalTypealias/useTypeAlias.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/internalTypealias/useTypeAlias.kt.touch
new file mode 100644
index 00000000000..e69de29bb2d