diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt index 6050707fbec..55499786449 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt @@ -253,7 +253,7 @@ fun isEap(version: String): Boolean { } fun useEapRepository(minorKotlinVersion: Int, version: String): Boolean { - return Regex("1\\.$minorKotlinVersion(\\.\\d)?-[A-Za-z][A-Za-z0-9-]*").matches(version) && + return Regex("1\\.$minorKotlinVersion(\\.\\d\\d?)?-[A-Za-z][A-Za-z0-9-]*").matches(version) && !version.startsWith("1.$minorKotlinVersion.0-dev") } diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinUtilTest.kt b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinUtilTest.kt index 4b8af0399e4..fd31b9fa9d8 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinUtilTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinUtilTest.kt @@ -32,6 +32,8 @@ class ConfigureKotlinUtilTest : UsefulTestCase() { Assert.assertFalse(useEapRepository(1, "1.1.2")) Assert.assertFalse(useEapRepository(1, "1.1.2-3")) Assert.assertFalse(useEapRepository(1, "1.1.0-dev-1234")) + Assert.assertTrue(useEapRepository(1, "1.1.50-eap-28")) + Assert.assertFalse(useEapRepository(1, "1.1.50")) Assert.assertTrue(useEapRepository(2, "1.2-M01")) Assert.assertTrue(useEapRepository(2, "1.2-M1")) Assert.assertFalse(useEapRepository(2, "1.2"))