Introduce new external listener to avoid failing loading dependencies during new projet creation

idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolverCommon.kt

@@ -93,9 +93,9 @@ abstract class KotlinDslScriptModelResolverCommon : AbstractProjectResolverExten
             )
         } else {
             val models = model.toListOfScriptModels()
-
-            saveScriptModels(resolverCtx, models)
-
+            resolverCtx.externalSystemTaskId.findProject()?.kotlinDslModels?.addAll(
+                models
+            )
             if (models.containsErrors()) {
                 throw IllegalStateException(KotlinIdeaGradleBundle.message("title.kotlin.build.script"))
             }

idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScrtiptModelProcessor.kt

@@ -6,6 +6,8 @@
 package org.jetbrains.kotlin.idea.scripting.gradle.importing
 
 import com.intellij.openapi.components.service
+import com.intellij.openapi.externalSystem.model.task.ExternalSystemTaskId
+import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.openapi.vfs.VirtualFile
 import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager
@@ -18,6 +20,7 @@ import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationWrap
 import org.jetbrains.kotlin.scripting.resolve.VirtualFileScriptSource
 import org.jetbrains.kotlin.scripting.resolve.adjustByDefinition
 import org.jetbrains.plugins.gradle.service.project.ProjectResolverContext
+import org.jetbrains.plugins.gradle.settings.GradleExecutionSettings
 import java.io.File
 import kotlin.script.experimental.api.*
 import kotlin.script.experimental.jvm.JvmDependency
@@ -25,18 +28,16 @@ import kotlin.script.experimental.jvm.jdkHome
 import kotlin.script.experimental.jvm.jvm
 
 fun saveScriptModels(
-    resolverContext: ProjectResolverContext,
+    project: Project,
+    task: ExternalSystemTaskId,
+    javaHomeStr: String?,
     models: List<KotlinDslScriptModel>
 ) {
-    val task = resolverContext.externalSystemTaskId
-    val project = task.findProject() ?: return
-    val settings = resolverContext.settings ?: return
-
     val scriptConfigurations = mutableListOf<Pair<VirtualFile, ScriptConfigurationSnapshot>>()
 
     val errorReporter = KotlinGradleDslErrorReporter(project, task)
 
-    val javaHome = settings.javaHome?.let { File(it) }
+    val javaHome = javaHomeStr?.let { File(it) }
     models.forEach { model ->
         val scriptFile = File(model.file)
         val virtualFile = VfsUtil.findFile(scriptFile.toPath(), true)!!

idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslSyncListener.kt

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * 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.scripting.gradle.importing
+
+import com.intellij.openapi.externalSystem.model.task.ExternalSystemTaskId
+import com.intellij.openapi.externalSystem.model.task.ExternalSystemTaskNotificationListenerAdapter
+import com.intellij.openapi.externalSystem.model.task.ExternalSystemTaskType
+import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.util.Key
+import org.jetbrains.kotlin.idea.framework.GRADLE_SYSTEM_ID
+import org.jetbrains.kotlin.psi.NotNullableUserDataProperty
+import org.jetbrains.plugins.gradle.settings.GradleProjectSettings
+import org.jetbrains.plugins.gradle.util.GradleConstants
+
+var Project.kotlinDslModels: ArrayList<KotlinDslScriptModel>
+        by NotNullableUserDataProperty<Project, ArrayList<KotlinDslScriptModel>>(
+            Key("Kotlin DSL Scripts Models"), arrayListOf()
+        )
+
+class KotlinDslSyncListener : ExternalSystemTaskNotificationListenerAdapter() {
+    override fun onEnd(id: ExternalSystemTaskId) {
+        if (id.type != ExternalSystemTaskType.RESOLVE_PROJECT || id.projectSystemId != GRADLE_SYSTEM_ID) {
+            return
+        }
+
+        val project = id.findProject() ?: return
+
+        val models: List<KotlinDslScriptModel> = project.kotlinDslModels
+        project.kotlinDslModels = arrayListOf()
+
+        if (models.isEmpty()) return
+
+        val gradleSettings = ExternalSystemApiUtil.getSettings(project, GradleConstants.SYSTEM_ID)
+        val projectSettings = gradleSettings.getLinkedProjectsSettings()
+            .filterIsInstance<GradleProjectSettings>().firstOrNull()
+            ?: return
+
+        saveScriptModels(project, id, projectSettings.gradleHome, models)
+    }
+}

idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslSyncListener.kt.191

@@ -0,0 +1,15 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * 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.scripting.gradle.importing
+
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.util.Key
+import org.jetbrains.kotlin.psi.NotNullableUserDataProperty
+
+var Project.kotlinDslModels: ArrayList<KotlinDslScriptModel>
+        by NotNullableUserDataProperty<Project, ArrayList<KotlinDslScriptModel>>(
+            Key("Kotlin DSL Scripts Models"), arrayListOf()
+        )

idea/resources/META-INF/gradle-java.xml

@@ -29,7 +29,14 @@
     <externalProjectDataService implementation="org.jetbrains.kotlin.idea.configuration.KotlinTargetDataService"/>
     <externalProjectDataService implementation="org.jetbrains.kotlin.idea.KotlinJavaMPPSourceSetDataService"/>
     <externalProjectDataService implementation="org.jetbrains.kotlin.idea.configuration.klib.KotlinNativeLibraryDataService"/>
-    <externalSystemTaskNotificationListener implementation="org.jetbrains.kotlin.idea.scripting.gradle.GradleScriptDefinitionsUpdater"/>
+    <externalSystemTaskNotificationListener
+        id="GradleScriptDefinitionsUpdater"
+        implementation="org.jetbrains.kotlin.idea.scripting.gradle.GradleScriptDefinitionsUpdater"
+    />
+    <externalSystemTaskNotificationListener
+        implementation="org.jetbrains.kotlin.idea.scripting.gradle.importing.KotlinDslSyncListener"
+        order="after GradleScriptDefinitionsUpdater"
+    />
     <editorNotificationProvider implementation="org.jetbrains.kotlin.idea.scripting.gradle.GradleScriptOutOfSourceNotificationProvider"/>
 
     <runConfigurationProducer implementation="org.jetbrains.kotlin.idea.run.KotlinJvmTestClassGradleConfigurationProducer"/>

idea/resources/META-INF/gradle-java.xml.191

@@ -23,7 +23,10 @@
         <externalProjectDataService implementation="org.jetbrains.kotlin.idea.configuration.KotlinTargetDataService"/>
         <externalProjectDataService implementation="org.jetbrains.kotlin.idea.KotlinJavaMPPSourceSetDataService"/>
         <externalProjectDataService implementation="org.jetbrains.kotlin.idea.configuration.klib.KotlinNativeLibraryDataService"/>
-        <externalSystemTaskNotificationListener implementation="org.jetbrains.kotlin.idea.scripting.gradle.GradleScriptDefinitionsUpdater"/>
+        <externalSystemTaskNotificationListener
+            id="GradleScriptDefinitionsUpdater"
+            implementation="org.jetbrains.kotlin.idea.scripting.gradle.GradleScriptDefinitionsUpdater"
+        />
         <editorNotificationProvider implementation="org.jetbrains.kotlin.idea.scripting.gradle.GradleScriptOutOfSourceNotificationProvider"/>
 
         <runConfigurationProducer implementation="org.jetbrains.kotlin.idea.run.KotlinJvmTestClassGradleConfigurationProducer"/>

idea/resources/META-INF/gradle-java.xml.201

@@ -25,7 +25,14 @@
         <externalProjectDataService implementation="org.jetbrains.kotlin.idea.configuration.KotlinTargetDataService"/>
         <externalProjectDataService implementation="org.jetbrains.kotlin.idea.KotlinJavaMPPSourceSetDataService"/>
         <externalProjectDataService implementation="org.jetbrains.kotlin.idea.configuration.klib.KotlinNativeLibraryDataService"/>
-        <externalSystemTaskNotificationListener implementation="org.jetbrains.kotlin.idea.scripting.gradle.GradleScriptDefinitionsUpdater"/>
+        <externalSystemTaskNotificationListener
+            id="GradleScriptDefinitionsUpdater"
+            implementation="org.jetbrains.kotlin.idea.scripting.gradle.GradleScriptDefinitionsUpdater"
+        />
+        <externalSystemTaskNotificationListener
+            implementation="org.jetbrains.kotlin.idea.scripting.gradle.importing.KotlinDslSyncListener"
+            order="after GradleScriptDefinitionsUpdater"
+        />
         <editorNotificationProvider implementation="org.jetbrains.kotlin.idea.scripting.gradle.GradleScriptOutOfSourceNotificationProvider"/>
 
         <runConfigurationProducer implementation="org.jetbrains.kotlin.idea.run.KotlinJvmTestClassGradleConfigurationProducer"/>