azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do no try to find script definitions for default project

Browse Source 
This may happen when user opens Kotlin Scripting Settings
^KT-32401 Fixed
This commit is contained in:
Natalia Selezneva
2019-09-26 15:11:29 +03:00
parent 1e80c03d41
commit 5ab119ecfb
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/script/scriptsTemplatesFromDependencies.kt
+6 -1
View File
@@ -14,7 +14,10 @@ import com.intellij.openapi.vfs.JarFileSystem
import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFile
import org.jetbrains.kotlin.idea.core.script.loadDefinitionsFromTemplates import org.jetbrains.kotlin.idea.core.script.loadDefinitionsFromTemplates
import org.jetbrains.kotlin.idea.util.projectStructure.allModules 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.io.File
import java.util.concurrent.locks.ReentrantReadWriteLock import java.util.concurrent.locks.ReentrantReadWriteLock
import kotlin.concurrent.write import kotlin.concurrent.write
@@ -42,6 +45,8 @@ class ScriptTemplatesFromDependenciesProvider(project: Project) : AsyncScriptDef
override val progressMessage = "Kotlin: scanning dependencies for script definitions..." override val progressMessage = "Kotlin: scanning dependencies for script definitions..."
override fun loadScriptDefinitions(previous: List<ScriptDefinition>?): List<ScriptDefinition> { override fun loadScriptDefinitions(previous: List<ScriptDefinition>?): List<ScriptDefinition> {
if (project.isDefault) return emptyList()
val templatesCopy = templatesLock.write { val templatesCopy = templatesLock.write {
val newTemplates = scriptDefinitionsFromDependencies(project) val newTemplates = scriptDefinitionsFromDependencies(project)
if (newTemplates != templates) { if (newTemplates != templates) {