From 9535c8214967f51b31bab8160088570d8e59d58c Mon Sep 17 00:00:00 2001
From: Natalia Selezneva <natalia.selezneva@jetbrains.com>
Date: Thu, 10 May 2018 13:12:55 +0300
Subject: [PATCH] Backport ScriptSeverity.FATAL to old script API

(cherry picked from commit dceb063)
---
 .../src/org/jetbrains/kotlin/script/legacyWrappers.kt        | 2 ++
 .../src/org/jetbrains/kotlin/script/scriptTemplate.kt        | 2 +-
 .../src/kotlin/script/dependencies/resolvers_deprecated.kt   | 2 +-
 .../jvm/src/kotlin/script/experimental/jvm/jvmScriptUtil.kt  | 5 +++--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/compiler/frontend.script/src/org/jetbrains/kotlin/script/legacyWrappers.kt b/compiler/frontend.script/src/org/jetbrains/kotlin/script/legacyWrappers.kt
index cd599450845..4e5ac4b7b31 100644
--- a/compiler/frontend.script/src/org/jetbrains/kotlin/script/legacyWrappers.kt
+++ b/compiler/frontend.script/src/org/jetbrains/kotlin/script/legacyWrappers.kt
@@ -64,6 +64,7 @@ internal class LegacyPackageDependencyResolverWrapper(
     }
 
     private fun ScriptDependenciesResolver.ReportSeverity.convertSeverity(): ScriptReport.Severity  = when(this) {
+        ScriptDependenciesResolver.ReportSeverity.FATAL -> ScriptReport.Severity.FATAL
         ScriptDependenciesResolver.ReportSeverity.ERROR -> ScriptReport.Severity.ERROR
         ScriptDependenciesResolver.ReportSeverity.WARNING -> ScriptReport.Severity.WARNING
         ScriptDependenciesResolver.ReportSeverity.INFO -> ScriptReport.Severity.INFO
@@ -107,6 +108,7 @@ internal class ApiChangeDependencyResolverWrapper(
     }
 
     private fun kotlin.script.dependencies.ScriptDependenciesResolver.ReportSeverity.convertSeverity(): ScriptReport.Severity = when (this) {
+        kotlin.script.dependencies.ScriptDependenciesResolver.ReportSeverity.FATAL -> ScriptReport.Severity.FATAL
         kotlin.script.dependencies.ScriptDependenciesResolver.ReportSeverity.ERROR -> ScriptReport.Severity.ERROR
         kotlin.script.dependencies.ScriptDependenciesResolver.ReportSeverity.WARNING -> ScriptReport.Severity.WARNING
         kotlin.script.dependencies.ScriptDependenciesResolver.ReportSeverity.INFO -> ScriptReport.Severity.INFO
diff --git a/compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptTemplate.kt b/compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptTemplate.kt
index 0be16d29ed9..53c5dac9991 100644
--- a/compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptTemplate.kt
+++ b/compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptTemplate.kt
@@ -65,7 +65,7 @@ fun KotlinScriptExternalDependencies?.asFuture(): PseudoFuture<KotlinScriptExter
             replaceWith = ReplaceWith("kotlin.script.dependencies.ScriptDependenciesResolver"))
 interface ScriptDependenciesResolver {
 
-    enum class ReportSeverity { ERROR, WARNING, INFO, DEBUG }
+    enum class ReportSeverity { FATAL, ERROR, WARNING, INFO, DEBUG }
 
     fun resolve(script: ScriptContents,
                 environment: Map<String, Any?>?,
diff --git a/core/script.runtime/src/kotlin/script/dependencies/resolvers_deprecated.kt b/core/script.runtime/src/kotlin/script/dependencies/resolvers_deprecated.kt
index 7cdca90c6f4..0ea902979c8 100644
--- a/core/script.runtime/src/kotlin/script/dependencies/resolvers_deprecated.kt
+++ b/core/script.runtime/src/kotlin/script/dependencies/resolvers_deprecated.kt
@@ -26,7 +26,7 @@ typealias Environment = Map<String, Any?>
 
 interface ScriptDependenciesResolver {
 
-    enum class ReportSeverity { ERROR, WARNING, INFO, DEBUG }
+    enum class ReportSeverity { FATAL, ERROR, WARNING, INFO, DEBUG }
 
     fun resolve(script: ScriptContents,
                 environment: Environment?,
diff --git a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptUtil.kt b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptUtil.kt
index 850b5a4a9ee..d5c005851f1 100644
--- a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptUtil.kt
+++ b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptUtil.kt
@@ -7,13 +7,14 @@
 
 package kotlin.script.experimental.jvm
 
-import kotlin.script.experimental.api.ScriptDiagnostic
-import kotlin.script.experimental.api.ScriptSource
 import kotlin.script.dependencies.ScriptContents
 import kotlin.script.dependencies.ScriptDependenciesResolver
+import kotlin.script.experimental.api.ScriptDiagnostic
+import kotlin.script.experimental.api.ScriptSource
 import kotlin.script.experimental.dependencies.ScriptReport
 
 fun mapLegacyDiagnosticSeverity(severity: ScriptDependenciesResolver.ReportSeverity): ScriptDiagnostic.Severity = when (severity) {
+    ScriptDependenciesResolver.ReportSeverity.FATAL -> ScriptDiagnostic.Severity.FATAL
     ScriptDependenciesResolver.ReportSeverity.ERROR -> ScriptDiagnostic.Severity.ERROR
     ScriptDependenciesResolver.ReportSeverity.WARNING -> ScriptDiagnostic.Severity.WARNING
     ScriptDependenciesResolver.ReportSeverity.INFO -> ScriptDiagnostic.Severity.INFO