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

Fix javaHome storing KotlinDslScriptModels

Browse Source
This commit is contained in:
Natalia Selezneva
2020-04-16 16:22:25 +03:00
parent a35523b6d0
commit 7ecaf35647
1 changed files with 8 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/importing/KotlinDslSyncListener.kt
+8 -1
View File
@@ -13,6 +13,7 @@ import com.intellij.openapi.project.Project
import com.intellij.openapi.util.Key import com.intellij.openapi.util.Key
import org.jetbrains.kotlin.idea.framework.GRADLE_SYSTEM_ID import org.jetbrains.kotlin.idea.framework.GRADLE_SYSTEM_ID
import org.jetbrains.kotlin.psi.NotNullableUserDataProperty import org.jetbrains.kotlin.psi.NotNullableUserDataProperty
import org.jetbrains.plugins.gradle.settings.GradleExecutionSettings
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
@@ -39,6 +40,12 @@ class KotlinDslSyncListener : ExternalSystemTaskNotificationListenerAdapter() {
.filterIsInstance<GradleProjectSettings>().firstOrNull() .filterIsInstance<GradleProjectSettings>().firstOrNull()
?: return ?: return
saveScriptModels(project, id, projectSettings.gradleHome, models) val gradleExeSettings = ExternalSystemApiUtil.getExecutionSettings<GradleExecutionSettings>(
project,
projectSettings.externalProjectPath,
GradleConstants.SYSTEM_ID
)
saveScriptModels(project, id, gradleExeSettings.javaHome, models)
} }
} }