commit 770f84d496f778fbf6a801eea77f180e4334825b
author Svyatoslav Kuzmich <svyatoslav.kuzmich@jetbrains.com> Sun Jan 15 11:31:41 2023 +0100
committer Svyatoslav Kuzmich <svyatoslav.kuzmich@jetbrains.com> Sun Jan 15 11:31:41 2023 +0100
tree baabd773a47db9c7130ab5f9c42a894001d4dd12
parent 085126e904253404ab0c14155774d35358b54f07

~ Tune language version settings

js/js.tests/test/org/jetbrains/kotlin/js/testOld/BasicWasmBoxTest.kt

diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testOld/BasicWasmBoxTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/testOld/BasicWasmBoxTest.kt
index 91f8214..7cc1694 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/testOld/BasicWasmBoxTest.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/testOld/BasicWasmBoxTest.kt
@@ -13,6 +13,7 @@
 import org.jetbrains.kotlin.backend.common.phaser.toPhaseMap
 import org.jetbrains.kotlin.backend.wasm.*
 import org.jetbrains.kotlin.backend.wasm.dce.eliminateDeadDeclarations
+import org.jetbrains.kotlin.checkers.CompilerTestLanguageVersionSettings
 import org.jetbrains.kotlin.checkers.parseLanguageVersionSettings
 import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
@@ -265,13 +266,17 @@
             .fold(testGroupOutputDir, ::File)
     }
 
-    private fun createConfig(languageVersionSettings: LanguageVersionSettings?): JsConfig {
+    private fun createConfig(languageVersionSettings: CompilerTestLanguageVersionSettings?): JsConfig {
         val configuration = environment.configuration.copy()
         configuration.put(CommonConfigurationKeys.MODULE_NAME, TEST_MODULE)
         configuration.put(JSConfigurationKeys.WASM_ENABLE_ARRAY_RANGE_CHECKS, true)
         configuration.put(JSConfigurationKeys.WASM_ENABLE_ASSERTS, true)
-        configuration.languageVersionSettings = languageVersionSettings
-            ?: LanguageVersionSettingsImpl(LanguageVersion.LATEST_STABLE, ApiVersion.LATEST_STABLE, specificFeatures = extraLanguageFeatures)
+        configuration.languageVersionSettings = LanguageVersionSettingsImpl(
+            languageVersion = languageVersionSettings?.languageVersion ?: LanguageVersion.LATEST_STABLE,
+            apiVersion = languageVersionSettings?.apiVersion ?: ApiVersion.LATEST_STABLE,
+            analysisFlags = languageVersionSettings?.analysisFlags.orEmpty() + mapOf(AnalysisFlags.skipPrereleaseCheck to true),
+            specificFeatures = languageVersionSettings?.extraLanguageFeatures.orEmpty() + extraLanguageFeatures
+        )
         return JsConfig(project, configuration, CompilerEnvironment, null, null)
     }
 
@@ -303,7 +308,7 @@
         }
     }
 
-    private class TestFile(val fileName: String, val languageVersionSettings: LanguageVersionSettings?)
+    private class TestFile(val fileName: String, val languageVersionSettings: CompilerTestLanguageVersionSettings?)
 
     override fun createEnvironment() =
         KotlinCoreEnvironment.createForTests(testRootDisposable, CompilerConfiguration(), EnvironmentConfigFiles.JS_CONFIG_FILES)