diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleImportHelper.kt.201 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleImportHelper.kt.201 index 83bb50aff7e..abe27c57ab4 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleImportHelper.kt.201 +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleImportHelper.kt.201 @@ -81,6 +81,6 @@ class LoadConfigurationAction : AnAction( if (virtualFile is LightVirtualFileBase) return false if (virtualFile == null || !virtualFile.isValid) return false - return GradleScriptingSupportProvider.getInstance(project).shouldShowNotificationInEditor(virtualFile) + return GradleScriptingSupportProvider.getInstance(project).isConfigurationOutOfDate(virtualFile) } } \ No newline at end of file diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptingSupport.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptingSupport.kt index ab609e19b05..3a464bb93b6 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptingSupport.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptingSupport.kt @@ -9,12 +9,10 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.idea.core.script.configuration.ScriptingSupport import org.jetbrains.kotlin.idea.core.script.configuration.listener.ScriptConfigurationUpdater -import org.jetbrains.kotlin.idea.core.script.configuration.utils.ScriptClassRootsIndexer import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationWrapper class GradleScriptingSupport( - private val rootsIndexer: ScriptClassRootsIndexer, val project: Project, val buildRoot: VirtualFile, val context: GradleKtsContext, @@ -23,7 +21,7 @@ class GradleScriptingSupport( override fun recreateRootsCache() = GradleClassRootsCache(project, context, configuration) - fun shouldShowNotificationInEditor(file: VirtualFile): Boolean { + fun isConfigurationOutOfDate(file: VirtualFile): Boolean { val scriptModel = configuration.scriptModel(file) ?: return false return !scriptModel.inputs.isUpToDate(project, file) } @@ -54,7 +52,7 @@ class GradleScriptingSupport( override fun suggestToUpdateConfigurationIfOutOfDate(file: KtFile) { val vFile = file.originalFile.virtualFile - if (shouldShowNotificationInEditor(vFile)) { + if (isConfigurationOutOfDate(vFile)) { showNotificationForProjectImport(project) } else { hideNotificationForProjectImport(project) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptingSupportProvider.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptingSupportProvider.kt index c566980427c..64fd3f4ed1d 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptingSupportProvider.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptingSupportProvider.kt @@ -126,7 +126,6 @@ class GradleScriptingSupportProvider(val project: Project) : ScriptingSupport.Pr val data = dataProvider(buildRoot) ?: return null val newSupport = GradleScriptingSupport( - rootsIndexer, project, buildRoot, GradleKtsContext(gradleExeSettings.javaHome?.let { File(it) }), @@ -188,21 +187,18 @@ class GradleScriptingSupportProvider(val project: Project) : ScriptingSupport.Pr override fun recreateRootsCache(): ScriptClassRootsCache = ScriptClassRootsCache.empty(project) } - fun shouldShowNotificationToRunGradleImport(file: VirtualFile): Boolean { - if (isGradleKotlinScript(file)) { - findRoot(file)?.let { return false } + fun isMissingConfigurationCanBeLoadedDuringImport(file: VirtualFile): Boolean { + findRoot(file)?.let { return false } - val externalProjectSettings = findExternalProjectSettings(file) ?: return false - return kotlinDslScriptsModelImportSupported(getGradleVersion(project, externalProjectSettings)) - } - return false + val externalProjectSettings = findExternalProjectSettings(file) ?: return false + return kotlinDslScriptsModelImportSupported(getGradleVersion(project, externalProjectSettings)) } // used in 201 @Suppress("UNUSED") - fun shouldShowNotificationInEditor(file: VirtualFile): Boolean { + fun isConfigurationOutOfDate(file: VirtualFile): Boolean { val support = findRoot(file) ?: return false - return support.shouldShowNotificationInEditor(file) + return support.isConfigurationOutOfDate(file) } companion object { diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/MissingGradleScriptConfigurationNotificationProvider.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/MissingGradleScriptConfigurationNotificationProvider.kt index 1273f4aa955..00330d665d6 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/MissingGradleScriptConfigurationNotificationProvider.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/MissingGradleScriptConfigurationNotificationProvider.kt @@ -55,7 +55,7 @@ class MissingGradleScriptConfigurationNotificationProvider(private val project: } } - if (GradleScriptingSupportProvider.getInstance(project).shouldShowNotificationToRunGradleImport(file)) { + if (GradleScriptingSupportProvider.getInstance(project).isMissingConfigurationCanBeLoadedDuringImport(file)) { return EditorNotificationPanel().apply { text(getMissingConfigurationNotificationText()) createActionLabel(getMissingConfigurationActionText()) {