From 6ea5171f601650a5fa3e1858f5f0e2b46d744bd9 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 25 Jul 2016 18:08:49 +0300 Subject: [PATCH] Add "Studio" as version separator (KT-13184) #KT-13184 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 b1443b8149b..9b4ed728862 100644 --- a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt @@ -166,7 +166,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", "dev") +private val PLUGIN_VERSIONS_SEPARATORS = arrayOf("Idea", "IJ", "release", "dev", "Studio") @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 af980413b95..adaedd77c38 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/OutdatedKotlinRuntimeNotificationTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/OutdatedKotlinRuntimeNotificationTest.kt @@ -57,6 +57,8 @@ class KotlinRuntimeLibraryUtilTest : TestCase() { 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") + + test("1.1-M01-Studio2.2-9", "1.1-M01") } fun testOutdatedRuntime() {