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

Backport ScriptSeverity.FATAL to old script API

Browse Source 
(cherry picked from commit dceb063)
This commit is contained in:
Natalia Selezneva
2018-05-10 13:12:55 +03:00
parent 41653e9a50
commit 9535c82149
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.script/src/org/jetbrains/kotlin/script/legacyWrappers.kt
+2
View File
@@ -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
compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptTemplate.kt
+1 -1
View File
@@ -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?>?,
core/script.runtime/src/kotlin/script/dependencies/resolvers_deprecated.kt
+1 -1
View File
@@ -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?,
libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptUtil.kt
+3 -2
View File
@@ -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