From 441fb7ff28b63bb312b2f13a0d9053b6ae97a2ab Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 12 Apr 2016 15:40:53 +0300 Subject: [PATCH] Use correct version detection for developer versions #KT-11213 Fixed --- .../jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt | 2 +- .../kotlin/idea/OutdatedKotlinRuntimeNotificationTest.kt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt index 48b08c3e06f..4e80a104d07 100644 --- a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt @@ -163,7 +163,7 @@ private enum class LibraryJarDescriptor private constructor(val jarName: String, JS_STDLIB_SRC_JAR(PathUtil.JS_LIB_SRC_JAR_NAME, false) } -private val PLUGIN_VERSIONS_SEPARATORS = arrayOf("Idea", "IJ", "release") +private val PLUGIN_VERSIONS_SEPARATORS = arrayOf("Idea", "IJ", "release", "dev") @JvmOverloads fun bundledRuntimeVersion(pluginVersion: String = KotlinPluginUtil.getPluginVersion()): String { var placeToSplit = -1 diff --git a/idea/tests/org/jetbrains/kotlin/idea/OutdatedKotlinRuntimeNotificationTest.kt b/idea/tests/org/jetbrains/kotlin/idea/OutdatedKotlinRuntimeNotificationTest.kt index 4dd86766412..af980413b95 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/OutdatedKotlinRuntimeNotificationTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/OutdatedKotlinRuntimeNotificationTest.kt @@ -54,6 +54,8 @@ class KotlinRuntimeLibraryUtilTest : TestCase() { test("1.0.0-alpha", "1.0.0-alpha") test("1.2.2123-alpha-023", "1.2.2123-alpha-023") test("1.0.0-release-IJ143-75", "1.0.0") + test("1.0.2-eap-10-IJ141-10", "1.0.2-eap-10") + test("1.0.2-dev-825", "1.0.2") test("1.0.1-rc-5-IJ143-7", "1.0.1-rc-5") }