Minor: rename function

This commit is contained in:
Natalia Selezneva
2020-04-23 15:44:45 +03:00
parent 574f57e604
commit 7f8b3b6a79
4 changed files with 10 additions and 16 deletions
@@ -81,6 +81,6 @@ class LoadConfigurationAction : AnAction(
if (virtualFile is LightVirtualFileBase) return false if (virtualFile is LightVirtualFileBase) return false
if (virtualFile == null || !virtualFile.isValid) return false if (virtualFile == null || !virtualFile.isValid) return false
return GradleScriptingSupportProvider.getInstance(project).shouldShowNotificationInEditor(virtualFile) return GradleScriptingSupportProvider.getInstance(project).isConfigurationOutOfDate(virtualFile)
} }
} }
@@ -9,12 +9,10 @@ import com.intellij.openapi.project.Project
import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFile
import org.jetbrains.kotlin.idea.core.script.configuration.ScriptingSupport 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.listener.ScriptConfigurationUpdater
import org.jetbrains.kotlin.idea.core.script.configuration.utils.ScriptClassRootsIndexer
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationWrapper import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationWrapper
class GradleScriptingSupport( class GradleScriptingSupport(
private val rootsIndexer: ScriptClassRootsIndexer,
val project: Project, val project: Project,
val buildRoot: VirtualFile, val buildRoot: VirtualFile,
val context: GradleKtsContext, val context: GradleKtsContext,
@@ -23,7 +21,7 @@ class GradleScriptingSupport(
override fun recreateRootsCache() = GradleClassRootsCache(project, context, configuration) override fun recreateRootsCache() = GradleClassRootsCache(project, context, configuration)
fun shouldShowNotificationInEditor(file: VirtualFile): Boolean { fun isConfigurationOutOfDate(file: VirtualFile): Boolean {
val scriptModel = configuration.scriptModel(file) ?: return false val scriptModel = configuration.scriptModel(file) ?: return false
return !scriptModel.inputs.isUpToDate(project, file) return !scriptModel.inputs.isUpToDate(project, file)
} }
@@ -54,7 +52,7 @@ class GradleScriptingSupport(
override fun suggestToUpdateConfigurationIfOutOfDate(file: KtFile) { override fun suggestToUpdateConfigurationIfOutOfDate(file: KtFile) {
val vFile = file.originalFile.virtualFile val vFile = file.originalFile.virtualFile
if (shouldShowNotificationInEditor(vFile)) { if (isConfigurationOutOfDate(vFile)) {
showNotificationForProjectImport(project) showNotificationForProjectImport(project)
} else { } else {
hideNotificationForProjectImport(project) hideNotificationForProjectImport(project)
@@ -126,7 +126,6 @@ class GradleScriptingSupportProvider(val project: Project) : ScriptingSupport.Pr
val data = dataProvider(buildRoot) ?: return null val data = dataProvider(buildRoot) ?: return null
val newSupport = GradleScriptingSupport( val newSupport = GradleScriptingSupport(
rootsIndexer,
project, project,
buildRoot, buildRoot,
GradleKtsContext(gradleExeSettings.javaHome?.let { File(it) }), GradleKtsContext(gradleExeSettings.javaHome?.let { File(it) }),
@@ -188,21 +187,18 @@ class GradleScriptingSupportProvider(val project: Project) : ScriptingSupport.Pr
override fun recreateRootsCache(): ScriptClassRootsCache = ScriptClassRootsCache.empty(project) override fun recreateRootsCache(): ScriptClassRootsCache = ScriptClassRootsCache.empty(project)
} }
fun shouldShowNotificationToRunGradleImport(file: VirtualFile): Boolean { fun isMissingConfigurationCanBeLoadedDuringImport(file: VirtualFile): Boolean {
if (isGradleKotlinScript(file)) { findRoot(file)?.let { return false }
findRoot(file)?.let { return false }
val externalProjectSettings = findExternalProjectSettings(file) ?: return false val externalProjectSettings = findExternalProjectSettings(file) ?: return false
return kotlinDslScriptsModelImportSupported(getGradleVersion(project, externalProjectSettings)) return kotlinDslScriptsModelImportSupported(getGradleVersion(project, externalProjectSettings))
}
return false
} }
// used in 201 // used in 201
@Suppress("UNUSED") @Suppress("UNUSED")
fun shouldShowNotificationInEditor(file: VirtualFile): Boolean { fun isConfigurationOutOfDate(file: VirtualFile): Boolean {
val support = findRoot(file) ?: return false val support = findRoot(file) ?: return false
return support.shouldShowNotificationInEditor(file) return support.isConfigurationOutOfDate(file)
} }
companion object { companion object {
@@ -55,7 +55,7 @@ class MissingGradleScriptConfigurationNotificationProvider(private val project:
} }
} }
if (GradleScriptingSupportProvider.getInstance(project).shouldShowNotificationToRunGradleImport(file)) { if (GradleScriptingSupportProvider.getInstance(project).isMissingConfigurationCanBeLoadedDuringImport(file)) {
return EditorNotificationPanel().apply { return EditorNotificationPanel().apply {
text(getMissingConfigurationNotificationText()) text(getMissingConfigurationNotificationText())
createActionLabel(getMissingConfigurationActionText()) { createActionLabel(getMissingConfigurationActionText()) {