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

GradleBuildRootsManager: fix onProjectsLinked

Browse Source
This commit is contained in:
Sergey Rostov
2020-05-07 14:00:40 +03:00
parent 5cd9e99caa
commit 13abfda00b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRootsManager.kt
+2 -1
View File
@@ -138,6 +138,7 @@ class GradleBuildRootsManager(val project: Project) : ScriptingSupport.Provider(
// other scripts: "included", "precompiled" scripts, scripts in unlinked projects, // other scripts: "included", "precompiled" scripts, scripts in unlinked projects,
// or just random files with ".gradle.kts" ending // or just random files with ".gradle.kts" ending
// todo(gradle6): remove, it is required only for projects with old gradle
if (searchNearestLegacy) { if (searchNearestLegacy) {
val found = roots.findNearestRoot(filePath) val found = roots.findNearestRoot(filePath)
if (found is GradleBuildRoot.Legacy) return ScriptUnderRoot(found) if (found is GradleBuildRoot.Legacy) return ScriptUnderRoot(found)
@@ -221,7 +222,7 @@ class GradleBuildRootsManager(val project: Project) : ScriptingSupport.Provider(
val listener = object : GradleSettingsListenerAdapter() { val listener = object : GradleSettingsListenerAdapter() {
override fun onProjectsLinked(settings: MutableCollection<GradleProjectSettings>) { override fun onProjectsLinked(settings: MutableCollection<GradleProjectSettings>) {
settings.forEach { settings.forEach {
loadLinkedRoot(it) add(loadLinkedRoot(it))
} }
} }