From 5ab119ecfb30a8c5e48d63c3126ea2863126f22c Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Thu, 26 Sep 2019 15:11:29 +0300 Subject: [PATCH] Do no try to find script definitions for default project This may happen when user opens Kotlin Scripting Settings ^KT-32401 Fixed --- .../kotlin/idea/script/scriptsTemplatesFromDependencies.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/script/scriptsTemplatesFromDependencies.kt b/idea/src/org/jetbrains/kotlin/idea/script/scriptsTemplatesFromDependencies.kt index 0ee7fbb439d..64465de1096 100644 --- a/idea/src/org/jetbrains/kotlin/idea/script/scriptsTemplatesFromDependencies.kt +++ b/idea/src/org/jetbrains/kotlin/idea/script/scriptsTemplatesFromDependencies.kt @@ -14,7 +14,10 @@ import com.intellij.openapi.vfs.JarFileSystem import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.idea.core.script.loadDefinitionsFromTemplates import org.jetbrains.kotlin.idea.util.projectStructure.allModules -import org.jetbrains.kotlin.scripting.definitions.* +import org.jetbrains.kotlin.scripting.definitions.SCRIPT_DEFINITION_MARKERS_EXTENSION_WITH_DOT +import org.jetbrains.kotlin.scripting.definitions.SCRIPT_DEFINITION_MARKERS_PATH +import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition +import org.jetbrains.kotlin.scripting.definitions.getEnvironment import java.io.File import java.util.concurrent.locks.ReentrantReadWriteLock import kotlin.concurrent.write @@ -42,6 +45,8 @@ class ScriptTemplatesFromDependenciesProvider(project: Project) : AsyncScriptDef override val progressMessage = "Kotlin: scanning dependencies for script definitions..." override fun loadScriptDefinitions(previous: List?): List { + if (project.isDefault) return emptyList() + val templatesCopy = templatesLock.write { val newTemplates = scriptDefinitionsFromDependencies(project) if (newTemplates != templates) {