diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionStaticWithoutRefinedSams.kt b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionStaticWithoutRefinedSams.kt index 252f80e68b7..756e884efa1 100644 --- a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionStaticWithoutRefinedSams.kt +++ b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionStaticWithoutRefinedSams.kt @@ -1,4 +1,4 @@ -// !LANGUAGE: -RefinedSamAdaptersPriority +// !LANGUAGE: -RefinedSamAdaptersPriority -NewInference // !CHECK_TYPE // FILE: A.java public class A { diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionWithoutRefinedSams.kt b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionWithoutRefinedSams.kt index ab1e12fb88d..198f1be6f54 100644 --- a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionWithoutRefinedSams.kt +++ b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionWithoutRefinedSams.kt @@ -1,4 +1,4 @@ -// !LANGUAGE: -RefinedSamAdaptersPriority +// !LANGUAGE: -RefinedSamAdaptersPriority -NewInference // !CHECK_TYPE // FILE: A.java public class A { diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/CompilerTestLanguageVersionSettings.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/CompilerTestLanguageVersionSettings.kt index 86fc3dc0a66..12741325026 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/CompilerTestLanguageVersionSettings.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/CompilerTestLanguageVersionSettings.kt @@ -26,7 +26,7 @@ data class CompilerTestLanguageVersionSettings( override val languageVersion: LanguageVersion, private val analysisFlags: Map, Any?> = emptyMap() ) : LanguageVersionSettings { - private val languageFeatures = initialLanguageFeatures + specificFeaturesForTests() + private val languageFeatures = specificFeaturesForTests() + initialLanguageFeatures private val delegate = LanguageVersionSettingsImpl(languageVersion, apiVersion) override fun getFeatureSupport(feature: LanguageFeature): LanguageFeature.State =