From c73885142a632cc5781be0cb4ae1028f6c87eefa Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Fri, 12 Oct 2018 12:30:08 +0300 Subject: [PATCH] Do not access stubs in dumb mode finding script definition --- .../kotlin/script/KotlinScriptDefinitionProvider.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/compiler/psi/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionProvider.kt b/compiler/psi/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionProvider.kt index 61a77a55312..e230d2d71e8 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionProvider.kt +++ b/compiler/psi/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionProvider.kt @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.script import com.intellij.ide.highlighter.JavaClassFileType import com.intellij.ide.highlighter.JavaFileType import com.intellij.openapi.components.ServiceManager +import com.intellij.openapi.project.DumbService import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.PsiFile @@ -52,10 +53,10 @@ fun findScriptDefinition(file: VirtualFile, project: Project): KotlinScriptDefin val psiFile = PsiManager.getInstance(project).findFile(file) if (psiFile != null) { - if (psiFile !is KtFile || !psiFile.isScript()) { - return null + if (psiFile !is KtFile) return null + if (!DumbService.isDumb(project)) { + return psiFile.script?.kotlinScriptDefinition?.value } - return psiFile.script?.kotlinScriptDefinition?.value } return ScriptDefinitionProvider.getInstance(project).findScriptDefinition(file.name)