azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix navigation to buildSrc from scripts

Browse Source 
buildSrc folder should be placed under project dir (root or included project)
^KT-29707 Fixed
This commit is contained in:
Natalia Selezneva
2019-02-15 10:41:42 +03:00
parent 830973a93c
commit 92a160e6c3
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/core/script/GradleBuildSrcModuleDependencyProvider.kt
+3 -4
View File
@@ -11,7 +11,6 @@ import com.intellij.openapi.module.ModuleManager
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFile
import org.jetbrains.kotlin.idea.core.script.dependencies.ScriptRelatedModulesProvider 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.settings.GradleProjectSettings
import org.jetbrains.plugins.gradle.util.GradleConstants import org.jetbrains.plugins.gradle.util.GradleConstants
@@ -23,11 +22,11 @@ class GradleBuildSrcModuleDependencyProvider : ScriptRelatedModulesProvider() {
val includedModulesPath: List<String> = projectSettings.compositeBuild?.compositeParticipants?.mapNotNull { part -> val includedModulesPath: List<String> = projectSettings.compositeBuild?.compositeParticipants?.mapNotNull { part ->
projectSettings.modules.find { it == part.rootPath } projectSettings.modules.find { it == part.rootPath }
} ?: emptyList() } ?: emptyList()
val includedModulesBuildSrcPaths = includedModulesPath.map { "$it/buildSrc" }
val moduleForScript = ExternalSystemApiUtil.getExternalProjectPath(file.getModule(project)) val rootBuildSrcPath = "${projectSettings.externalProjectPath}/buildSrc"
val buildSrcProjectPath = "$moduleForScript/buildSrc"
return (includedModulesPath + buildSrcProjectPath).flatMap { path -> return (includedModulesPath + includedModulesBuildSrcPaths + rootBuildSrcPath).flatMap { path ->
ModuleManager.getInstance(project).modules.filter { ModuleManager.getInstance(project).modules.filter {
ExternalSystemApiUtil.getExternalProjectPath(it) == path ExternalSystemApiUtil.getExternalProjectPath(it) == path
} }