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

Restore find script definition behaviour (mostly) and relevant comments broken with refactoring

Browse Source
This commit is contained in:
Ilya Chernikov
2019-02-25 11:57:13 +01:00
parent 6b792c36f0
commit b1ab2ead61
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/psi/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionProvider.kt
+6 -2
View File
@@ -40,7 +40,8 @@ interface ScriptDefinitionProvider {
} }
fun PsiFile.scriptDefinition(): KotlinScriptDefinition? { fun PsiFile.scriptDefinition(): KotlinScriptDefinition? {
if (this !is KtFile || this.script == null) return null // Do not use psiFile.script, see comments in findScriptDefinition
if (this !is KtFile/* || this.script == null*/) return null
val file = virtualFile ?: originalFile.virtualFile ?: return null val file = virtualFile ?: originalFile.virtualFile ?: return null
if (file.isNonScript()) return null if (file.isNonScript()) return null
@@ -49,7 +50,10 @@ fun PsiFile.scriptDefinition(): KotlinScriptDefinition? {
fun findScriptDefinition(file: VirtualFile, project: Project): KotlinScriptDefinition? { fun findScriptDefinition(file: VirtualFile, project: Project): KotlinScriptDefinition? {
if (file.isNonScript()) return null if (file.isNonScript()) return null
if ((PsiManager.getInstance(project).findFile(file) as? KtFile)?.script == null) return null // Do not use psiFile.script here because this method can be called during indexes access
// and accessing stubs may cause deadlock
// TODO: measure performace effect and if necessary consider detecting indexing here or using separate logic for non-IDE operations to speed up filtering
if ((PsiManager.getInstance(project).findFile(file) as? KtFile)/*?.script*/ == null) return null
return scriptDefinitionByFileName(project, file.name) return scriptDefinitionByFileName(project, file.name)
} }