From 5ab822be36d34b22598f4bae4edeeb9685f76e6f Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Thu, 1 Oct 2020 18:24:17 +0200
Subject: [PATCH] Import scope of the imported script

#KT-34178
---
 .../test/org/jetbrains/kotlin/mainKts/test/mainKtsIT.kt   | 2 +-
 .../test/org/jetbrains/kotlin/mainKts/test/mainKtsTest.kt | 2 +-
 .../kotlin-main-kts-test/testData/import-common.main.kts  | 8 +++++++-
 .../kotlin-main-kts-test/testData/import-middle.main.kts  | 4 +++-
 .../kotlin-main-kts-test/testData/import-test.main.kts    | 1 +
 .../kotlin/scripting/resolve/LazyScriptDescriptor.kt      | 7 +++++--
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/libraries/tools/kotlin-main-kts-test/test/org/jetbrains/kotlin/mainKts/test/mainKtsIT.kt b/libraries/tools/kotlin-main-kts-test/test/org/jetbrains/kotlin/mainKts/test/mainKtsIT.kt
index 7eeaa8dca06..db1434b5377 100644
--- a/libraries/tools/kotlin-main-kts-test/test/org/jetbrains/kotlin/mainKts/test/mainKtsIT.kt
+++ b/libraries/tools/kotlin-main-kts-test/test/org/jetbrains/kotlin/mainKts/test/mainKtsIT.kt
@@ -41,7 +41,7 @@ class MainKtsIT {
 
         runWithK2JVMCompiler(
             "$TEST_DATA_ROOT/import-test.main.kts",
-            listOf("Hi from common", "Hi from middle", "sharedVar == 5"),
+            listOf("Hi from common", "Hi from middle", "Hi from main", "sharedVar == 5"),
             classpath = listOf(mainKtsJar)
         )
     }
diff --git a/libraries/tools/kotlin-main-kts-test/test/org/jetbrains/kotlin/mainKts/test/mainKtsTest.kt b/libraries/tools/kotlin-main-kts-test/test/org/jetbrains/kotlin/mainKts/test/mainKtsTest.kt
index 55e2ecaff83..ff52a5d29c6 100644
--- a/libraries/tools/kotlin-main-kts-test/test/org/jetbrains/kotlin/mainKts/test/mainKtsTest.kt
+++ b/libraries/tools/kotlin-main-kts-test/test/org/jetbrains/kotlin/mainKts/test/mainKtsTest.kt
@@ -39,7 +39,7 @@ fun evalFile(scriptFile: File, cacheDir: File? = null): ResultWithDiagnostics<Ev
 
 
 const val TEST_DATA_ROOT = "libraries/tools/kotlin-main-kts-test/testData"
-val OUT_FROM_IMPORT_TEST = listOf("Hi from common", "Hi from middle", "sharedVar == 5")
+val OUT_FROM_IMPORT_TEST = listOf("Hi from common", "Hi from middle", "Hi from main", "sharedVar == 5")
 
 
 class MainKtsTest {
diff --git a/libraries/tools/kotlin-main-kts-test/testData/import-common.main.kts b/libraries/tools/kotlin-main-kts-test/testData/import-common.main.kts
index b41adeefa5e..067370b81a2 100644
--- a/libraries/tools/kotlin-main-kts-test/testData/import-common.main.kts
+++ b/libraries/tools/kotlin-main-kts-test/testData/import-common.main.kts
@@ -1,4 +1,10 @@
 
 var sharedVar = 2
 
-println("Hi from common")
+class SharedClass(val msg: String)
+
+object SharedObject {
+    val greeting = "Hi"
+}
+
+println("${SharedObject.greeting} from common")
diff --git a/libraries/tools/kotlin-main-kts-test/testData/import-middle.main.kts b/libraries/tools/kotlin-main-kts-test/testData/import-middle.main.kts
index 50d61eaa365..98be15c9f0c 100644
--- a/libraries/tools/kotlin-main-kts-test/testData/import-middle.main.kts
+++ b/libraries/tools/kotlin-main-kts-test/testData/import-middle.main.kts
@@ -3,4 +3,6 @@
 
 sharedVar *= 2
 
-println("Hi from middle")
+val from = SharedClass("from")
+
+println("${SharedObject.greeting} ${from.msg} middle")
diff --git a/libraries/tools/kotlin-main-kts-test/testData/import-test.main.kts b/libraries/tools/kotlin-main-kts-test/testData/import-test.main.kts
index 72352bcdca7..500f0ee7f0a 100644
--- a/libraries/tools/kotlin-main-kts-test/testData/import-test.main.kts
+++ b/libraries/tools/kotlin-main-kts-test/testData/import-test.main.kts
@@ -4,4 +4,5 @@
 
 sharedVar = sharedVar + 1
 
+println("${SharedObject.greeting} ${from.msg} main")
 println("sharedVar == $sharedVar")
diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/LazyScriptDescriptor.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/LazyScriptDescriptor.kt
index 87122fe5629..2427bf9e60b 100644
--- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/LazyScriptDescriptor.kt
+++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/LazyScriptDescriptor.kt
@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.getChildOfType
 import org.jetbrains.kotlin.psi.psiUtil.getChildrenOfType
+import org.jetbrains.kotlin.resolve.AllUnderImportScope
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns
 import org.jetbrains.kotlin.resolve.descriptorUtil.module
@@ -34,6 +35,7 @@ import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyClassMemberScope
 import org.jetbrains.kotlin.resolve.scopes.LexicalScope
 import org.jetbrains.kotlin.resolve.scopes.LexicalScopeImpl
 import org.jetbrains.kotlin.resolve.scopes.LexicalScopeKind
+import org.jetbrains.kotlin.resolve.scopes.utils.addImportingScope
 import org.jetbrains.kotlin.resolve.source.toSourceElement
 import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition
 import org.jetbrains.kotlin.scripting.definitions.ScriptDependenciesProvider
@@ -43,7 +45,6 @@ import org.jetbrains.kotlin.types.TypeSubstitutor
 import org.jetbrains.kotlin.types.typeUtil.isNothing
 import org.jetbrains.kotlin.types.typeUtil.isUnit
 import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
-import java.io.File
 import kotlin.reflect.KClass
 import kotlin.reflect.KType
 import kotlin.script.experimental.api.*
@@ -180,7 +181,7 @@ class LazyScriptDescriptor(
 
         val localFS by lazy {
             val fileManager = VirtualFileManager.getInstance()
-            fileManager.getFileSystem(StandardFileSystems.FILE_PROTOCOL) 
+            fileManager.getFileSystem(StandardFileSystems.FILE_PROTOCOL)
         }
         val psiManager by lazy { PsiManager.getInstance(scriptInfo.script.project) }
 
@@ -285,6 +286,8 @@ class LazyScriptDescriptor(
                 true,
                 receiverClassDescriptor.thisAsReceiverParameter,
                 LexicalScopeKind.CLASS_MEMBER_SCOPE
+            ).addImportingScope(
+                AllUnderImportScope.create(receiverClassDescriptor, emptyList())
             )
         }
         outerScope