From 1b7f72020ef65db67166f7d6621522cf858e5111 Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Wed, 18 Mar 2020 11:09:11 +0300 Subject: [PATCH] GradleScriptListener should be applicable for all gradle scripts Not only for those that are in project Otherwise changes in those unrelated to gradle project script will affect up to date of other scripts --- .../kotlin/idea/scripting/gradle/GradleScriptListener.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptListener.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptListener.kt index 930abec4b2e..035e3f82f97 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptListener.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptListener.kt @@ -18,6 +18,8 @@ open class GradleScriptListener(project: Project) : ScriptChangeListener(project } override fun editorActivated(vFile: VirtualFile, updater: ScriptConfigurationUpdater) { + if (!isInAffectedGradleProjectFiles(project, vFile.path)) return + if (useScriptConfigurationFromImportOnly()) { // do nothing } else { @@ -27,6 +29,8 @@ open class GradleScriptListener(project: Project) : ScriptChangeListener(project } override fun documentChanged(vFile: VirtualFile, updater: ScriptConfigurationUpdater) { + if (!isInAffectedGradleProjectFiles(project, vFile.path)) return + val file = getAnalyzableKtFileForScript(vFile) if (file != null) { // *.gradle.kts file was changed @@ -35,8 +39,6 @@ open class GradleScriptListener(project: Project) : ScriptChangeListener(project } override fun isApplicable(vFile: VirtualFile): Boolean { - if (!isGradleKotlinScript(vFile)) return false - - return isInAffectedGradleProjectFiles(project, vFile.path) + return isGradleKotlinScript(vFile) } } \ No newline at end of file