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

Do not access stubs in dumb mode finding script definition

Browse Source
This commit is contained in:
Natalia Selezneva
2018-10-12 12:30:08 +03:00
parent daa6e9b562
commit c73885142a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/psi/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionProvider.kt
+4 -3
View File
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.script
import com.intellij.ide.highlighter.JavaClassFileType 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.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.PsiFile import com.intellij.psi.PsiFile
@@ -52,10 +53,10 @@ fun findScriptDefinition(file: VirtualFile, project: Project): KotlinScriptDefin
val psiFile = PsiManager.getInstance(project).findFile(file) val psiFile = PsiManager.getInstance(project).findFile(file)
if (psiFile != null) { if (psiFile != null) {
if (psiFile !is KtFile || !psiFile.isScript()) { if (psiFile !is KtFile) return null
return null if (!DumbService.isDumb(project)) {
return psiFile.script?.kotlinScriptDefinition?.value
} }
return psiFile.script?.kotlinScriptDefinition?.value
} }
return ScriptDefinitionProvider.getInstance(project).findScriptDefinition(file.name) return ScriptDefinitionProvider.getInstance(project).findScriptDefinition(file.name)