analyzer: Remove unused LinterOptions.analysisOptions field.

The only position where it was used was in a linter test,
`rule_test.dart`, where every directory under
`pkg/linter/test/configs` was used to create a test. But there aren't
any more directories under `pkg/linter/test/config`.

So delete that test, and various `analysisOptions` parameters.

Change-Id: If37029a44681a0bc9adeb26318d3151ca1d99dc3
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/390563
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Samuel Rawlins <[email protected]>

Author: srawlins

pkg/analyzer/lib/src/lint/analysis.dart

@@ -10,15 +10,11 @@ import 'package:analyzer/file_system/physical_file_system.dart';
 import 'package:analyzer/instrumentation/instrumentation.dart';
 import 'package:analyzer/source/file_source.dart';
 import 'package:analyzer/source/source.dart';
-import 'package:analyzer/src/analysis_options/analysis_options_provider.dart';
-import 'package:analyzer/src/analysis_options/apply_options.dart';
 import 'package:analyzer/src/dart/analysis/analysis_context_collection.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/lint/io.dart';
 import 'package:analyzer/src/lint/linter.dart';
 
-AnalysisOptionsProvider _optionsProvider = AnalysisOptionsProvider();
-
 Source createSource(Uri uri) {
   var filePath = uri.toFilePath();
   var file = PhysicalResourceProvider.INSTANCE.getFile(filePath);
@@ -35,11 +31,6 @@ void _updateAnalyzerOptions(
   AnalysisOptionsImpl analysisOptions,
   LinterOptions options,
 ) {
-  if (options.analysisOptions != null) {
-    var map = _optionsProvider.getOptionsFromString(options.analysisOptions);
-    analysisOptions.applyOptions(map);
-  }
-
   analysisOptions.lint = options.enableLints;
   analysisOptions.warning = false;
   analysisOptions.enableTiming = options.enableTiming;

pkg/analyzer/lib/src/lint/linter.dart

@@ -186,11 +186,9 @@ final class LinterContextWithResolvedResults implements LinterContext {
 
 class LinterOptions extends DriverOptions {
   final Iterable<LintRule> enabledRules;
-  final String? analysisOptions;
 
   LinterOptions({
     Iterable<LintRule>? enabledRules,
-    this.analysisOptions,
   }) : enabledRules = enabledRules ?? Registry.ruleRegistry;
 }
 

pkg/linter/lib/src/test_utilities/test_resource_provider.dart

@@ -16,7 +16,7 @@ import 'test_linter.dart';
 
 /// Builds the [TestLinter] with appropriate mock SDK, resource providers, and
 /// package config path.
-TestLinter buildDriver(LintRule rule, File file, {String? analysisOptions}) {
+TestLinter buildDriver(LintRule rule, File file) {
   var memoryResourceProvider = MemoryResourceProvider(
       context: PhysicalResourceProvider.INSTANCE.pathContext);
   var resourceProvider = TestResourceProvider(memoryResourceProvider);
@@ -29,9 +29,7 @@ TestLinter buildDriver(LintRule rule, File file, {String? analysisOptions}) {
     root: sdkRoot,
   );
 
-  var options =
-      LinterOptions(enabledRules: [rule], analysisOptions: analysisOptions)
-        ..dartSdkPath = sdkRoot.path;
+  var options = LinterOptions(enabledRules: [rule])..dartSdkPath = sdkRoot.path;
 
   return TestLinter(options, resourceProvider: resourceProvider);
 }

pkg/linter/test/configs/README

@@ -8,8 +8,6 @@ import 'package:analyzer/dart/analysis/analysis_context_collection.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/file_system/physical_file_system.dart';
-import 'package:analyzer/src/analysis_options/analysis_options_provider.dart';
-import 'package:analyzer/src/analysis_options/apply_options.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/lint/io.dart';
 import 'package:analyzer/src/lint/registry.dart';
@@ -41,17 +39,10 @@ void defineRuleTests() {
   group('rule', () {
     group('dart', () {
       // Rule tests run with default analysis options.
-      testRules(ruleTestDataDir);
-
-      // Rule tests run against specific configurations.
-      for (var entry in Directory(testConfigDir).listSync()) {
-        if (entry is! Directory) continue;
-        group('(config: ${p.basename(entry.path)})', () {
-          var analysisOptionsFile =
-              File(p.join(entry.path, 'analysis_options.yaml'));
-          var analysisOptions = analysisOptionsFile.readAsStringSync();
-          testRules(ruleTestDataDir, analysisOptions: analysisOptions);
-        });
+      for (var entry in Directory(ruleTestDataDir).listSync()) {
+        if (entry is! File || !isDartFile(entry)) continue;
+        var ruleName = p.basenameWithoutExtension(entry.path);
+        testRule(ruleName, entry);
       }
     });
   });
@@ -107,37 +98,28 @@ void defineRuleUnitTests() {
   });
 }
 
-void testRule(String ruleName, File file,
-    {bool useMockSdk = true, String? analysisOptions}) {
+void testRule(String ruleName, File file, {bool useMockSdk = true}) {
   test(ruleName, () async {
     if (!file.existsSync()) {
       throw Exception('No rule found defined at: ${file.path}');
     }
 
-    var errorInfos = await _getErrorInfos(ruleName, file,
-        useMockSdk: useMockSdk, analysisOptions: analysisOptions);
-    _validateExpectedLints(file, errorInfos, analysisOptions: analysisOptions);
+    var errorInfos =
+        await _getErrorInfos(ruleName, file, useMockSdk: useMockSdk);
+    _validateExpectedLints(file, errorInfos);
   });
 }
 
-void testRules(String ruleDir, {String? analysisOptions}) {
-  for (var entry in Directory(ruleDir).listSync()) {
-    if (entry is! File || !isDartFile(entry)) continue;
-    var ruleName = p.basenameWithoutExtension(entry.path);
-    testRule(ruleName, entry, analysisOptions: analysisOptions);
-  }
-}
-
 Future<Iterable<AnalysisErrorInfo>> _getErrorInfos(String ruleName, File file,
-    {required bool useMockSdk, required String? analysisOptions}) async {
+    {required bool useMockSdk}) async {
   registerLintRules();
   var rule = Registry.ruleRegistry[ruleName];
   if (rule == null) {
     fail('rule `$ruleName` is not registered; unable to test.');
   }
 
   if (useMockSdk) {
-    var driver = buildDriver(rule, file, analysisOptions: analysisOptions);
+    var driver = buildDriver(rule, file);
     return await driver.lintFiles([file]);
   }
 
@@ -170,8 +152,10 @@ Future<Iterable<AnalysisErrorInfo>> _getErrorInfos(String ruleName, File file,
 
 /// Parse lint annotations in the given [file] and validate that they correspond
 /// with errors in the provided [errorInfos].
-void _validateExpectedLints(File file, Iterable<AnalysisErrorInfo> errorInfos,
-    {String? analysisOptions}) {
+void _validateExpectedLints(
+  File file,
+  Iterable<AnalysisErrorInfo> errorInfos,
+) {
   var expected = <AnnotationMatcher>[];
 
   var lineNumber = 1;
@@ -213,12 +197,7 @@ void _validateExpectedLints(File file, Iterable<AnalysisErrorInfo> errorInfos,
     // Dump results for debugging purposes.
 
     // AST
-    var optionsProvider = AnalysisOptionsProvider();
-    var optionMap = optionsProvider.getOptionsFromString(analysisOptions);
-    var optionsImpl = AnalysisOptionsImpl();
-    optionsImpl.applyOptions(optionMap);
-
-    var features = optionsImpl.contextFeatures;
+    var features = AnalysisOptionsImpl().contextFeatures;
 
     FileSpelunker(file.absolute.path, featureSet: features).spelunk();
     printToConsole('');

pkg/linter/test/rule_test.dart

@@ -9,4 +9,3 @@ final String integrationTestDir =
 final String ruleTestDataDir =
     pathRelativeToPackageRoot(['test_data', 'rules']);
 final String ruleTestDir = pathRelativeToPackageRoot(['test', 'rules']);
-final String testConfigDir = pathRelativeToPackageRoot(['test', 'configs']);