From 8ac576614fd1bb07140cbf2e9829b2ddc6247400 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Thu, 14 Mar 2024 21:35:33 +0100
Subject: [PATCH] Revert "Temporary: mute PRE_RELEASE_CLASS in some tests
 (KT-66551)"

This reverts commit 893e5cac
---
 .../services/libraries/CompilerExecutor.kt         |  1 -
 .../integration/ProgramWithDependencyOnCompiler.kt |  1 -
 .../fir/plugin/runners/PluginPrototypeTests.kt     |  2 --
 .../kotlinx/jso/runners/DiagnosticTests.kt         |  2 +-
 .../AbstractFirPsiParcelizeDiagnosticTest.kt       |  2 --
 .../test/runners/AbstractParcelizeBoxTest.kt       |  2 --
 .../runners/AbstractParcelizeDiagnosticTest.kt     |  2 +-
 .../compiler/plugin/ScriptingCompilerPluginTest.kt | 14 +-------------
 .../test/AbstractScriptTestBaseClasses.kt          |  2 --
 9 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/libraries/CompilerExecutor.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/libraries/CompilerExecutor.kt
index ec2a1fa6c85..0f9b252cf62 100644
--- a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/libraries/CompilerExecutor.kt
+++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/libraries/CompilerExecutor.kt
@@ -59,7 +59,6 @@ internal object CompilerExecutor {
                 val extraOptions = buildList {
                     addAll(options)
                     add("-XXLanguage:-${LanguageFeature.SkipStandaloneScriptsInSourceRoots.name}")
-                    add("-Xskip-prerelease-check")
                 }
 
                 MockLibraryUtil.compileLibraryToJar(
diff --git a/compiler/tests/org/jetbrains/kotlin/integration/ProgramWithDependencyOnCompiler.kt b/compiler/tests/org/jetbrains/kotlin/integration/ProgramWithDependencyOnCompiler.kt
index 69b7ce7239c..3313fddd10f 100644
--- a/compiler/tests/org/jetbrains/kotlin/integration/ProgramWithDependencyOnCompiler.kt
+++ b/compiler/tests/org/jetbrains/kotlin/integration/ProgramWithDependencyOnCompiler.kt
@@ -27,7 +27,6 @@ class ProgramWithDependencyOnCompiler(
             K2JVMCompiler(),
             listOf(
                 programSource.path,
-                "-Xskip-prerelease-check",
                 "-d", program.absolutePath,
                 "-cp", PathUtil.kotlinPathsForDistDirectory.compilerPath.absolutePath,
             ),
diff --git a/plugins/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/PluginPrototypeTests.kt b/plugins/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/PluginPrototypeTests.kt
index d039b30405b..9c967a7d855 100644
--- a/plugins/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/PluginPrototypeTests.kt
+++ b/plugins/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/PluginPrototypeTests.kt
@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.js.test.fir.AbstractFirLoadK2CompiledJsKotlinTest
 import org.jetbrains.kotlin.test.backend.handlers.IrPrettyKotlinDumpHandler
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
 import org.jetbrains.kotlin.test.builders.configureIrHandlersStep
-import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives.DIAGNOSTICS
 import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.ENABLE_PLUGIN_PHASES
 import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.FIR_DUMP
 import org.jetbrains.kotlin.test.runners.AbstractFirLoadK2CompiledJvmKotlinTest
@@ -59,7 +58,6 @@ fun TestConfigurationBuilder.commonFirWithPluginFrontendConfiguration() {
     defaultDirectives {
         +ENABLE_PLUGIN_PHASES
         +FIR_DUMP
-        DIAGNOSTICS with "-PRE_RELEASE_CLASS"
     }
 
     useConfigurators(
diff --git a/plugins/js-plain-objects/compiler-plugin/tests/org/jetbrains/kotlinx/jso/runners/DiagnosticTests.kt b/plugins/js-plain-objects/compiler-plugin/tests/org/jetbrains/kotlinx/jso/runners/DiagnosticTests.kt
index a2a2d725af4..f0b6030a0c4 100644
--- a/plugins/js-plain-objects/compiler-plugin/tests/org/jetbrains/kotlinx/jso/runners/DiagnosticTests.kt
+++ b/plugins/js-plain-objects/compiler-plugin/tests/org/jetbrains/kotlinx/jso/runners/DiagnosticTests.kt
@@ -30,6 +30,6 @@ abstract class AbstractFirJsPlainObjectsPluginDiagnosticTest : AbstractFirPsiDia
 
 private fun TestConfigurationBuilder.disableOptInErrors() {
     defaultDirectives {
-        DIAGNOSTICS with listOf("-OPT_IN_USAGE", "-OPT_IN_USAGE_ERROR", "-PRE_RELEASE_CLASS")
+        DIAGNOSTICS with listOf("-OPT_IN_USAGE", "-OPT_IN_USAGE_ERROR")
     }
 }
diff --git a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/runners/AbstractFirPsiParcelizeDiagnosticTest.kt b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/runners/AbstractFirPsiParcelizeDiagnosticTest.kt
index 2d854b51254..749a247318f 100644
--- a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/runners/AbstractFirPsiParcelizeDiagnosticTest.kt
+++ b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/runners/AbstractFirPsiParcelizeDiagnosticTest.kt
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.parcelize.test.runners
 import org.jetbrains.kotlin.parcelize.test.services.ParcelizeEnvironmentConfigurator
 import org.jetbrains.kotlin.test.FirParser
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
-import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives.DIAGNOSTICS
 import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives
 import org.jetbrains.kotlin.test.frontend.fir.FirFailingTestSuppressor
 import org.jetbrains.kotlin.test.frontend.fir.handlers.FirIdenticalChecker
@@ -25,7 +24,6 @@ abstract class AbstractFirParcelizeDiagnosticTestBase(val parser: FirParser) : A
         defaultDirectives {
             +FirDiagnosticsDirectives.ENABLE_PLUGIN_PHASES
             FirDiagnosticsDirectives.FIR_PARSER with parser
-            DIAGNOSTICS with "-PRE_RELEASE_CLASS"
         }
 
         useConfigurators(::ParcelizeEnvironmentConfigurator)
diff --git a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/runners/AbstractParcelizeBoxTest.kt b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/runners/AbstractParcelizeBoxTest.kt
index bb876146669..f8e95c76cb9 100644
--- a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/runners/AbstractParcelizeBoxTest.kt
+++ b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/runners/AbstractParcelizeBoxTest.kt
@@ -21,7 +21,6 @@ import org.jetbrains.kotlin.test.builders.configureClassicFrontendHandlersStep
 import org.jetbrains.kotlin.test.builders.configureFirHandlersStep
 import org.jetbrains.kotlin.test.builders.configureIrHandlersStep
 import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.REQUIRES_SEPARATE_PROCESS
-import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives.DIAGNOSTICS
 import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives.REPORT_ONLY_EXPLICITLY_DEFINED_DEBUG_INFO
 import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives
 import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.ENABLE_PLUGIN_PHASES
@@ -53,7 +52,6 @@ abstract class AbstractParcelizeBoxTestBase<R : ResultingArtifact.FrontendOutput
         defaultDirectives {
             +REQUIRES_SEPARATE_PROCESS
             +REPORT_ONLY_EXPLICITLY_DEFINED_DEBUG_INFO
-            DIAGNOSTICS with "-PRE_RELEASE_CLASS"
         }
 
         commonConfigurationForTest(targetFrontend, frontendFacade, frontendToBackendConverter, backendFacade)
diff --git a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/runners/AbstractParcelizeDiagnosticTest.kt b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/runners/AbstractParcelizeDiagnosticTest.kt
index b09dd3577ff..d0b6670345a 100644
--- a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/runners/AbstractParcelizeDiagnosticTest.kt
+++ b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/runners/AbstractParcelizeDiagnosticTest.kt
@@ -31,7 +31,7 @@ abstract class AbstractParcelizeDiagnosticTest : AbstractKotlinCompilerTest() {
 
         defaultDirectives {
             +USE_PSI_CLASS_FILES_READING
-            DIAGNOSTICS with listOf("-UNUSED_PARAMETER", "-PRE_RELEASE_CLASS")
+            DIAGNOSTICS with "-UNUSED_PARAMETER"
         }
 
         enableMetaInfoHandler()
diff --git a/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCompilerPluginTest.kt b/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCompilerPluginTest.kt
index 474a0993c8e..f3223025406 100644
--- a/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCompilerPluginTest.kt
+++ b/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCompilerPluginTest.kt
@@ -9,7 +9,6 @@ package org.jetbrains.kotlin.scripting.compiler.plugin
 
 import com.intellij.openapi.Disposable
 import junit.framework.TestCase
-import org.jetbrains.kotlin.checkers.CompilerTestLanguageVersionSettings
 import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
 import org.jetbrains.kotlin.cli.common.ExitCode
 import org.jetbrains.kotlin.cli.common.config.addKotlinSourceRoots
@@ -26,14 +25,11 @@ import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoots
 import org.jetbrains.kotlin.compiler.plugin.AbstractCliOption
 import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar
 import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
-import org.jetbrains.kotlin.config.AnalysisFlags
-import org.jetbrains.kotlin.config.ApiVersion
-import org.jetbrains.kotlin.config.CommonConfigurationKeys
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.config.JVMConfigurationKeys
-import org.jetbrains.kotlin.config.LanguageVersion
 import org.jetbrains.kotlin.scripting.compiler.plugin.impl.SCRIPT_BASE_COMPILER_ARGUMENTS_PROPERTY
 import org.jetbrains.kotlin.scripting.compiler.plugin.impl.reporter
+import org.jetbrains.kotlin.scripting.compiler.plugin.impl.updateWithCompilerOptions
 import org.jetbrains.kotlin.scripting.configuration.ScriptingConfigurationKeys
 import org.jetbrains.kotlin.scripting.definitions.SCRIPT_DEFINITION_MARKERS_PATH
 import org.jetbrains.kotlin.scripting.definitions.discoverScriptTemplatesInClasspath
@@ -127,14 +123,6 @@ class ScriptingCompilerPluginTest : TestCase() {
                     createEnvironment(defClasses.map { File(defsSrc, "$it.kt").canonicalPath }, defsOut, messageCollector, disposable) {
                         addJvmClasspathRoots(runtimeClasspath)
                         addJvmClasspathRoots(scriptingClasspath)
-                        put(
-                            CommonConfigurationKeys.LANGUAGE_VERSION_SETTINGS,
-                            CompilerTestLanguageVersionSettings(
-                                emptyMap(), ApiVersion.LATEST_STABLE, LanguageVersion.LATEST_STABLE, mapOf(
-                                    AnalysisFlags.skipPrereleaseCheck to true
-                                )
-                            )
-                        )
                     }
                 )
 
diff --git a/plugins/scripting/scripting-tests/test/org/jetbrains/kotlin/scripting/test/AbstractScriptTestBaseClasses.kt b/plugins/scripting/scripting-tests/test/org/jetbrains/kotlin/scripting/test/AbstractScriptTestBaseClasses.kt
index 4fdfd301d38..21afb8ba275 100644
--- a/plugins/scripting/scripting-tests/test/org/jetbrains/kotlin/scripting/test/AbstractScriptTestBaseClasses.kt
+++ b/plugins/scripting/scripting-tests/test/org/jetbrains/kotlin/scripting/test/AbstractScriptTestBaseClasses.kt
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.scripting.test
 import org.jetbrains.kotlin.test.FirParser
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
 import org.jetbrains.kotlin.test.directives.ConfigurationDirectives.WITH_STDLIB
-import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives.DIAGNOSTICS
 import org.jetbrains.kotlin.test.runners.AbstractFirDiagnosticTestBase
 import org.jetbrains.kotlin.test.runners.codegen.AbstractFirScriptCodegenTest
 
@@ -37,6 +36,5 @@ fun TestConfigurationBuilder.configureWithCustomScriptDef() {
     )
     defaultDirectives {
         +WITH_STDLIB
-        DIAGNOSTICS with "-PRE_RELEASE_CLASS"
     }
 }
\ No newline at end of file