From 763f1e8606b40cc71297f949472814df2a9a4d3b Mon Sep 17 00:00:00 2001
From: Natalia Selezneva <natalia.selezneva@jetbrains.com>
Date: Wed, 17 Jul 2019 10:39:03 +0300
Subject: [PATCH] Scripts: check that file is non-script starting script
 compilation configuration update

Replace FileType check with more precise method isNonScript
---
 .../core/script/ScriptsCompilationConfigurationUpdater.kt     | 4 ++--
 .../org/jetbrains/kotlin/scripting/definitions/definitions.kt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptsCompilationConfigurationUpdater.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptsCompilationConfigurationUpdater.kt
index 7bad15538e2..17fc4db147b 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptsCompilationConfigurationUpdater.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptsCompilationConfigurationUpdater.kt
@@ -32,7 +32,6 @@ import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiManager
 import com.intellij.util.Alarm
 import org.jetbrains.annotations.TestOnly
-import org.jetbrains.kotlin.idea.KotlinFileType
 import org.jetbrains.kotlin.idea.core.script.dependencies.AsyncScriptDependenciesLoader
 import org.jetbrains.kotlin.idea.core.script.dependencies.FromFileAttributeScriptDependenciesLoader
 import org.jetbrains.kotlin.idea.core.script.dependencies.OutsiderFileDependenciesLoader
@@ -43,6 +42,7 @@ import org.jetbrains.kotlin.psi.NotNullableUserDataProperty
 import org.jetbrains.kotlin.scripting.definitions.KotlinScriptDefinition
 import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition
 import org.jetbrains.kotlin.scripting.definitions.findScriptDefinition
+import org.jetbrains.kotlin.scripting.definitions.isNonScript
 import org.jetbrains.kotlin.scripting.resolve.LegacyResolverWrapper
 import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationResult
 import kotlin.script.experimental.dependencies.AsyncDependenciesResolver
@@ -161,7 +161,7 @@ class ScriptsCompilationConfigurationUpdater(
     }
 
     private fun shouldStartUpdate(file: VirtualFile): Boolean {
-        if (project.isDisposed || !file.isValid || file.fileType != KotlinFileType.INSTANCE) {
+        if (project.isDisposed || !file.isValid || file.isNonScript()) {
             return false
         }
 
diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/definitions.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/definitions.kt
index 8b356d5e153..dac13d7b29f 100644
--- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/definitions.kt
+++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/definitions.kt
@@ -49,7 +49,7 @@ private fun findScriptDefinitionByFilePath(project: Project, file: File): Script
     return scriptDefinitionProvider.findDefinition(file) ?: scriptDefinitionProvider.getDefaultDefinition()
 }
 
-internal fun VirtualFile.isNonScript(): Boolean =
+fun VirtualFile.isNonScript(): Boolean =
     isDirectory ||
             extension == KotlinFileType.EXTENSION ||
             extension == JavaClassFileType.INSTANCE.defaultExtension ||