fixup! copy KotlinToolingVersion function to debug
diff --git a/compiler/build-tools/kotlin-build-tools-api-tests/build.gradle.kts b/compiler/build-tools/kotlin-build-tools-api-tests/build.gradle.kts index 5e3030c..df06efb 100644 --- a/compiler/build-tools/kotlin-build-tools-api-tests/build.gradle.kts +++ b/compiler/build-tools/kotlin-build-tools-api-tests/build.gradle.kts
@@ -33,11 +33,11 @@ val baseVersionSplit = baseVersion.split(".") 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)") - } + ?: throw IllegalArgumentException("Invalid major version: ${baseVersionSplit[0]} from $baseVersion") + val minorVersion = baseVersionSplit.getOrNull(1)?.let { + it.toIntOrNull() + ?: throw IllegalArgumentException("Invalid minor version: $it from $baseVersion") + } ?: throw IllegalStateException("Minor version not found in $baseVersion") return KotlinToolingVersion( major = majorVersion,
diff --git a/libraries/tools/kotlin-tooling-core/src/main/kotlin/org/jetbrains/kotlin/tooling/core/KotlinToolingVersion.kt b/libraries/tools/kotlin-tooling-core/src/main/kotlin/org/jetbrains/kotlin/tooling/core/KotlinToolingVersion.kt index 81d8d69..34c93ce 100644 --- a/libraries/tools/kotlin-tooling-core/src/main/kotlin/org/jetbrains/kotlin/tooling/core/KotlinToolingVersion.kt +++ b/libraries/tools/kotlin-tooling-core/src/main/kotlin/org/jetbrains/kotlin/tooling/core/KotlinToolingVersion.kt
@@ -23,10 +23,6 @@ ?: throw IllegalArgumentException("Invalid minor version: $it from $baseVersion") } ?: throw IllegalStateException("Minor version not found in $baseVersion") - if (majorVersion == null || minorVersion == null) { - throw IllegalArgumentException("Invalid Kotlin version: $kotlinVersionString (Failed parsing major/minor version)") - } - return KotlinToolingVersion( major = majorVersion, minor = minorVersion,