Suppress deprecation warnings related to scripting

This commit is contained in:
Alexander Udalov
2020-08-14 12:21:04 +02:00
parent 549ee84687
commit 1d15a5547d
14 changed files with 26 additions and 7 deletions
@@ -19,7 +19,6 @@ import kotlin.script.experimental.host.ScriptingHostConfiguration
import kotlin.script.experimental.host.getScriptingClass
import kotlin.script.experimental.jvm.compat.mapToLegacyExpectedLocations
import kotlin.script.experimental.jvm.impl.BridgeDependenciesResolver
import kotlin.script.experimental.location.ScriptExpectedLocation
import kotlin.script.experimental.util.getOrError
// temporary trick with passing Any as a template and overwriting it below, TODO: fix after introducing new script definitions hierarchy
@@ -82,9 +81,12 @@ abstract class KotlinScriptDefinitionAdapterFromNewAPIBase : KotlinScriptDefinit
.orEmpty()
@Suppress("DEPRECATION")
override val scriptExpectedLocations: List<ScriptExpectedLocation>
override val scriptExpectedLocations: List<kotlin.script.experimental.location.ScriptExpectedLocation>
get() = scriptCompilationConfiguration[ScriptCompilationConfiguration.ide.acceptedLocations]?.mapToLegacyExpectedLocations()
?: listOf(ScriptExpectedLocation.SourcesOnly, ScriptExpectedLocation.TestsOnly)
?: listOf(
kotlin.script.experimental.location.ScriptExpectedLocation.SourcesOnly,
kotlin.script.experimental.location.ScriptExpectedLocation.TestsOnly
)
private val scriptingClassGetter by lazy(LazyThreadSafetyMode.PUBLICATION) {
hostConfiguration[ScriptingHostConfiguration.getScriptingClass]
@@ -55,6 +55,7 @@ abstract class LazyScriptDefinitionProvider : ScriptDefinitionProvider {
cachedDefinitions.firstOrNull { it.isScript(script) }
}
@Suppress("OverridingDeprecatedMember", "DEPRECATION")
override fun findScriptDefinition(fileName: String): KotlinScriptDefinition? =
if (nonScriptId(fileName)) null
else lock.read {
@@ -67,6 +68,7 @@ abstract class LazyScriptDefinitionProvider : ScriptDefinitionProvider {
cachedDefinitions.map { it.fileExtension }
}
@Suppress("OverridingDeprecatedMember", "DEPRECATION")
override fun getDefaultScriptDefinition(): KotlinScriptDefinition = getDefaultDefinition().legacyDefinition
companion object {
@@ -34,6 +34,7 @@ class ScriptCompilationConfigurationFromDefinition(
providedProperties.putIfAny(scriptDefinition.providedProperties.map { it.first to KotlinType(it.second) })
annotationsForSamWithReceivers.put(scriptDefinition.annotationsForSamWithReceivers.map(::KotlinType))
platform(scriptDefinition.platform)
@Suppress("DEPRECATION")
compilerOptions.putIfAny(scriptDefinition.additionalCompilerArguments)
ide {
acceptedLocations.put(scriptDefinition.scriptExpectedLocations.mapLegacyExpectedLocations())
@@ -19,13 +19,14 @@ import kotlin.script.experimental.dependencies.ScriptDependencies
open class ScriptDependenciesProvider constructor(
protected val project: Project
) {
@Suppress("DEPRECATION")
@Deprecated("Migrating to configuration refinement", level = DeprecationLevel.ERROR)
fun getScriptDependencies(file: VirtualFile): ScriptDependencies? {
val ktFile = PsiManager.getInstance(project).findFile(file) as? KtFile ?: return null
return getScriptConfiguration(ktFile)?.legacyDependencies
}
@Suppress("DEPRECATION")
@Deprecated("Migrating to configuration refinement", level = DeprecationLevel.ERROR)
fun getScriptDependencies(file: PsiFile): ScriptDependencies? {
if (file !is KtFile) return null