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

Do not highlight kts files outside source roots if not all definitions are initialized

Browse Source 
^KT-20521 Fixed
^KT-21420 Fixed
This commit is contained in:
Natalia Selezneva
2018-02-12 12:43:03 +03:00
parent e62412398c
commit 63aeaf9cd5
5 changed files with 94 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingUtil.kt
+20 -4
View File
@@ -19,6 +19,7 @@ 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.core.script.scriptDependencies
import org.jetbrains.kotlin.idea.util.ProjectRootsUtil
import org.jetbrains.kotlin.psi.KtCodeFragment
import org.jetbrains.kotlin.psi.KtFile
@@ -26,9 +27,16 @@ 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) && ktFile.getModuleInfo() !is NotUnderContentRootModuleInfo
if (ktFile is KtCodeFragment && ktFile.context != null) {
return true
}
if (ktFile.isScript()) {
return ktFile.virtualFile.scriptDependencies != null
}
return ProjectRootsUtil.isInProjectOrLibraryContent(ktFile) && ktFile.getModuleInfo() !is NotUnderContentRootModuleInfo
}
fun shouldHighlightErrors(psiElement: PsiElement): Boolean {
@@ -36,6 +44,14 @@ object KotlinHighlightingUtil {
if (ktFile.isCompiled) {
return false
}
return (ktFile is KtCodeFragment && ktFile.context != null) || ktFile.isScript() || ProjectRootsUtil.isInProjectSource(ktFile)
if (ktFile is KtCodeFragment && ktFile.context != null) {
return true
}
if (ktFile.isScript()) {
return ktFile.virtualFile.scriptDependencies != null
}
return ProjectRootsUtil.isInProjectSource(ktFile)
}
}