Rename LanguageFeatureSettings -> LanguageVersionSettings

compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.java

@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport;
 import org.jetbrains.kotlin.cli.jvm.compiler.JvmPackagePartProvider;
 import org.jetbrains.kotlin.config.CommonConfigurationKeys;
 import org.jetbrains.kotlin.config.CompilerConfiguration;
-import org.jetbrains.kotlin.config.LanguageFeatureSettings;
+import org.jetbrains.kotlin.config.LanguageVersionSettings;
 import org.jetbrains.kotlin.context.ContextKt;
 import org.jetbrains.kotlin.context.GlobalContext;
 import org.jetbrains.kotlin.context.ModuleContext;
@@ -135,9 +135,9 @@ public abstract class AbstractDiagnosticsTest extends BaseDiagnosticsTest {
 
             moduleBindings.put(testModule, moduleTrace.getBindingContext());
 
-            LanguageFeatureSettings languageFeatureSettings = loadCustomLanguageFeatureSettings(testFilesInModule);
+            LanguageVersionSettings languageVersionSettings = loadCustomLanguageVersionSettings(testFilesInModule);
             ModuleContext moduleContext = ContextKt.withModule(ContextKt.withProject(context, getProject()), module);
-            analyzeModuleContents(moduleContext, jetFiles, moduleTrace, languageFeatureSettings);
+            analyzeModuleContents(moduleContext, jetFiles, moduleTrace, languageVersionSettings);
 
             checkAllResolvedCallsAreCompleted(jetFiles, moduleTrace.getBindingContext());
         }
@@ -197,17 +197,17 @@ public abstract class AbstractDiagnosticsTest extends BaseDiagnosticsTest {
     }
 
     @Nullable
