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

Only fail parsing KotlinToolingVersion if parsing major or minor fails

Browse Source 
^KT-54301 Verification Pending
This commit is contained in:
Sebastian Sellmair
2022-10-05 15:08:00 +02:00
committed by Space Team
parent 05016596df
commit 127c5120dd
2 changed files with 86 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-tooling-core/src/main/kotlin/org/jetbrains/kotlin/tooling/core/KotlinToolingVersion.kt
+15 -8
View File
@@ -11,18 +11,22 @@ import java.io.Serializable
import java.util.*
fun KotlinToolingVersion(kotlinVersionString: String): KotlinToolingVersion {
fun throwInvalid(reason: String): Nothing = throw IllegalArgumentException("Invalid Kotlin version: $kotlinVersionString ($reason)")
val baseVersion = kotlinVersionString.split("-", limit = 2)[0]
val classifier = kotlinVersionString.split("-", limit = 2).getOrNull(1)
val baseVersionSplit = baseVersion.split(".")
if (!(baseVersionSplit.size == 2 || baseVersionSplit.size == 3)) throwInvalid("Expected 2 or 3 '.' separated parts")
val majorVersion = baseVersionSplit[0].toIntOrNull()
val minorVersion = baseVersionSplit.getOrNull(1)?.toIntOrNull()
if (majorVersion == null || minorVersion == null) {
throw IllegalArgumentException("Invalid Kotlin version: $kotlinVersionString (Failed parsing major/minor version)")
}
return KotlinToolingVersion(
major = baseVersionSplit[0].toIntOrNull() ?: throwInvalid("Failed parsing major version"),
minor = baseVersionSplit[1].toIntOrNull() ?: throwInvalid("Failed parsing minor version"),
patch = baseVersionSplit.getOrNull(2)?.let { it.toIntOrNull() ?: throwInvalid("Failed parsing patch version") } ?: 0,
major = majorVersion,
minor = minorVersion,
patch = baseVersionSplit.getOrNull(2)?.toIntOrNull() ?: 0,
classifier = classifier
)
}
@@ -31,6 +35,10 @@ fun KotlinToolingVersion(kotlinVersion: KotlinVersion, classifier: String? = nul
return KotlinToolingVersion(kotlinVersion.major, kotlinVersion.minor, kotlinVersion.patch, classifier)
}
@Deprecated(
"Use KotlinToolingVersion instead. Scheduled for removal with Kotlin 1.9",
replaceWith = ReplaceWith("KotlinToolingVersion(kotlinVersionString)")
)
fun KotlinToolingVersionOrNull(kotlinVersionString: String): KotlinToolingVersion? {
return try {
KotlinToolingVersion(kotlinVersionString)
@@ -59,8 +67,7 @@ class KotlinToolingVersion(
classifier.matches(Regex("""beta(\d*)?(-release)?(-?\d+)?""")) -> Maturity.BETA
classifier.matches(Regex("""alpha(\d*)?(-release)?(-?\d+)?""")) -> Maturity.ALPHA
classifier.matches(Regex("""m\d+(-release)?(-\d+)?""")) -> Maturity.MILESTONE
classifier.matches(Regex("""([a-zA-Z]{3,})(-[a-zA-Z]\w*)*(-\d+)?""")) -> Maturity.DEV
else -> throw IllegalArgumentException("Can't infer maturity of KotlinVersion $this")
else -> Maturity.DEV
}
}
libraries/tools/kotlin-tooling-core/src/test/kotlin/org/jetbrains/kotlin/tooling/core/KotlinToolingVersionTest.kt
+71 -32
View File
@@ -167,37 +167,32 @@ class KotlinToolingVersionTest {
assertMaturity(DEV, "1.8.0-one-a1-b2-2022")
assertMaturity(DEV, "1.8.0-temporary-999")
assertMaturity(DEV, "1.8.0-snapshot-42", "Looks strange but snapshot is rather special to allow more usages")
assertMaturity(null, "1.8.0-dev-", "Forbid dash at the end")
assertMaturity(null, "1.8.0-t-1000", "Forbid too short first classifier")
assertMaturity(null, "1.8.0-no-1", "First classifier should be strictly longer than 2 letters")
assertMaturity(null, "1.8.0-dev----999", "Forbid many dashes in a row")
assertMaturity(null, "1.8.0-999-0", "Forbid fully digit classifier")
assertMaturity(null, "1.8.0-some-5-0", "Forbid fully digit second classifier")
assertMaturity(DEV, "1.8.0-dev-")
assertMaturity(DEV, "1.8.0-t-1000")
assertMaturity(DEV, "1.8.0-no-1")
assertMaturity(DEV, "1.8.0-dev----999")
assertMaturity(DEV, "1.8.0-999-0")
assertMaturity(DEV, "1.8.0-some-5-0")
}
@Test
fun maturityWithAdditionalReleaseSuffix() {
assertMaturity(MILESTONE, "1.6.20-M1-release")
assertMaturity(null, "1.6.20-M1-release1")
assertMaturity(DEV, "1.6.20-M1-release1")
assertMaturity(MILESTONE, "1.6.20-M1-release-22")
assertMaturity(null, "1.6.20-M1-release-", "Forbid handling dash")
assertMaturity(DEV, "1.6.20-M1-release-")
assertMaturity(ALPHA, "1.6.20-alpha-release")
assertMaturity(ALPHA, "1.6.20-alpha-release1")
assertMaturity(ALPHA, "1.6.20-alpha-release39")
assertMaturity(null, "1.6.20-alpha-release-", "Forbid handling dash")
assertMaturity(DEV, "1.6.20-alpha-release-")
assertMaturity(BETA, "1.6.20-beta2-release")
assertMaturity(BETA, "1.6.20-beta2-release1")
assertMaturity(BETA, "1.6.20-beta2-release-1")
assertMaturity(null, "1.6.20-beta2-release-", "Forbid handling dash")
assertMaturity(DEV, "1.6.20-beta2-release-")
assertMaturity(RC, "1.6.20-rc1-release")
assertMaturity(RC, "1.6.20-rc1-release1")
assertMaturity(RC, "1.6.20-rc1-release-1")
assertMaturity(null, "1.6.20-rc1-release-", "Forbid handling dash")
}
@Test
fun invalidMilestoneVersion() {
assertMaturity(null, "1.6.20-M")
assertMaturity(DEV, "1.6.20-rc1-release-")
}
@Test
@@ -310,14 +305,69 @@ class KotlinToolingVersionTest {
)
}
@Suppress("deprecation")
@Test
fun illegalVersionString() {
assertFailsWith<IllegalArgumentException> { KotlinToolingVersion("x") }
assertFailsWith<IllegalArgumentException> { KotlinToolingVersion("1.6.20.1") }
assertFailsWith<IllegalArgumentException> { KotlinToolingVersion("x.") }
assertFailsWith<IllegalArgumentException> { KotlinToolingVersion("1.") }
assertFailsWith<IllegalArgumentException> { KotlinToolingVersion("1.x") }
assertFailsWith<IllegalArgumentException> { KotlinToolingVersion("x.1") }
assertNull(KotlinToolingVersionOrNull(""))
assertNull(KotlinToolingVersionOrNull("x"))
assertNull(KotlinToolingVersionOrNull("1.6.20.1"))
assertNull(KotlinToolingVersionOrNull("1.6.20-x"))
}
@Test
fun testBehaviourInEdgeCases() {
KotlinToolingVersion("1.6.20.1").apply {
assertEquals(STABLE, maturity)
assertEquals(1, major)
assertEquals(6, minor)
assertEquals(20, patch)
assertNull(classifier)
assertNull(classifierNumber)
assertNull(buildNumber)
}
KotlinToolingVersion("1.6-x").apply {
assertEquals(DEV, maturity)
assertEquals(1, major)
assertEquals(6, minor)
assertEquals(0, patch)
assertEquals("x", classifier)
assertNull(classifierNumber)
assertNull(buildNumber)
}
KotlinToolingVersion("1.8.0-dev----999").apply {
assertEquals(DEV, maturity)
assertEquals(1, major)
assertEquals(8, minor)
assertEquals(0, patch)
assertEquals("dev----999", classifier)
assertNull(classifierNumber)
assertEquals(999, buildNumber)
}
KotlinToolingVersion("1.6.20-dev-google-pr-510").apply {
assertEquals(DEV, maturity)
assertEquals(1, major)
assertEquals(6, minor)
assertEquals(20, patch)
assertEquals("dev-google-pr-510", classifier)
assertNull(classifierNumber)
assertEquals(510, buildNumber)
}
KotlinToolingVersion("1.6.x-dev").apply {
assertEquals(DEV, maturity)
assertEquals(1, major)
assertEquals(6, minor)
assertEquals(0, patch)
assertEquals("dev", classifier)
assertNull(classifierNumber)
assertNull(buildNumber)
}
}
private fun assertBuildNumber(buildNumber: Int?, version: String, message: String? = null) {
@@ -328,18 +378,7 @@ class KotlinToolingVersionTest {
assertEquals(classifierNumber, KotlinToolingVersion(version).classifierNumber, message)
}
private fun assertMaturity(maturity: KotlinToolingVersion.Maturity?, version: String, message: String? = null) {
if (maturity == null) {
val exception = assertFailsWith<IllegalArgumentException>(
"Parsing maturity is expected to be failed for `$version`${message?.let { ". $it" } ?: ""}") {
KotlinToolingVersion(version)
}
assertTrue(
"maturity" in exception.message.orEmpty().toLowerCase(),
"Expected 'maturity' issue mentioned in error message. Found: ${exception.message}"
)
} else {
assertEquals(maturity, KotlinToolingVersion(version).maturity, message)
}
private fun assertMaturity(maturity: KotlinToolingVersion.Maturity, version: String, message: String? = null) {
assertEquals(maturity, KotlinToolingVersion(version).maturity, message)
}
}