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

Append for commit: switch ScriptReportSink to new scripting API

Browse Source 
Commit hash e4d0c2cb0e
This commit is contained in:
Natalia Selezneva
2019-07-12 16:19:56 +03:00
parent 63767b4dca
commit 4fed624942
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingUtil.kt
+2 -2
View File
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.idea.util.ProjectRootsUtil
import org.jetbrains.kotlin.idea.util.isRunningInCidrIde import org.jetbrains.kotlin.idea.util.isRunningInCidrIde
import org.jetbrains.kotlin.psi.KtCodeFragment import org.jetbrains.kotlin.psi.KtCodeFragment
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import kotlin.script.experimental.dependencies.ScriptReport import kotlin.script.experimental.api.ScriptDiagnostic
object KotlinHighlightingUtil { object KotlinHighlightingUtil {
fun shouldHighlight(psiElement: PsiElement): Boolean { fun shouldHighlight(psiElement: PsiElement): Boolean {
@@ -71,7 +71,7 @@ object KotlinHighlightingUtil {
private fun shouldHighlightScript(ktFile: KtFile): Boolean { private fun shouldHighlightScript(ktFile: KtFile): Boolean {
if (isRunningInCidrIde) return false // There is no Java support in CIDR. So do not highlight errors in KTS if running in CIDR. if (isRunningInCidrIde) return false // There is no Java support in CIDR. So do not highlight errors in KTS if running in CIDR.
if (!ScriptsCompilationConfigurationUpdater.areDependenciesCached(ktFile)) return false if (!ScriptsCompilationConfigurationUpdater.areDependenciesCached(ktFile)) return false
if (IdeScriptReportSink.getReports(ktFile.virtualFile).any { it.severity == ScriptReport.Severity.FATAL }) { if (IdeScriptReportSink.getReports(ktFile.virtualFile).any { it.severity == ScriptDiagnostic.Severity.FATAL }) {
return false return false
} }
idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt
+2 -2
View File
@@ -51,7 +51,7 @@ import org.junit.ComparisonFailure
import java.io.File import java.io.File
import java.util.regex.Pattern import java.util.regex.Pattern
import kotlin.script.dependencies.Environment import kotlin.script.dependencies.Environment
import kotlin.script.experimental.dependencies.ScriptReport import kotlin.script.experimental.api.ScriptDiagnostic
abstract class AbstractScriptConfigurationHighlightingTest : AbstractScriptConfigurationTest() { abstract class AbstractScriptConfigurationHighlightingTest : AbstractScriptConfigurationTest() {
@@ -351,7 +351,7 @@ abstract class AbstractScriptConfigurationTest : KotlinCompletionTestCase() {
// This is needed because updateScriptDependencies invalidates psiFile that was stored in myFile field // This is needed because updateScriptDependencies invalidates psiFile that was stored in myFile field
myFile = psiManager.findFile(script) myFile = psiManager.findFile(script)
val isFatalErrorPresent = IdeScriptReportSink.getReports(script).any { it.severity == ScriptReport.Severity.FATAL } val isFatalErrorPresent = IdeScriptReportSink.getReports(script).any { it.severity == ScriptDiagnostic.Severity.FATAL }
assert(isFatalErrorPresent || KotlinHighlightingUtil.shouldHighlight(myFile)) { assert(isFatalErrorPresent || KotlinHighlightingUtil.shouldHighlight(myFile)) {
"Highlighting is switched off for ${myFile.virtualFile.path}" "Highlighting is switched off for ${myFile.virtualFile.path}"
} }