From 6decd06b1ba7a942266d05cd4323e141898c1628 Mon Sep 17 00:00:00 2001
From: Natalia Selezneva <natalia.selezneva@jetbrains.com>
Date: Thu, 9 Aug 2018 13:37:23 +0300
Subject: [PATCH] Provide dependency on buildSrc module for .gradle.kts files

#KT-23603 Fixed
#KT-14862 Fixed
#KT-24623 Fixed
#KT-25354 Fixed
---
 .../idea/caches/project/ScriptModuleInfos.kt  | 11 +++---
 .../caches/resolve/KotlinCacheServiceImpl.kt  | 16 ++++-----
 .../ScriptRelatedModulesProvider.kt           | 27 ++++++++++++++
 .../GradleBuildSrcModuleDependencyProvider.kt | 36 +++++++++++++++++++
 .../ScratchModuleDependencyProvider.kt        | 26 ++++++++++++++
 idea/src/META-INF/extensions/ide.xml          |  5 +++
 idea/src/META-INF/extensions/ide.xml.as33     |  5 +++
 idea/src/META-INF/gradle-java.xml             |  1 +
 idea/src/META-INF/gradle-java.xml.as33        |  1 +
 idea/src/META-INF/gradle.xml.181              |  1 +
 10 files changed, 117 insertions(+), 12 deletions(-)
 create mode 100644 idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/ScriptRelatedModulesProvider.kt
 create mode 100644 idea/idea-gradle/src/org/jetbrains/kotlin/idea/core/script/GradleBuildSrcModuleDependencyProvider.kt
 create mode 100644 idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ScratchModuleDependencyProvider.kt

diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/ScriptModuleInfos.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/ScriptModuleInfos.kt
index 01936c48902..f044a081755 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/ScriptModuleInfos.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/ScriptModuleInfos.kt
@@ -15,6 +15,7 @@ import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.search.NonClasspathDirectoriesScope
 import com.intellij.util.containers.SLRUCache
 import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager
+import org.jetbrains.kotlin.idea.core.script.dependencies.ScriptRelatedModulesProvider
 import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.script.KotlinScriptDefinition
