From 99e7823352e629921b8e0617ce9eebdd9d94b27a Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Sat, 19 May 2018 18:04:22 +0300 Subject: [PATCH] [NI] Disable test with disabled RefinedSamAdaptersPriority in NI Such test has no ense in NI because NI it is LV = 1.4 and we cannot repeat behaviour in 1.3 anyway, so I propose not even support old cases. Also priority of LANGUAGE directive should be more then key enabled on all tests -- also fixed. --- .../samAdapters/overloadResolutionStaticWithoutRefinedSams.kt | 2 +- .../samAdapters/overloadResolutionWithoutRefinedSams.kt | 2 +- .../kotlin/checkers/CompilerTestLanguageVersionSettings.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 =