From b38836c4884c05b06fc8158608503ad28b1ee180 Mon Sep 17 00:00:00 2001
From: Natalia Selezneva <natalia.selezneva@jetbrains.com>
Date: Wed, 22 Jan 2020 09:45:57 +0300
Subject: [PATCH] Fix script configurations for gradle project without source
 roots in 193 and as40

GradleKtsImportTest:testEmpty fixed
---
 .../gradle/importing/KotlinDslScriptModelResolver.kt        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt
index 8f7f9573342..7ae4cacaf5f 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt
@@ -34,10 +34,10 @@ class KotlinDslScriptModelResolver : KotlinDslScriptModelResolverCommon() {
         ideProject: DataNode<ProjectData>
     ) {
         root.projects.forEach {
-            val gradleProject = it as? GradleProject ?: return@forEach
-            if (gradleProject.parent == null) {
+            val gradleProject = it as? GradleProject
+            if (gradleProject == null || gradleProject.parent == null) {
                 resolverCtx.models.getModel(it, KotlinDslScriptsModel::class.java)?.let { model ->
-                    processScriptModel(ideProject, model, gradleProject.name)
+                    processScriptModel(ideProject, model, it.projectIdentifier.projectPath)
                 }
             }
         }