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

Remove platform comparisons based on string dictionary order (KT-30356)

Browse Source 
Comparison was changed in https://github.com/JetBrains/kotlin/commit/fac356c690891236dc7a97d82c2a6a8e1d33bcfd#diff-0895a6eaf69b9fd4d43f83db9889d103R109

 #KT-30356 Fixed

Original commit: 03c6e23448
This commit is contained in:
Nikolay Krasko
2019-04-03 14:34:03 +03:00
parent d7b2901448
commit 4d473389a2
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-common/src/org/jetbrains/kotlin/platform/impl/JvmIdePlatformKind.kt
+5 -1
View File
@@ -4,8 +4,10 @@
*/
@file:JvmName("JvmIdePlatformUtil")
package org.jetbrains.kotlin.platform.impl
import com.intellij.util.text.VersionComparatorUtil
import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
import org.jetbrains.kotlin.config.JvmTarget
@@ -18,7 +20,9 @@ object JvmIdePlatformKind : IdePlatformKind<JvmIdePlatformKind>() {
override fun platformByCompilerArguments(arguments: CommonCompilerArguments): IdePlatform<JvmIdePlatformKind, CommonCompilerArguments>? {
return if (arguments is K2JVMCompilerArguments) {
val jvmTarget = arguments.jvmTarget ?: JvmTarget.DEFAULT.description
JvmIdePlatformKind.platforms.firstOrNull { it.version.description >= jvmTarget }
platforms.firstOrNull { platform ->
VersionComparatorUtil.COMPARATOR.compare(platform.version.description, jvmTarget) >= 0
}
} else null
}