From f27e13035a8bf001678be8311171ab3f05ed059d Mon Sep 17 00:00:00 2001
From: Natalia Selezneva <natalia.selezneva@jetbrains.com>
Date: Tue, 26 Nov 2019 15:55:41 +0300
Subject: [PATCH] Minor: introduce helper method to check registry option

---
 .../scripting/gradle/GradleScriptConfigurationLoader.kt   | 8 ++------
 .../org/jetbrains/kotlin/idea/scripting/gradle/utils.kt   | 5 +++++
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptConfigurationLoader.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptConfigurationLoader.kt
index fe159733d39..b0b8b132b56 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptConfigurationLoader.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptConfigurationLoader.kt
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.idea.scripting.gradle
 
 import com.intellij.openapi.fileEditor.FileDocumentManager
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.util.registry.Registry
 import com.intellij.openapi.vfs.VirtualFile
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
@@ -20,11 +19,8 @@ import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition
 
 class GradleScriptConfigurationLoader(project: Project) : DefaultScriptConfigurationLoader(project) {
-    private val useProjectImport: Boolean
-        get() = Registry.`is`("kotlin.gradle.scripts.useIdeaProjectImport", false)
-
     override fun shouldRunInBackground(scriptDefinition: ScriptDefinition): Boolean {
-        return if (useProjectImport) false else super.shouldRunInBackground(scriptDefinition)
+        return if (useScriptConfigurationFromImportOnly()) false else super.shouldRunInBackground(scriptDefinition)
     }
 
     override fun loadDependencies(
@@ -35,7 +31,7 @@ class GradleScriptConfigurationLoader(project: Project) : DefaultScriptConfigura
     ): Boolean {
         if (!isGradleKotlinScript(ktFile.originalFile.virtualFile)) return false
 
-        if (useProjectImport) {
+        if (useScriptConfigurationFromImportOnly()) {
             // do nothing, project import notification will be already showed
             // and configuration for gradle build scripts will be saved at the end of import
             // todo: use default configuration loader for out-of-project scripts?
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/utils.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/utils.kt
index 3f7854c341a..8b99e1c542e 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/utils.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/utils.kt
@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.idea.scripting.gradle
 
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.util.registry.Registry
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiManager
@@ -64,3 +65,7 @@ const val minimal_gradle_version_supported = "6.0"
 fun kotlinDslScriptsModelImportSupported(currentGradleVersion: String): Boolean {
     return GradleVersion.version(currentGradleVersion) >= GradleVersion.version(minimal_gradle_version_supported)
 }
+
+fun useScriptConfigurationFromImportOnly(): Boolean {
+    return Registry.`is`("kotlin.gradle.scripts.useIdeaProjectImport", false)
+}
\ No newline at end of file