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

Scratch: should always have default script definition

Browse Source
This commit is contained in:
Natalia Selezneva
2019-06-26 09:36:34 +03:00
parent b0c9339dee
commit 4853190752
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt
+9 -1
View File
@@ -20,6 +20,7 @@ import com.intellij.diagnostic.PluginException
import com.intellij.execution.console.IdeConsoleRootType import com.intellij.execution.console.IdeConsoleRootType
import com.intellij.ide.plugins.PluginManagerCore import com.intellij.ide.plugins.PluginManagerCore
import com.intellij.ide.scratch.ScratchFileService import com.intellij.ide.scratch.ScratchFileService
import com.intellij.ide.scratch.ScratchRootType
import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.application.runWriteAction import com.intellij.openapi.application.runWriteAction
import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.components.ServiceManager
@@ -77,7 +78,14 @@ class ScriptDefinitionsManager(private val project: Project) : LazyScriptDefinit
val cached = scriptDefinitionsCacheLock.write { scriptDefinitionsCache.get(file) } val cached = scriptDefinitionsCacheLock.write { scriptDefinitionsCache.get(file) }
if (cached != null) return cached if (cached != null) return cached
val definition = super.findDefinition(file) ?: return null val virtualFile = VfsUtil.findFileByIoFile(file, true)
val definition =
if (virtualFile != null && ScratchFileService.getInstance().getRootType(virtualFile) is ScratchRootType) {
// Scratch should always have default script definition
getDefaultDefinition()
} else {
super.findDefinition(file) ?: return null
}
scriptDefinitionsCacheLock.write { scriptDefinitionsCacheLock.write {
scriptDefinitionsCache.put(file, definition) scriptDefinitionsCache.put(file, definition)