From 7734ec3bd53f3e225f6ba18f7ea87bd4d7c890b2 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Tue, 13 Jun 2017 21:27:07 +0300 Subject: [PATCH] Do not highlight semantics in files not under module content Related to KT-18221 --- .../kotlin/idea/highlighter/KotlinHighlightingUtil.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 4ddc65e4bdb..d566d2c7ed1 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 @@ -17,6 +17,8 @@ package org.jetbrains.kotlin.idea.highlighter import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.idea.caches.resolve.NotUnderContentRootModuleInfo +import org.jetbrains.kotlin.idea.caches.resolve.getModuleInfo import org.jetbrains.kotlin.idea.util.ProjectRootsUtil import org.jetbrains.kotlin.psi.KtCodeFragment import org.jetbrains.kotlin.psi.KtFile @@ -24,7 +26,9 @@ 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.context != null) || ktFile.isScript || ProjectRootsUtil.isInProjectOrLibraryContent(ktFile) + return ktFile is KtCodeFragment && ktFile.context != null || + ktFile.isScript || + ProjectRootsUtil.isInProjectOrLibraryContent(ktFile) && ktFile.getModuleInfo() !is NotUnderContentRootModuleInfo } fun shouldHighlightErrors(psiElement: PsiElement): Boolean {