Skip to content

Commit 459d4f3

Browse files
committed
Fix EAP detection regexp for double-digit patch releases
#KT-20331 Fixed
1 parent 0b7055f commit 459d4f3

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ fun isEap(version: String): Boolean {
253253
}
254254

255255
fun useEapRepository(minorKotlinVersion: Int, version: String): Boolean {
256-
return Regex("1\\.$minorKotlinVersion(\\.\\d)?-[A-Za-z][A-Za-z0-9-]*").matches(version) &&
256+
return Regex("1\\.$minorKotlinVersion(\\.\\d\\d?)?-[A-Za-z][A-Za-z0-9-]*").matches(version) &&
257257
!version.startsWith("1.$minorKotlinVersion.0-dev")
258258
}
259259

idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinUtilTest.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ class ConfigureKotlinUtilTest : UsefulTestCase() {
3232
Assert.assertFalse(useEapRepository(1, "1.1.2"))
3333
Assert.assertFalse(useEapRepository(1, "1.1.2-3"))
3434
Assert.assertFalse(useEapRepository(1, "1.1.0-dev-1234"))
35+
Assert.assertTrue(useEapRepository(1, "1.1.50-eap-28"))
36+
Assert.assertFalse(useEapRepository(1, "1.1.50"))
3537
Assert.assertTrue(useEapRepository(2, "1.2-M01"))
3638
Assert.assertTrue(useEapRepository(2, "1.2-M1"))
3739
Assert.assertFalse(useEapRepository(2, "1.2"))

0 commit comments

Comments
 (0)