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

Do not highlight semantics in files not under module content

Browse Source 
Related to KT-18221
This commit is contained in:
Mikhail Glukhikh
2017-06-13 21:27:07 +03:00
parent 2a1c101350
commit 7734ec3bd5
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingUtil.kt
+5 -1
View File
@@ -17,6 +17,8 @@
package org.jetbrains.kotlin.idea.highlighter package org.jetbrains.kotlin.idea.highlighter
import com.intellij.psi.PsiElement 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.idea.util.ProjectRootsUtil
import org.jetbrains.kotlin.psi.KtCodeFragment import org.jetbrains.kotlin.psi.KtCodeFragment
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
@@ -24,7 +26,9 @@ import org.jetbrains.kotlin.psi.KtFile
object KotlinHighlightingUtil { object KotlinHighlightingUtil {
fun shouldHighlight(psiElement: PsiElement): Boolean { fun shouldHighlight(psiElement: PsiElement): Boolean {
val ktFile = psiElement.containingFile as? KtFile ?: return false 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 { fun shouldHighlightErrors(psiElement: PsiElement): Boolean {