-    private LanguageFeatureSettings loadCustomLanguageFeatureSettings(List<? extends TestFile> module) {
-        LanguageFeatureSettings result = null;
+    private LanguageVersionSettings loadCustomLanguageVersionSettings(List<? extends TestFile> module) {
+        LanguageVersionSettings result = null;
         for (TestFile file : module) {
-            if (file.customLanguageFeatureSettings != null) {
+            if (file.customLanguageVersionSettings != null) {
                 if (result != null) {
                     Assert.fail(
                             "More than one file in the module has " + BaseDiagnosticsTest.LANGUAGE_DIRECTIVE + " directive specified. " +
                             "This is not supported. Please move all directives into one file"
                     );
                 }
-                result = file.customLanguageFeatureSettings;
+                result = file.customLanguageVersionSettings;
             }
         }
 
@@ -264,12 +264,12 @@ public abstract class AbstractDiagnosticsTest extends BaseDiagnosticsTest {
             @NotNull ModuleContext moduleContext,
             @NotNull List<KtFile> files,
             @NotNull BindingTrace moduleTrace,
-            @Nullable LanguageFeatureSettings languageFeatureSettings
+            @Nullable LanguageVersionSettings languageVersionSettings
     ) {
         CompilerConfiguration configuration;
-        if (languageFeatureSettings != null) {
+        if (languageVersionSettings != null) {
             configuration = getEnvironment().getConfiguration().copy();
-            configuration.put(CommonConfigurationKeys.LANGUAGE_FEATURE_SETTINGS, languageFeatureSettings);
+            configuration.put(CommonConfigurationKeys.LANGUAGE_VERSION_SETTINGS, languageVersionSettings);
         }
         else {
             configuration = getEnvironment().getConfiguration();

compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTestWithJsStdLib.java

@@ -21,7 +21,7 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles;
 import org.jetbrains.kotlin.config.CommonConfigurationKeys;
 import org.jetbrains.kotlin.config.CompilerConfiguration;
-import org.jetbrains.kotlin.config.LanguageFeatureSettings;
+import org.jetbrains.kotlin.config.LanguageVersionSettings;
 import org.jetbrains.kotlin.context.ModuleContext;
 import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl;
 import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS;
@@ -72,10 +72,10 @@ public abstract class AbstractDiagnosticsTestWithJsStdLib extends AbstractDiagno
             @NotNull ModuleContext moduleContext,
             @NotNull List<KtFile> ktFiles,
             @NotNull BindingTrace moduleTrace,
-            @Nullable LanguageFeatureSettings languageFeatureSettings
+            @Nullable LanguageVersionSettings languageVersionSettings
     ) {
         // TODO: support LANGUAGE directive in JS diagnostic tests
-        assert languageFeatureSettings == null
+        assert languageVersionSettings == null
                 : BaseDiagnosticsTest.LANGUAGE_DIRECTIVE + " directive is not supported in JS diagnostic tests";
         return TopDownAnalyzerFacadeForJS.analyzeFilesWithGivenTrace(ktFiles, moduleTrace, moduleContext, config);
     }

compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTestWithJsStdLibAndBackendCompilation.kt

@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.checkers
 
-import org.jetbrains.kotlin.config.LanguageFeatureSettings
+import org.jetbrains.kotlin.config.LanguageVersionSettings
 import org.jetbrains.kotlin.context.ModuleContext
 import org.jetbrains.kotlin.diagnostics.DiagnosticUtils.hasError
 import org.jetbrains.kotlin.js.analyzer.JsAnalysisResult
@@ -30,9 +30,9 @@ abstract class AbstractDiagnosticsTestWithJsStdLibAndBackendCompilation : Abstra
             moduleContext: ModuleContext,
             ktFiles: MutableList<KtFile>,
             moduleTrace: BindingTrace,
-            languageFeatureSettings: LanguageFeatureSettings?
+            languageVersionSettings: LanguageVersionSettings?
     ): JsAnalysisResult {
-        val analysisResult = super.analyzeModuleContents(moduleContext, ktFiles, moduleTrace, languageFeatureSettings)
+        val analysisResult = super.analyzeModuleContents(moduleContext, ktFiles, moduleTrace, languageVersionSettings)
         val diagnostics = analysisResult.bindingTrace.bindingContext.diagnostics
 
         if (!hasError(diagnostics)) {

compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java

@@ -35,7 +35,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.asJava.DuplicateJvmSignatureUtilKt;
 import org.jetbrains.kotlin.config.LanguageFeature;
-import org.jetbrains.kotlin.config.LanguageFeatureSettings;
+import org.jetbrains.kotlin.config.LanguageVersionSettings;
 import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl;
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor;
 import org.jetbrains.kotlin.diagnostics.*;
@@ -155,7 +155,7 @@ public abstract class BaseDiagnosticsTest
     }
 
     @Nullable
-    private static LanguageFeatureSettings parseLanguageFeatureSettingsDirective(Map<String, String> directiveMap) {
+    private static LanguageVersionSettings parseLanguageDirective(Map<String, String> directiveMap) {
         String directives = directiveMap.get(LANGUAGE_DIRECTIVE);
         if (directives == null) return null;
 
@@ -187,7 +187,7 @@ public abstract class BaseDiagnosticsTest
         }
         while (matcher.find());
 
-        return new LanguageFeatureSettings() {
+        return new LanguageVersionSettings() {
             @Override
             public boolean supportsFeature(@NotNull LanguageFeature feature) {
                 Boolean enabled = values.get(feature);
@@ -296,7 +296,7 @@ public abstract class BaseDiagnosticsTest
         private final String clearText;
         private final KtFile jetFile;
         private final Condition<Diagnostic> whatDiagnosticsToConsider;
-        public final LanguageFeatureSettings customLanguageFeatureSettings;
+        public final LanguageVersionSettings customLanguageVersionSettings;
         private final boolean declareCheckType;
         private final boolean declareFlexibleType;
         public final boolean checkLazyLog;
@@ -311,7 +311,7 @@ public abstract class BaseDiagnosticsTest
         ) {
             this.module = module;
             this.whatDiagnosticsToConsider = parseDiagnosticFilterDirective(directives);
-            this.customLanguageFeatureSettings = parseLanguageFeatureSettingsDirective(directives);
+            this.customLanguageVersionSettings = parseLanguageDirective(directives);
             this.checkLazyLog = directives.containsKey(CHECK_LAZY_LOG_DIRECTIVE) || CHECK_LAZY_LOG_DEFAULT;
             this.declareCheckType = directives.containsKey(CHECK_TYPE_DIRECTIVE);
             this.declareFlexibleType = directives.containsKey(EXPLICIT_FLEXIBLE_TYPES_DIRECTIVE);