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

[Compatibility] Restore KotlinFacetSettings.getTargetPlatform()

Browse Source
This commit is contained in:
Dmitry Savvinov
2019-05-23 13:07:00 +03:00
parent 716e55d171
commit ef39e2a68f
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt
+11
View File
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.cli.common.arguments.parseCommandLineArguments
import org.jetbrains.kotlin.platform.IdePlatformKind
import org.jetbrains.kotlin.platform.TargetPlatformVersion
import org.jetbrains.kotlin.platform.TargetPlatform
import org.jetbrains.kotlin.platform.compat.toIdePlatform
import org.jetbrains.kotlin.utils.DescriptionAware
@Deprecated("Use IdePlatformKind instead.", level = DeprecationLevel.ERROR)
@@ -194,6 +195,16 @@ class KotlinFacetSettings {
return IdePlatformKind.platformByCompilerArguments(compilerArguments)
}
@Suppress("DEPRECATION_ERROR")
@Deprecated(
message = "This accessor is deprecated and will be removed soon, use API from 'org.jetbrains.kotlin.platform.*' packages instead",
replaceWith = ReplaceWith("targetPlatform"),
level = DeprecationLevel.ERROR
)
fun getPlatform(): org.jetbrains.kotlin.platform.IdePlatform<*, *>? {
return platform?.toIdePlatform()
}
var coroutineSupport: LanguageFeature.State?
get() {
val languageVersion = languageLevel ?: return LanguageFeature.Coroutines.defaultState
idea/idea-jps-common/src/org/jetbrains/kotlin/platform/compat/compatConversions.kt
+10 -1
View File
@@ -7,6 +7,7 @@
package org.jetbrains.kotlin.platform.compat
import org.jetbrains.kotlin.config.JvmTarget
import org.jetbrains.kotlin.platform.CommonPlatforms
import org.jetbrains.kotlin.platform.IdePlatform
import org.jetbrains.kotlin.platform.impl.CommonIdePlatformKind
@@ -46,7 +47,6 @@ fun OldPlatform.toNewPlatform(): NewPlatform = when (this) {
)
}
fun IdePlatform<*, *>.toNewPlatform(): NewPlatform = when (this) {
is CommonIdePlatformKind.Platform -> CommonPlatforms.defaultCommonPlatform
is JvmIdePlatformKind.Platform -> JvmPlatforms.jvmPlatformByTargetVersion(this.version)
@@ -54,3 +54,12 @@ fun IdePlatform<*, *>.toNewPlatform(): NewPlatform = when (this) {
is NativeIdePlatformKind.Platform -> KonanPlatforms.defaultKonanPlatform
else -> error("Unknown platform $this")
}
fun NewPlatform.toIdePlatform(): IdePlatform<*, *> = when (val single = singleOrNull()) {
null -> CommonIdePlatformKind.Platform
is JdkPlatform -> JvmIdePlatformKind.Platform(single.targetVersion)
is JvmPlatform -> JvmIdePlatformKind.Platform(JvmTarget.DEFAULT)
is JsPlatform -> JsIdePlatformKind.Platform
is KonanPlatform -> NativeIdePlatformKind.Platform
else -> error("Unknown platform $single")
}