[JS, Wasm] Simplify and unify stdlib/kotlin-test version checkers

^KT-82208

Author: ddolovov

compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/diagnostics/LibrarySpecialCompatibilityChecker.kt

@@ -60,24 +60,37 @@ abstract class LibrarySpecialCompatibilityChecker {
         val compilerVersion = Version.parseVersion(getRawCompilerVersion()) ?: return
 
         for (library in libraries) {
-            if (shouldCheckLibrary(library)) {
-                val jarManifest = library.getComponent(JarManifestComponent.Kind)?.jarManifest ?: continue
-                val libraryVersion = Version.parseVersion(jarManifest.mainAttributes.getValue(KLIB_JAR_LIBRARY_VERSION)) ?: continue
+            val checkedLibrary = library.toCheckedLibrary() ?: continue
 
-                val messageToReport = getMessageToReport(compilerVersion, libraryVersion, library)
-                if (messageToReport != null) {
-                    messageCollector.report(CompilerMessageSeverity.ERROR, messageToReport)
-                }
+            val jarManifest = library.getComponent(JarManifestComponent.Kind)?.jarManifest ?: continue
+            val libraryVersion = Version.parseVersion(jarManifest.mainAttributes.getValue(KLIB_JAR_LIBRARY_VERSION)) ?: continue
+
+            val rootCause = when {
+                libraryVersion < compilerVersion ->
+                    "The ${checkedLibrary.platformDisplayName} ${checkedLibrary.libraryDisplayName} library has an older version ($libraryVersion) than the compiler ($compilerVersion). Such a configuration is not supported."
+
+                !libraryVersion.hasSameLanguageVersion(compilerVersion) ->
+                    "The ${checkedLibrary.platformDisplayName} ${checkedLibrary.libraryDisplayName} library has a more recent version ($libraryVersion) than the compiler supports. The compiler version is $compilerVersion."
+
+                else -> continue
             }
+
+            messageCollector.report(
+                CompilerMessageSeverity.ERROR,
+                "$rootCause\nPlease, make sure that the ${checkedLibrary.libraryDisplayName} library has the version in the range " +
+                        "[${compilerVersion.toComparableVersionString()} .. ${compilerVersion.toLanguageVersionString()}.${KotlinVersion.MAX_COMPONENT_VALUE}]. " +
+                        "Adjust your project's settings if necessary."
+            )
         }
     }
 
     private fun getRawCompilerVersion(): String? {
         return customCompilerVersionForTest?.let { return it.version } ?: KotlinCompilerVersion.getVersion()
     }
 
-    protected abstract fun shouldCheckLibrary(library: KotlinLibrary): Boolean
-    protected abstract fun getMessageToReport(compilerVersion: Version, libraryVersion: Version, library: KotlinLibrary): String?
+    protected class CheckedLibrary(val libraryDisplayName: String, val platformDisplayName: String)
+
+    protected abstract fun KotlinLibrary.toCheckedLibrary(): CheckedLibrary?
 
     companion object {
         private class CustomCompilerVersionForTest(val version: String?)

compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/checkers/JsLibrarySpecialCompatibilityChecker.kt

@@ -11,26 +11,9 @@ import org.jetbrains.kotlin.library.isJsKotlinTest
 import org.jetbrains.kotlin.library.isJsStdlib
 
 object JsLibrarySpecialCompatibilityChecker : LibrarySpecialCompatibilityChecker() {
-    override fun shouldCheckLibrary(library: KotlinLibrary) = library.isJsStdlib || library.isJsKotlinTest
-
-    override fun getMessageToReport(compilerVersion: Version, libraryVersion: Version, library: KotlinLibrary): String? {
-        val libraryDisplayName = when {
-            library.isJsStdlib -> "standard"
-            library.isJsKotlinTest -> "kotlin-test"
-            else -> null
-        }
-        val rootCause = when {
-            libraryVersion < compilerVersion ->
-                "The Kotlin/JS $libraryDisplayName library has an older version ($libraryVersion) than the compiler ($compilerVersion). Such a configuration is not supported."
-
-            !libraryVersion.hasSameLanguageVersion(compilerVersion) ->
-                "The Kotlin/JS $libraryDisplayName library has a more recent version ($libraryVersion) than the compiler supports. The compiler version is $compilerVersion."
-
-            else -> return null
-        }
-
-        return "$rootCause\nPlease, make sure that the $libraryDisplayName library has the version in the range " +
-                "[${compilerVersion.toComparableVersionString()} .. ${compilerVersion.toLanguageVersionString()}.${KotlinVersion.MAX_COMPONENT_VALUE}]. " +
-                "Adjust your project's settings if necessary."
+    override fun KotlinLibrary.toCheckedLibrary(): CheckedLibrary? = when {
+        isJsStdlib -> CheckedLibrary(libraryDisplayName = "standard", platformDisplayName = "Kotlin/JS")
+        isJsKotlinTest -> CheckedLibrary(libraryDisplayName = "kotlin-test", platformDisplayName = "Kotlin/JS")
+        else -> null
     }
 }

compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/checkers/WasmLibrarySpecialCompatibilityChecker.kt

@@ -11,27 +11,9 @@ import org.jetbrains.kotlin.library.isWasmKotlinTest
 import org.jetbrains.kotlin.library.isWasmStdlib
 
 object WasmLibrarySpecialCompatibilityChecker : LibrarySpecialCompatibilityChecker() {
-    override fun shouldCheckLibrary(library: KotlinLibrary) = library.isWasmStdlib || library.isWasmKotlinTest
-
-    override fun getMessageToReport(compilerVersion: Version, libraryVersion: Version, library: KotlinLibrary): String? {
-        val libraryDisplayName = when {
-            library.isWasmStdlib -> "standard"
-            library.isWasmKotlinTest -> "kotlin-test"
-            else -> null
-        }
-
-        val rootCause = when {
-            libraryVersion < compilerVersion ->
-                "The Kotlin/Wasm $libraryDisplayName library has an older version ($libraryVersion) than the compiler ($compilerVersion). Such a configuration is not supported."
-
-            !libraryVersion.hasSameLanguageVersion(compilerVersion) ->
-                "The Kotlin/Wasm $libraryDisplayName library has a more recent version ($libraryVersion) than the compiler supports. The compiler version is $compilerVersion."
-
-            else -> return null
-        }
-
-        return "$rootCause\nPlease, make sure that the $libraryDisplayName library has the version in the range " +
-                "[${compilerVersion.toComparableVersionString()} .. ${compilerVersion.toLanguageVersionString()}.${KotlinVersion.MAX_COMPONENT_VALUE}]. " +
-                "Adjust your project's settings if necessary."
+    override fun KotlinLibrary.toCheckedLibrary(): CheckedLibrary? = when {
+        isWasmStdlib -> CheckedLibrary(libraryDisplayName = "standard", platformDisplayName = "Kotlin/Wasm")
+        isWasmKotlinTest -> CheckedLibrary(libraryDisplayName = "kotlin-test", platformDisplayName = "Kotlin/Wasm")
+        else -> null
     }
 }