@@ -35,18 +36,20 @@ data class ScriptModuleInfo(
     override val moduleOrigin: ModuleOrigin
         get() = ModuleOrigin.OTHER
 
-    val relatedModuleSourceInfo: ModuleSourceInfo?
-        get() = getScriptRelatedModuleInfo(project, scriptFile)
-
     override val name: Name = Name.special("<script ${scriptFile.name} ${scriptDefinition.name}>")
 
     override fun contentScope() = GlobalSearchScope.fileScope(project, scriptFile)
 
     override fun dependencies(): List<IdeaModuleInfo> {
         return arrayListOf<IdeaModuleInfo>(this).apply {
+            val scriptDependentModules = ScriptRelatedModulesProvider.getRelatedModules(scriptFile, project)
+            if (scriptDependentModules.isNotEmpty()) {
+                addAll(scriptDependentModules.mapNotNull { it.productionSourceInfo() ?: it.testSourceInfo() })
+            }
+
             val dependenciesInfo = ScriptDependenciesInfo.ForFile(project, scriptFile, scriptDefinition)
             add(dependenciesInfo)
-            relatedModuleSourceInfo?.let { addAll(it.dependencies()) }
+
             dependenciesInfo.sdk?.let { add(SdkInfo(project, it)) }
         }
     }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt
index db04aa6991a..d4e017dbe88 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt
@@ -45,6 +45,7 @@ import org.jetbrains.kotlin.idea.caches.project.IdeaModuleInfo
 import org.jetbrains.kotlin.idea.caches.resolve.util.contextWithNewLockAndCompositeExceptionTracker
 import org.jetbrains.kotlin.idea.compiler.IDELanguageSettingsProvider
 import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesModificationTracker
+import org.jetbrains.kotlin.idea.core.script.dependencies.ScriptRelatedModulesProvider
 import org.jetbrains.kotlin.idea.project.TargetPlatformDetector
 import org.jetbrains.kotlin.idea.project.outOfBlockModificationCount
 import org.jetbrains.kotlin.idea.resolve.ResolutionFacade
@@ -58,8 +59,6 @@ import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
 import org.jetbrains.kotlin.utils.addToStdlib.sumByLong
-import java.lang.AssertionError
-import java.lang.IllegalStateException
 
 internal val LOG = Logger.getInstance(KotlinCacheService::class.java)
 
@@ -111,12 +110,13 @@ class KotlinCacheServiceImpl(val project: Project) : KotlinCacheService {
         )
 
         val scriptFile = (dependenciesModuleInfo as? ScriptDependenciesInfo.ForFile)?.scriptFile
-        val relatedModuleSourceInfo = scriptFile?.let { getScriptRelatedModuleInfo(project, it) }
-        val globalFacade = if (relatedModuleSourceInfo != null) {
-            globalFacade(settings)
-        } else {
-            getOrBuildGlobalFacade(settings).facadeForSdk
-        }
+        val relatedModules = scriptFile?.let { ScriptRelatedModulesProvider.getRelatedModules(it, project) }
+        val globalFacade =
+            if (relatedModules?.isNotEmpty() == true) {
+                globalFacade(settings)
+            } else {
+                getOrBuildGlobalFacade(settings).facadeForSdk
+            }
 
         val globalContext = globalFacade.globalContext.contextWithNewLockAndCompositeExceptionTracker()
         return ProjectResolutionFacade(
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/ScriptRelatedModulesProvider.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/ScriptRelatedModulesProvider.kt
new file mode 100644
index 00000000000..9c24931716b
--- /dev/null
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/ScriptRelatedModulesProvider.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.core.script.dependencies
+
+import com.intellij.openapi.extensions.ExtensionPointName
+import com.intellij.openapi.extensions.Extensions
+import com.intellij.openapi.module.Module
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.vfs.VirtualFile
+
+abstract class ScriptRelatedModulesProvider {
+    abstract fun getRelatedModules(file: VirtualFile, project: Project): List<Module>
+
+    companion object {
+        private val EP_NAME: ExtensionPointName<ScriptRelatedModulesProvider> =
+            ExtensionPointName.create<ScriptRelatedModulesProvider>("org.jetbrains.kotlin.scriptRelatedModulesProvider")
+
+        fun getRelatedModules(file: VirtualFile, project: Project): List<Module> {
+            return Extensions.getArea(project).getExtensionPoint(EP_NAME).extensions
+                .filterIsInstance<ScriptRelatedModulesProvider>()
+                .flatMap { it.getRelatedModules(file, project) }
+        }
+    }
+}
\ No newline at end of file
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/core/script/GradleBuildSrcModuleDependencyProvider.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/core/script/GradleBuildSrcModuleDependencyProvider.kt
new file mode 100644
index 00000000000..e58b0071c55
--- /dev/null
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/core/script/GradleBuildSrcModuleDependencyProvider.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.core.script
+
+import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
+import com.intellij.openapi.module.Module
+import com.intellij.openapi.module.ModuleManager
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.vfs.VirtualFile
+import org.jetbrains.kotlin.idea.core.script.dependencies.ScriptRelatedModulesProvider
+import org.jetbrains.kotlin.idea.util.projectStructure.getModule
+import org.jetbrains.plugins.gradle.settings.GradleProjectSettings
+import org.jetbrains.plugins.gradle.util.GradleConstants
+
+class GradleBuildSrcModuleDependencyProvider : ScriptRelatedModulesProvider() {
+    override fun getRelatedModules(file: VirtualFile, project: Project): List<Module> {
+        val gradleSettings = ExternalSystemApiUtil.getSettings(project, GradleConstants.SYSTEM_ID)
+        val projectSettings = gradleSettings.getLinkedProjectsSettings().filterIsInstance<GradleProjectSettings>().firstOrNull()
+            ?: return emptyList()
+        val includedModulesPath: List<String> = projectSettings.compositeBuild?.compositeParticipants?.mapNotNull { part ->
+            projectSettings.modules.find { it == part.rootPath }
+        } ?: emptyList()
+
+        val moduleForScript = ExternalSystemApiUtil.getExternalProjectPath(file.getModule(project))
+        val buildSrcProjectPath = "$moduleForScript/buildSrc"
+
+        return (includedModulesPath + buildSrcProjectPath).flatMap { path ->
+            ModuleManager.getInstance(project).modules.filter {
+                ExternalSystemApiUtil.getExternalProjectPath(it) == path
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ScratchModuleDependencyProvider.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ScratchModuleDependencyProvider.kt
new file mode 100644
index 00000000000..1e8070727ee
--- /dev/null
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ScratchModuleDependencyProvider.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.scratch
+
+import com.intellij.ide.scratch.ScratchFileService
+import com.intellij.openapi.module.Module
+import com.intellij.openapi.module.ModuleManager
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.vfs.VirtualFile
+import org.jetbrains.kotlin.idea.core.script.dependencies.ScriptRelatedModulesProvider
+import org.jetbrains.kotlin.idea.core.script.scriptRelatedModuleName
+
+class ScratchModuleDependencyProvider : ScriptRelatedModulesProvider() {
+    override fun getRelatedModules(file: VirtualFile, project: Project): List<Module> {
+        if (ScratchFileService.isInScratchRoot(file)) {
+            val scratchModule = file.scriptRelatedModuleName?.let { ModuleManager.getInstance(project).findModuleByName(it) }
+            if (scratchModule != null) {
+                return listOf(scratchModule)
+            }
+        }
+        return emptyList()
+    }
+}
\ No newline at end of file
diff --git a/idea/src/META-INF/extensions/ide.xml b/idea/src/META-INF/extensions/ide.xml
index 7cbac7fc017..dab08bc7768 100644
--- a/idea/src/META-INF/extensions/ide.xml
+++ b/idea/src/META-INF/extensions/ide.xml
@@ -42,6 +42,10 @@
                         interface="org.jetbrains.kotlin.platform.IdePlatformKind"/>
         <extensionPoint qualifiedName="org.jetbrains.kotlin.idePlatformKindTooling"
                         interface="org.jetbrains.kotlin.idea.platform.IdePlatformKindTooling"/>
+
+        <extensionPoint qualifiedName="org.jetbrains.kotlin.scriptRelatedModulesProvider"
+                        interface="org.jetbrains.kotlin.idea.core.script.dependencies.ScriptRelatedModulesProvider"
+                        area="IDEA_PROJECT"/>
     </extensionPoints>
 
     <extensions defaultExtensionNs="org.jetbrains.kotlin">
@@ -68,5 +72,6 @@
         <idePlatformKindResolution implementation="org.jetbrains.kotlin.caches.resolve.CommonPlatformKindResolution"/>
 
         <scratchFileLanguageProvider language="kotlin" implementationClass="org.jetbrains.kotlin.idea.scratch.KtScratchFileLanguageProvider"/>
+        <scriptRelatedModulesProvider implementation="org.jetbrains.kotlin.idea.scratch.ScratchModuleDependencyProvider"/>
     </extensions>
 </idea-plugin>
diff --git a/idea/src/META-INF/extensions/ide.xml.as33 b/idea/src/META-INF/extensions/ide.xml.as33
index c37c67b93d1..f26b1fcd33b 100644
--- a/idea/src/META-INF/extensions/ide.xml.as33
+++ b/idea/src/META-INF/extensions/ide.xml.as33
@@ -34,6 +34,10 @@
                         interface="org.jetbrains.kotlin.platform.IdePlatformKind"/>
         <extensionPoint qualifiedName="org.jetbrains.kotlin.idePlatformKindTooling"
                         interface="org.jetbrains.kotlin.idea.platform.IdePlatformKindTooling"/>
+
+        <extensionPoint qualifiedName="org.jetbrains.kotlin.scriptRelatedModulesProvider"
+                        interface="org.jetbrains.kotlin.idea.core.script.dependencies.ScriptRelatedModulesProvider"
+                        area="IDEA_PROJECT"/>
     </extensionPoints>
 
     <extensions defaultExtensionNs="org.jetbrains.kotlin">
@@ -60,5 +64,6 @@
         <idePlatformKindResolution implementation="org.jetbrains.kotlin.caches.resolve.CommonPlatformKindResolution"/>
 
         <scratchFileLanguageProvider language="kotlin" implementationClass="org.jetbrains.kotlin.idea.scratch.KtScratchFileLanguageProvider"/>
+        <scriptRelatedModulesProvider implementation="org.jetbrains.kotlin.idea.scratch.ScratchModuleDependencyProvider"/>
     </extensions>
 </idea-plugin>
diff --git a/idea/src/META-INF/gradle-java.xml b/idea/src/META-INF/gradle-java.xml
index 13b8ede8531..7b6e8877a91 100644
--- a/idea/src/META-INF/gradle-java.xml
+++ b/idea/src/META-INF/gradle-java.xml
@@ -78,6 +78,7 @@
         <gradleModelFacade implementation="org.jetbrains.kotlin.idea.inspections.gradle.DefaultGradleModelFacade"/>
 
         <scriptDefinitionContributor implementation="org.jetbrains.kotlin.idea.core.script.GradleScriptDefinitionsContributor" order="first"/>
+        <scriptRelatedModulesProvider implementation="org.jetbrains.kotlin.idea.core.script.GradleBuildSrcModuleDependencyProvider"/>
 
         <moduleBuilder implementation="org.jetbrains.kotlin.ide.konan.gradle.KotlinGradleNativeMultiplatformModuleBuilder"/>
         <moduleBuilder implementation="org.jetbrains.kotlin.idea.configuration.KotlinGradleWebMultiplatformModuleBuilder"/>
diff --git a/idea/src/META-INF/gradle-java.xml.as33 b/idea/src/META-INF/gradle-java.xml.as33
index 171655ed269..f6fb58a1c94 100644
--- a/idea/src/META-INF/gradle-java.xml.as33
+++ b/idea/src/META-INF/gradle-java.xml.as33
@@ -77,6 +77,7 @@
         <gradleModelFacade implementation="org.jetbrains.kotlin.idea.inspections.gradle.DefaultGradleModelFacade"/>
 
         <scriptDefinitionContributor implementation="org.jetbrains.kotlin.idea.core.script.GradleScriptDefinitionsContributor" order="first"/>
+        <scriptRelatedModulesProvider implementation="org.jetbrains.kotlin.idea.core.script.GradleBuildSrcModuleDependencyProvider"/>
 
         <moduleBuilder implementation="org.jetbrains.kotlin.ide.konan.gradle.KotlinGradleNativeMultiplatformModuleBuilder"/>
         <moduleBuilder implementation="org.jetbrains.kotlin.idea.configuration.KotlinGradleWebMultiplatformModuleBuilder"/>
diff --git a/idea/src/META-INF/gradle.xml.181 b/idea/src/META-INF/gradle.xml.181
index b87991d8fb8..fcb3170bd2a 100644
--- a/idea/src/META-INF/gradle.xml.181
+++ b/idea/src/META-INF/gradle.xml.181
@@ -86,6 +86,7 @@
         <gradleModelFacade implementation="org.jetbrains.kotlin.idea.inspections.gradle.DefaultGradleModelFacade"/>
 
         <scriptDefinitionContributor implementation="org.jetbrains.kotlin.idea.core.script.GradleScriptDefinitionsContributor" order="first"/>
+        <scriptRelatedModulesProvider implementation="org.jetbrains.kotlin.idea.core.script.GradleBuildSrcModuleDependencyProvider"/>
 
         <moduleBuilder implementation="org.jetbrains.kotlin.idea.configuration.KotlinGradleWebMultiplatformModuleBuilder"/>
         <moduleBuilder implementation="org.jetbrains.kotlin.idea.configuration.KotlinGradleSharedMultiplatformModuleBuilder"/>