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

Refactor scripting - prepare utilities for refactoring of the script definitions handling

Browse Source
This commit is contained in:
Ilya Chernikov
2019-05-12 22:14:45 +02:00
parent 5efd55f530
commit 4fb2f81134
3 changed files with 64 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/scripting/common/src/kotlin/script/experimental/util/propertiesCollection.kt
+25
View File
@@ -83,6 +83,31 @@ open class PropertiesCollection(private val properties: Map<Key<*>, Any?> = empt
data[this] = v
}
fun <T> PropertiesCollection.Key<T>.putIfNotNull(v: T?) {
if (v != null) {
data[this] = v
}
}
fun <T> PropertiesCollection.Key<in List<T>>.putIfAny(vals: Iterable<T>?) {
if (vals?.any() == true) {
data[this] = if (vals is List) vals else vals.toList()
}
}
@JvmName("putIfAny_map")
fun <K, V> PropertiesCollection.Key<in Map<K, V>>.putIfAny(vals: Iterable<Pair<K, V>>?) {
if (vals?.any() == true) {
data[this] = vals.toMap()
}
}
fun <K, V> PropertiesCollection.Key<in Map<K, V>>.putIfAny(vals: Map<K, V>?) {
if (vals?.isNotEmpty() == true) {
data[this] = vals
}
}
// generic for lists
operator fun <T> PropertiesCollection.Key<in List<T>>.invoke(vararg vals: T) {
libraries/scripting/jvm/src/kotlin/script/experimental/jvm/compat/diagnosticsUtil.kt
+8
View File
@@ -20,6 +20,14 @@ fun mapLegacyDiagnosticSeverity(severity: ScriptDependenciesResolver.ReportSever
ScriptDependenciesResolver.ReportSeverity.DEBUG -> ScriptDiagnostic.Severity.DEBUG
}
fun mapLegacyDiagnosticSeverity(severity: ScriptReport.Severity): ScriptDiagnostic.Severity = when (severity) {
ScriptReport.Severity.FATAL -> ScriptDiagnostic.Severity.FATAL
ScriptReport.Severity.ERROR -> ScriptDiagnostic.Severity.ERROR
ScriptReport.Severity.WARNING -> ScriptDiagnostic.Severity.WARNING
ScriptReport.Severity.INFO -> ScriptDiagnostic.Severity.INFO
ScriptReport.Severity.DEBUG -> ScriptDiagnostic.Severity.DEBUG
}
fun mapToLegacyScriptReportSeverity(severity: ScriptDiagnostic.Severity): ScriptReport.Severity = when (severity) {
ScriptDiagnostic.Severity.FATAL -> ScriptReport.Severity.FATAL
ScriptDiagnostic.Severity.ERROR -> ScriptReport.Severity.ERROR
libraries/scripting/jvm/src/kotlin/script/experimental/jvm/compat/expectedLocationUtil.kt
+31
View File
@@ -0,0 +1,31 @@
/*
* Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package kotlin.script.experimental.jvm.compat
import kotlin.script.experimental.api.ScriptAcceptedLocation
import kotlin.script.experimental.location.ScriptExpectedLocation
@Suppress("DEPRECATION")
fun List<ScriptAcceptedLocation>.mapToLegacyExpectedLocations(): List<ScriptExpectedLocation> = map {
when (it) {
ScriptAcceptedLocation.Sources -> ScriptExpectedLocation.SourcesOnly
ScriptAcceptedLocation.Tests -> ScriptExpectedLocation.TestsOnly
ScriptAcceptedLocation.Libraries -> ScriptExpectedLocation.Libraries
ScriptAcceptedLocation.Project -> ScriptExpectedLocation.Project
ScriptAcceptedLocation.Everywhere -> ScriptExpectedLocation.Everywhere
}
}
@Suppress("DEPRECATION")
fun List<ScriptExpectedLocation>.mapLegacyExpectedLocations(): List<ScriptAcceptedLocation> = map {
when (it) {
ScriptExpectedLocation.SourcesOnly -> ScriptAcceptedLocation.Sources
ScriptExpectedLocation.TestsOnly -> ScriptAcceptedLocation.Tests
ScriptExpectedLocation.Libraries -> ScriptAcceptedLocation.Libraries
ScriptExpectedLocation.Project -> ScriptAcceptedLocation.Project
ScriptExpectedLocation.Everywhere -> ScriptAcceptedLocation.Everywhere
}
}