From 3b11b890e9e23a734a2359831842bcb4bb7cde13 Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Wed, 21 Mar 2018 16:37:25 +0300 Subject: [PATCH] Set FATAL severity for errors from GradleScriptTemplateProvider --- .../idea/core/script/GradleScriptTemplateProvider.kt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/core/script/GradleScriptTemplateProvider.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/core/script/GradleScriptTemplateProvider.kt index abacd4849a0..5d6024b1dd1 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/core/script/GradleScriptTemplateProvider.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/core/script/GradleScriptTemplateProvider.kt @@ -236,14 +236,12 @@ class GradleScriptDefinitionsContributor(private val project: Project) : ScriptD private class ErrorScriptDependenciesResolver(private val message: String? = null) : DependenciesResolver { override fun resolve(scriptContents: ScriptContents, environment: Environment): ResolveResult { - if (ReloadGradleTemplatesOnSync.gradleState.isSyncInProgress) { - return ResolveResult.Failure(ScriptReport("Highlighting is impossible during Gradle Import", ScriptReport.Severity.WARNING)) + val failureMessage = if (ReloadGradleTemplatesOnSync.gradleState.isSyncInProgress) { + "Highlighting is impossible during Gradle Import" + } else { + message ?: "Failed to load script definitions by ${GradleScriptDefinitionsContributor::class.java.name}" } - return ResolveResult.Failure( - ScriptReport( - message ?: "Failed to load script definitions by ${GradleScriptDefinitionsContributor::class.java.name}" - ) - ) + return ResolveResult.Failure(ScriptReport(failureMessage, ScriptReport.Severity.FATAL)) } } }