From c2291ab234f2c0c1b62f750bb1845f2f6b9e98ed Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Thu, 2 Apr 2020 14:13:55 +0700 Subject: [PATCH] JVM, JS: Use faster checks in IdePlatformKind.supportsTargetPlatform() Original commit: 76b0e7994bcb0228903238adfe889e7848efe9e7 --- .../org/jetbrains/kotlin/platform/impl/JsIdePlatformKind.kt | 3 ++- .../org/jetbrains/kotlin/platform/impl/JvmIdePlatformKind.kt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/JsIdePlatformKind.kt b/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/JsIdePlatformKind.kt index 1e73d24561c..6b145c67ceb 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/JsIdePlatformKind.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/JsIdePlatformKind.kt @@ -15,9 +15,10 @@ import org.jetbrains.kotlin.platform.IdePlatformKind import org.jetbrains.kotlin.platform.TargetPlatform import org.jetbrains.kotlin.platform.TargetPlatformVersion import org.jetbrains.kotlin.platform.js.JsPlatforms +import org.jetbrains.kotlin.platform.js.isJs object JsIdePlatformKind : IdePlatformKind() { - override fun supportsTargetPlatform(platform: TargetPlatform): Boolean = platforms.contains(platform) + override fun supportsTargetPlatform(platform: TargetPlatform): Boolean = platform.isJs() override fun platformByCompilerArguments(arguments: CommonCompilerArguments): TargetPlatform? { return if (arguments is K2JSCompilerArguments) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/JvmIdePlatformKind.kt b/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/JvmIdePlatformKind.kt index a0ab9b1af92..125b8313cab 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/JvmIdePlatformKind.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/JvmIdePlatformKind.kt @@ -16,9 +16,10 @@ import org.jetbrains.kotlin.platform.IdePlatform import org.jetbrains.kotlin.platform.IdePlatformKind import org.jetbrains.kotlin.platform.TargetPlatform import org.jetbrains.kotlin.platform.jvm.JvmPlatforms +import org.jetbrains.kotlin.platform.jvm.isJvm object JvmIdePlatformKind : IdePlatformKind() { - override fun supportsTargetPlatform(platform: TargetPlatform): Boolean = platforms.contains(platform) + override fun supportsTargetPlatform(platform: TargetPlatform): Boolean = platform.isJvm() override fun platformByCompilerArguments(arguments: CommonCompilerArguments): TargetPlatform? { if (arguments !is K2JVMCompilerArguments) return null