From 2cc42ba151d606e1908804468f761ab19fb25260 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 2 Dec 2016 17:35:01 +0300 Subject: [PATCH] Highlight code fragments only when they have a context (part of EA-84233 - assert: GetModuleInfoKt$getModuleInfo$.invoke) --- .../kotlin/idea/highlighter/KotlinHighlightingUtil.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingUtil.kt index 51e6dbf55a0..4ddc65e4bdb 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingUtil.kt @@ -24,11 +24,11 @@ import org.jetbrains.kotlin.psi.KtFile object KotlinHighlightingUtil { fun shouldHighlight(psiElement: PsiElement): Boolean { val ktFile = psiElement.containingFile as? KtFile ?: return false - return ktFile is KtCodeFragment || ktFile.isScript || ProjectRootsUtil.isInProjectOrLibraryContent(ktFile) + return (ktFile is KtCodeFragment && ktFile.context != null) || ktFile.isScript || ProjectRootsUtil.isInProjectOrLibraryContent(ktFile) } fun shouldHighlightErrors(psiElement: PsiElement): Boolean { val ktFile = psiElement.containingFile as? KtFile ?: return false - return ktFile is KtCodeFragment || ktFile.isScript || ProjectRootsUtil.isInProjectSource(ktFile) + return (ktFile is KtCodeFragment && ktFile.context != null) || ktFile.isScript || ProjectRootsUtil.isInProjectSource(ktFile) } } \ No newline at end of file