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

Fix EAP detection regexp for double-digit patch releases

Browse Source 
#KT-20331 Fixed
This commit is contained in:
Dmitry Jemerov
2017-09-20 14:28:40 +02:00
parent 0b7055f7c0
commit 459d4f3ee9
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt
+1 -1
View File
@@ -253,7 +253,7 @@ fun isEap(version: String): Boolean {
} }
fun useEapRepository(minorKotlinVersion: Int, 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") !version.startsWith("1.$minorKotlinVersion.0-dev")
} }
idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinUtilTest.kt
+2
View File
@@ -32,6 +32,8 @@ class ConfigureKotlinUtilTest : UsefulTestCase() {
Assert.assertFalse(useEapRepository(1, "1.1.2")) Assert.assertFalse(useEapRepository(1, "1.1.2"))
Assert.assertFalse(useEapRepository(1, "1.1.2-3")) Assert.assertFalse(useEapRepository(1, "1.1.2-3"))
Assert.assertFalse(useEapRepository(1, "1.1.0-dev-1234")) 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-M01"))
Assert.assertTrue(useEapRepository(2, "1.2-M1")) Assert.assertTrue(useEapRepository(2, "1.2-M1"))
Assert.assertFalse(useEapRepository(2, "1.2")) Assert.assertFalse(useEapRepository(2, "1.2"))