analyzer: Simplify CLI; make AnalysisOptions nonPackageLanguageVersion a getter

The CLI was the only reason this field was mutable; dropping dead
support in the CLI means it can instead be a getter.

Change-Id: Iaaf3fd2a1cda9b568fb1a743827eb07fa8975319
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/395164
Reviewed-by: Konstantin Shcheglov <[email protected]>
Commit-Queue: Samuel Rawlins <[email protected]>

Author: srawlins

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

@@ -309,12 +309,6 @@ class AnalysisOptionsImpl implements AnalysisOptions {
 
   ExperimentStatus _contextFeatures;
 
-  /// The language version to use for libraries that are not in a package.
-  ///
-  /// If a library is in a package, this language version is *not* used,
-  /// even if the package does not specify the language version.
-  Version nonPackageLanguageVersion = ExperimentStatus.currentVersion;
-
   /// The set of features to use for libraries that are not in a package.
   ///
   /// If a library is in a package, this feature set is *not* used, even if the
@@ -486,6 +480,12 @@ class AnalysisOptionsImpl implements AnalysisOptions {
     nonPackageFeatureSet = featureSet;
   }
 
+  /// The language version to use for libraries that are not in a package.
+  ///
+  /// If a library is in a package, this language version is *not* used,
+  /// even if the package does not specify the language version.
+  Version get nonPackageLanguageVersion => ExperimentStatus.currentVersion;
+
   Uint32List get signature {
     if (_signature == null) {
       ApiSignature buffer = ApiSignature();

pkg/analyzer_cli/lib/src/driver.dart

@@ -441,13 +441,8 @@ class Driver implements CommandLineStarter {
     return analyzer.analyze(formatter);
   }
 
-  bool _shouldBeFatal(ErrorSeverity severity, CommandLineOptions options) {
-    if (severity == ErrorSeverity.ERROR) {
-      return true;
-    } else {
-      return false;
-    }
-  }
+  bool _shouldBeFatal(ErrorSeverity severity, CommandLineOptions options) =>
+      severity == ErrorSeverity.ERROR;
 
   void _verifyAnalysisOptionsFileExists(CommandLineOptions options) {
     var path = options.defaultAnalysisOptionsPath;
@@ -470,10 +465,8 @@ class Driver implements CommandLineStarter {
         newOptions.defaultPackagesPath == previous.defaultPackagesPath &&
         _equalMaps(newOptions.declaredVariables, previous.declaredVariables) &&
         newOptions.log == previous.log &&
-        newOptions.defaultLanguageVersion == previous.defaultLanguageVersion &&
         newOptions.disableCacheFlushing == previous.disableCacheFlushing &&
-        _equalLists(
-            newOptions.enabledExperiments!, previous.enabledExperiments!);
+        _equalLists(newOptions.enabledExperiments, previous.enabledExperiments);
   }
 
   /// Perform a deep comparison of two string lists.

pkg/analyzer_cli/lib/src/options.dart

@@ -13,11 +13,9 @@ import 'package:analyzer/src/util/sdk.dart';
 import 'package:analyzer_cli/src/ansi.dart' as ansi;
 import 'package:analyzer_cli/src/driver.dart';
 import 'package:args/args.dart';
-import 'package:pub_semver/pub_semver.dart';
 
 const _analysisOptionsFileOption = 'options';
 const _binaryName = 'dartanalyzer';
-const _defaultLanguageVersionOption = 'default-language-version';
 const _defineVariableOption = 'D';
 const _enableExperimentOption = 'enable-experiment';
 const _enableInitializingFormalAccessFlag = 'initializing-formal-access';
@@ -30,10 +28,6 @@ const _sdkPathOption = 'dart-sdk';
 /// *Visible for testing.*
 ExitHandler exitHandler = io.exit;
 
-T cast<T>(dynamic value) => value as T;
-
-T? castNullable<T>(dynamic value) => value as T?;
-
 /// Print the given [message] to stderr and exit with the given [exitCode].
 void printAndFail(String message, {int exitCode = 15}) {
   errorSink.writeln(message);
@@ -110,30 +104,28 @@ class CommandLineOptions {
     ResourceProvider resourceProvider,
     ArgResults args,
   )   : _argResults = args,
-        dartSdkPath = castNullable(args[_sdkPathOption]),
-        disableCacheFlushing = cast(args['disable-cache-flushing']),
-        displayVersion = cast(args['version']),
-        ignoreUnrecognizedFlags = cast(args[_ignoreUnrecognizedFlagsFlag]),
-        log = cast(args['log']),
+        dartSdkPath = args.option(_sdkPathOption),
+        disableCacheFlushing = args.flag('disable-cache-flushing'),
+        displayVersion = args.flag('version'),
+        ignoreUnrecognizedFlags = args.flag(_ignoreUnrecognizedFlagsFlag),
+        log = args.flag('log'),
         jsonFormat = args['format'] == 'json',
         machineFormat = args['format'] == 'machine',
-        perfReport = castNullable(args['x-perf-report']),
-        batchMode = cast(args['batch']),
+        perfReport = args.option('x-perf-report'),
+        batchMode = args.flag('batch'),
         sourceFiles = args.rest,
-        trainSnapshot = cast(args['train-snapshot']),
-        verbose = cast(args['verbose']),
-        color = cast(args['color']) {
+        trainSnapshot = args.flag('train-snapshot'),
+        verbose = args.flag('verbose'),
+        color = args.flag('color') {
     //
     // File locations.
     //
     defaultAnalysisOptionsPath = _absoluteNormalizedPath(
       resourceProvider,
-      castNullable(args[_analysisOptionsFileOption]),
-    );
-    defaultPackagesPath = _absoluteNormalizedPath(
-      resourceProvider,
-      castNullable(args[_packagesOption]),
+      args.option(_analysisOptionsFileOption),
     );
+    defaultPackagesPath =
+        _absoluteNormalizedPath(resourceProvider, args.option(_packagesOption));
 
     //
     // Declared variables.
@@ -158,15 +150,9 @@ class CommandLineOptions {
     }
   }
 
-  /// The default language version for files that are not in a package.
-  /// (Or null if no default language version to force.)
-  String? get defaultLanguageVersion {
-    return castNullable(_argResults[_defaultLanguageVersionOption]);
-  }
-
   /// A list of the names of the experiments that are to be enabled.
-  List<String>? get enabledExperiments {
-    return castNullable(_argResults[_enableExperimentOption]);
+  List<String> get enabledExperiments {
+    return _argResults.multiOption(_enableExperimentOption);
   }
 
   /// Update the [analysisOptions] with flags that the user specified
@@ -175,16 +161,6 @@ class CommandLineOptions {
   /// flags that the user specified as command line options more important,
   /// so override the corresponding options.
   void updateAnalysisOptions(AnalysisOptionsImpl analysisOptions) {
-    var defaultLanguageVersion = this.defaultLanguageVersion;
-    if (defaultLanguageVersion != null) {
-      var nonPackageLanguageVersion =
-          Version.parse('$defaultLanguageVersion.0');
-      analysisOptions.nonPackageLanguageVersion = nonPackageLanguageVersion;
-      analysisOptions.nonPackageFeatureSet = FeatureSet.latestLanguageVersion()
-          .restrictToVersion(nonPackageLanguageVersion);
-    }
-
-    var enabledExperiments = this.enabledExperiments!;
     if (enabledExperiments.isNotEmpty) {
       analysisOptions.contextFeatures = FeatureSet.fromEnableFlags2(
         sdkLanguageVersion: ExperimentStatus.currentVersion,
@@ -406,10 +382,6 @@ class CommandLineOptions {
           defaultsTo: false,
           negatable: false,
           hide: hide)
-      ..addOption(_defaultLanguageVersionOption,
-          help: 'The default language version when it is not specified via '
-              'other ways (internal, tests only).',
-          hide: false)
       ..addFlag('disable-cache-flushing', defaultsTo: false, hide: hide)
       ..addOption('x-perf-report',
           help: 'Writes a performance report to the given file (experimental).',
@@ -449,21 +421,21 @@ class CommandLineOptions {
       var results = parser.parse(args);
 
       // Help requests.
-      if (cast(results['help'])) {
+      if (results.flag('help')) {
         _showUsage(parser, fromHelp: true);
         exitHandler(0);
         return null; // Only reachable in testing.
       }
 
       // Batch mode and input files.
-      if (cast(results['batch'])) {
+      if (results.flag('batch')) {
         if (results.rest.isNotEmpty) {
           errorSink.writeln('No source files expected in the batch mode.');
           _showUsage(parser);
           exitHandler(15);
           return null; // Only reachable in testing.
         }
-      } else if (cast(results['version'])) {
+      } else if (results.flag('version')) {
         outSink.writeln('$_binaryName version ${_getVersion()}');
         exitHandler(0);
         return null; // Only reachable in testing.
@@ -476,8 +448,7 @@ class CommandLineOptions {
       }
 
       if (results.wasParsed(_enableExperimentOption)) {
-        var names =
-            (results[_enableExperimentOption] as List).cast<String>().toList();
+        var names = results.multiOption(_enableExperimentOption);
         var errorFound = false;
         for (var validationResult in validateFlags(names)) {
           if (validationResult.isError) {

pkg/analyzer_cli/pubspec.yaml

@@ -14,11 +14,11 @@ dependencies:
   linter: any
   meta: any
   path: any
-  pub_semver: any
   yaml: any
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dev_dependencies:
   lints: any
+  pub_semver: any
   test_reflective_loader: any
   test: any

pkg/analyzer_cli/test/options_test.dart

@@ -14,7 +14,6 @@ import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart';
 import 'package:analyzer_cli/src/driver.dart';
 import 'package:analyzer_cli/src/options.dart';
 import 'package:args/args.dart';
-import 'package:pub_semver/pub_semver.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
@@ -288,34 +287,6 @@ class ArgumentsTest with ResourceProviderMixin {
     );
   }
 
-  void test_updateAnalysisOptions_defaultLanguageVersion() {
-    _applyAnalysisOptions(
-      ['a.dart'],
-      (_) {},
-      (analysisOptions) {
-        expect(
-          analysisOptions.nonPackageLanguageVersion,
-          ExperimentStatus.currentVersion,
-        );
-        var featureSet = analysisOptions.nonPackageFeatureSet;
-        expect(featureSet.isEnabled(Feature.non_nullable), isTrue);
-      },
-    );
-
-    _applyAnalysisOptions(
-      ['--default-language-version=2.7', 'a.dart'],
-      (_) {},
-      (analysisOptions) {
-        expect(
-          analysisOptions.nonPackageLanguageVersion,
-          Version.parse('2.7.0'),
-        );
-        var featureSet = analysisOptions.nonPackageFeatureSet;
-        expect(featureSet.isEnabled(Feature.non_nullable), isFalse);
-      },
-    );
-  }
-
   void test_updateAnalysisOptions_enableExperiment() {
     var feature_a = ExperimentalFeature(
       index: 0,