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

Highlight scripts according to ScriptLocation annotation in ScriptDefinition

Browse Source
This commit is contained in:
Natalia Selezneva
2018-03-19 10:53:54 +03:00
parent 15914dac86
commit 3d73786e98
4 changed files with 51 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingUtil.kt
+32 -2
View File
@@ -16,13 +16,19 @@
package org.jetbrains.kotlin.idea.highlighter
import com.intellij.ide.projectView.impl.ProjectRootsUtil.isInTestSource
import com.intellij.ide.scratch.ScratchFileService
import com.intellij.openapi.roots.ProjectRootManager
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.idea.caches.project.NotUnderContentRootModuleInfo
import org.jetbrains.kotlin.idea.caches.project.getModuleInfo
import org.jetbrains.kotlin.idea.core.script.scriptDependencies
import org.jetbrains.kotlin.idea.util.ProjectRootsUtil
import org.jetbrains.kotlin.idea.util.ProjectRootsUtil.isInContent
import org.jetbrains.kotlin.psi.KtCodeFragment
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.script.getScriptDefinition
import kotlin.script.experimental.location.ScriptExpectedLocation
object KotlinHighlightingUtil {
fun shouldHighlight(psiElement: PsiElement): Boolean {
@@ -33,7 +39,7 @@ object KotlinHighlightingUtil {
}
if (ktFile.isScript()) {
return ktFile.virtualFile.scriptDependencies != null
return shouldHighlightScript(ktFile)
}
return ProjectRootsUtil.isInProjectOrLibraryContent(ktFile) && ktFile.getModuleInfo() !is NotUnderContentRootModuleInfo
@@ -49,9 +55,33 @@ object KotlinHighlightingUtil {
}
if (ktFile.isScript()) {
return ktFile.virtualFile.scriptDependencies != null
return shouldHighlightScript(ktFile)
}
return ProjectRootsUtil.isInProjectSource(ktFile)
}
@Suppress("DEPRECATION")
private fun shouldHighlightScript(ktFile: KtFile): Boolean {
if (ScratchFileService.isInScratchRoot(ktFile.virtualFile)) return true
if (ktFile.virtualFile.scriptDependencies == null) return false
val scriptScope = getScriptDefinition(ktFile)?.scriptExpectedLocations ?: return false
return when {
scriptScope.contains(ScriptExpectedLocation.Everywhere) -> true
scriptScope.contains(ScriptExpectedLocation.Project)
&& ProjectRootManager.getInstance(ktFile.project).fileIndex.isInContent(ktFile.virtualFile) -> true
scriptScope.contains(ScriptExpectedLocation.TestsOnly)
&& isInTestSource(ktFile) -> true
else -> return isInContent(
ktFile,
scriptScope.contains(ScriptExpectedLocation.SourcesOnly),
scriptScope.contains(ScriptExpectedLocation.Libraries),
scriptScope.contains(ScriptExpectedLocation.Libraries),
scriptScope.contains(ScriptExpectedLocation.Libraries)
)
}
}
}