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

Do not use stubs looking for script definition

Browse Source 
Fix EA-128960
This commit is contained in:
Natalia Selezneva
2018-10-30 11:08:26 +03:00
parent 6af9929992
commit 715a5699de
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/psi/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionProvider.kt
+9 -5
View File
@@ -20,7 +20,6 @@ import com.intellij.ide.highlighter.JavaClassFileType
import com.intellij.ide.highlighter.JavaFileType import com.intellij.ide.highlighter.JavaFileType
import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.components.ServiceManager
import com.intellij.openapi.fileTypes.FileTypeRegistry import com.intellij.openapi.fileTypes.FileTypeRegistry
import com.intellij.openapi.project.DumbService
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFile
import com.intellij.psi.PsiManager import com.intellij.psi.PsiManager
@@ -52,15 +51,20 @@ fun findScriptDefinition(file: VirtualFile, project: Project): KotlinScriptDefin
return null return null
} }
val scriptDefinitionProvider = ScriptDefinitionProvider.getInstance(project)
val psiFile = PsiManager.getInstance(project).findFile(file) val psiFile = PsiManager.getInstance(project).findFile(file)
if (psiFile != null) { if (psiFile != null) {
if (psiFile !is KtFile) return null if (psiFile !is KtFile) return null
if (!DumbService.isDumb(project)) {
return psiFile.script?.kotlinScriptDefinition // Do not use psiFile.script here because this method can be called during indexes access
} // and accessing stubs may cause deadlock
// If script definition cannot be find, default script definition is used
// because all KtFile-s with KotlinFileType and non-kts extensions are parsed as scripts
val definition = scriptDefinitionProvider.findScriptDefinition(file.name)
return definition ?: scriptDefinitionProvider.getDefaultScriptDefinition()
} }
return ScriptDefinitionProvider.getInstance(project).findScriptDefinition(file.name) return scriptDefinitionProvider.findScriptDefinition(file.name)
} }
abstract class LazyScriptDefinitionProvider : ScriptDefinitionProvider { abstract class LazyScriptDefinitionProvider : ScriptDefinitionProvider {