From 9a820cde31d3851bd74a3540eb1ed53f5dee676e Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Mon, 2 Sep 2019 06:21:37 +0300
Subject: [PATCH] Add IC scope expansion tests

  #KT-13677
  #KT-28233

Original commit: c912f76d6f703910991d28f82198b83865979ada
---
 .../scopeExpansion/changeTypeAliasAndUsage/Foo.kt        | 3 +++
 .../scopeExpansion/changeTypeAliasAndUsage/FooImpl.kt    | 4 ++++
 .../changeTypeAliasAndUsage/FooImpl.kt.new               | 4 ++++
 .../scopeExpansion/changeTypeAliasAndUsage/TypeAlias.kt  | 1 +
 .../changeTypeAliasAndUsage/TypeAlias.kt.new             | 1 +
 .../scopeExpansion/changeTypeAliasAndUsage/build.log     | 9 +++++++++
 .../scopeExpansion/changeTypeAliasAndUsage/dummy.kt      | 1 +
 .../protectedBecomesPublicAccessedTroughChild/a.kt       | 5 +++++
 .../protectedBecomesPublicAccessedTroughChild/a.kt.new   | 5 +++++
 .../protectedBecomesPublicAccessedTroughChild/b.kt       | 5 +++++
 .../protectedBecomesPublicAccessedTroughChild/build.log  | 9 +++++++++
 .../protectedBecomesPublicAccessedTroughChild/other.kt   | 3 +++
 .../protectedBecomesPublicAccessedTroughChild/usage.kt   | 5 +++++
 .../usage.kt.new                                         | 5 +++++
 14 files changed, 60 insertions(+)
 create mode 100644 jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/Foo.kt
 create mode 100644 jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/FooImpl.kt
 create mode 100644 jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/FooImpl.kt.new
 create mode 100644 jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/TypeAlias.kt
 create mode 100644 jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/TypeAlias.kt.new
 create mode 100644 jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/build.log
 create mode 100644 jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/dummy.kt
 create mode 100644 jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/a.kt
 create mode 100644 jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/a.kt.new
 create mode 100644 jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/b.kt
 create mode 100644 jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/build.log
 create mode 100644 jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/other.kt
 create mode 100644 jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/usage.kt
 create mode 100644 jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/usage.kt.new

diff --git a/jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/Foo.kt b/jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/Foo.kt
new file mode 100644
index 00000000000..f613d2ee4ff
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/Foo.kt
@@ -0,0 +1,3 @@
+interface Foo {
+    val value: TypeAlias
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/FooImpl.kt b/jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/FooImpl.kt
new file mode 100644
index 00000000000..4ce00aeb8f7
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/FooImpl.kt
@@ -0,0 +1,4 @@
+class FooImpl : Foo {
+    override val value: TypeAlias
+        get() = "0"
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/FooImpl.kt.new b/jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/FooImpl.kt.new
new file mode 100644
index 00000000000..9f9ec1932b8
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/FooImpl.kt.new
@@ -0,0 +1,4 @@
+class FooImpl : Foo {
+    override val value: TypeAlias
+        get() = 1
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/TypeAlias.kt b/jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/TypeAlias.kt
new file mode 100644
index 00000000000..e22dbc2bfd6
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/TypeAlias.kt
@@ -0,0 +1 @@
+typealias TypeAlias = String
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/TypeAlias.kt.new b/jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/TypeAlias.kt.new
new file mode 100644
index 00000000000..b40d921b9ec
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/TypeAlias.kt.new
@@ -0,0 +1 @@
+typealias TypeAlias = Int
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/build.log b/jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/build.log
new file mode 100644
index 00000000000..52215592293
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/build.log
@@ -0,0 +1,9 @@
+================ Step #1 =================
+
+Compiling files:
+  src/Foo.kt
+  src/FooImpl.kt
+  src/TypeAlias.kt
+End of files
+Exit code: OK
+------------------------------------------
diff --git a/jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/dummy.kt b/jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/dummy.kt
new file mode 100644
index 00000000000..3f0c1c77242
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/dummy.kt
@@ -0,0 +1 @@
+fun dummy() {}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/a.kt b/jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/a.kt
new file mode 100644
index 00000000000..ddc96ccbc5c
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/a.kt
@@ -0,0 +1,5 @@
+package test
+
+open class A {
+    protected open fun foo(): Int = 0
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/a.kt.new b/jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/a.kt.new
new file mode 100644
index 00000000000..54d474ee211
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/a.kt.new
@@ -0,0 +1,5 @@
+package test
+
+open class A {
+    open fun foo(): Int = 0
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/b.kt b/jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/b.kt
new file mode 100644
index 00000000000..00418a633c9
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/b.kt
@@ -0,0 +1,5 @@
+package test
+
+open class B : A() {
+    override fun foo(): Int = 1
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/build.log b/jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/build.log
new file mode 100644
index 00000000000..3dda9a306e1
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/build.log
@@ -0,0 +1,9 @@
+================ Step #1 =================
+
+Compiling files:
+  src/a.kt
+  src/b.kt
+  src/usage.kt
+End of files
+Exit code: OK
+------------------------------------------
diff --git a/jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/other.kt b/jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/other.kt
new file mode 100644
index 00000000000..2ff821a2d52
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/other.kt
@@ -0,0 +1,3 @@
+package other
+
+fun other() = "other"
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/usage.kt b/jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/usage.kt
new file mode 100644
index 00000000000..cdc32d3de7f
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/usage.kt
@@ -0,0 +1,5 @@
+package test
+
+fun main(args: Array<String>) {
+
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/usage.kt.new b/jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/usage.kt.new
new file mode 100644
index 00000000000..8e6c3e1570b
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/usage.kt.new
@@ -0,0 +1,5 @@
+package test
+
+fun main(args: Array<String>) {
+    B().foo()
+}
\ No newline at end of file