analyzer_cli: Bump language version to 3.9

srawlins · Commit Queue · commit 0513a2220610 · 2025-08-27T08:45:06.000-07:00
Change-Id: I4d696cb827c993e95c1f0c946b8cbce636a390fa Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/447140 Reviewed-by: Konstantin Shcheglov <scheglov@google.com> Commit-Queue: Samuel Rawlins <srawlins@google.com>
diff --git a/pkg/analyzer_cli/lib/src/driver.dart b/pkg/analyzer_cli/lib/src/driver.dart
@@ -157,16 +157,15 @@ class Driver implements CommandLineStarter {
   /// Perform analysis according to the given [options].
   Future<DiagnosticSeverity> _analyzeAll(CommandLineOptions options) async {
     if (!options.jsonFormat && !options.machineFormat) {
-      var fileNames =
-          options.sourceFiles.map((String file) {
-            file = path.normalize(file);
-            if (file == '.') {
-              file = path.basename(path.current);
-            } else if (file == '..') {
-              file = path.basename(path.normalize(path.absolute(file)));
-            }
-            return file;
-          }).toList();
+      var fileNames = options.sourceFiles.map((String file) {
+        file = path.normalize(file);
+        if (file == '.') {
+          file = path.basename(path.current);
+        } else if (file == '..') {
+          file = path.basename(path.normalize(path.absolute(file)));
+        }
+        return file;
+      }).toList();
 
       outSink.writeln("Analyzing ${fileNames.join(', ')}...");
     }
@@ -238,8 +237,8 @@ class Driver implements CommandLineStarter {
     for (var sourcePath in pathList) {
       _analysisContextProvider.configureForPath(sourcePath);
       analysisContext = _analysisContextProvider.analysisContext;
-      final analysisDriver =
-          this.analysisDriver = _analysisContextProvider.analysisDriver;
+      final analysisDriver = this.analysisDriver =
+          _analysisContextProvider.analysisDriver;
       pathFilter = _analysisContextProvider.pathFilter;
 
       // Add all the files to be analyzed en masse to the context. Skip any
@@ -274,8 +273,9 @@ class Driver implements CommandLineStarter {
           var contextRoot =
               analysisDriver.currentSession.analysisContext.contextRoot;
           var package = contextRoot.workspace.findPackageFor(file.path);
-          var sdkVersionConstraint =
-              (package is PubPackage) ? package.sdkVersionConstraint : null;
+          var sdkVersionConstraint = (package is PubPackage)
+              ? package.sdkVersionConstraint
+              : null;
           var errors = analyzeAnalysisOptions(
             FileSource(file),
             content,
@@ -329,12 +329,11 @@ class Driver implements CommandLineStarter {
             }
             if (diagnostics.isNotEmpty) {
               for (var error in diagnostics) {
-                var severity =
-                    determineProcessedSeverity(
-                      error,
-                      options,
-                      analysisOptions,
-                    )!;
+                var severity = determineProcessedSeverity(
+                  error,
+                  options,
+                  analysisOptions,
+                )!;
                 allResult = allResult.max(severity);
               }
               var lineInfo = LineInfo.fromContent(content);
@@ -383,8 +382,11 @@ class Driver implements CommandLineStarter {
               ),
             ]);
             for (var error in errors) {
-              var severity =
-                  determineProcessedSeverity(error, options, analysisOptions)!;
+              var severity = determineProcessedSeverity(
+                error,
+                options,
+                analysisOptions,
+              )!;
               allResult = allResult.max(severity);
             }
           } catch (exception) {
diff --git a/pkg/analyzer_cli/lib/src/options.dart b/pkg/analyzer_cli/lib/src/options.dart
@@ -338,8 +338,9 @@ class CommandLineOptions {
   static String _getVersion() {
     try {
       // This is relative to bin/snapshot, so ../..
-      var versionPath =
-          io.Platform.script.resolve('../../version').toFilePath();
+      var versionPath = io.Platform.script
+          .resolve('../../version')
+          .toFilePath();
       var versionFile = io.File(versionPath);
       return versionFile.readAsStringSync().trim();
     } catch (_) {
diff --git a/pkg/analyzer_cli/pubspec.yaml b/pkg/analyzer_cli/pubspec.yaml
@@ -5,7 +5,7 @@ description: Command line interface for the Dart Analyzer.
 publish_to: none
 
 environment:
-  sdk: ^3.7.0
+  sdk: ^3.9.0
 
 resolution: workspace
 
diff --git a/pkg/analyzer_cli/test/options_test.dart b/pkg/analyzer_cli/test/options_test.dart
@@ -84,8 +84,12 @@ void main() {
       });
 
       test('disable cache flushing', () {
-        var options =
-            parse(['--dart-sdk', '.', '--disable-cache-flushing', 'foo.dart'])!;
+        var options = parse([
+          '--dart-sdk',
+          '.',
+          '--disable-cache-flushing',
+          'foo.dart',
+        ])!;
         expect(options.disableCacheFlushing, isTrue);
       });
 
@@ -148,29 +152,27 @@ void main() {
           test('mixed single and multiple flags', () {
             var options = overrideKnownFeatures(
               knownFeatures,
-              () =>
-                  parse([
-                    '--enable-experiment',
-                    'a,b',
-                    '--enable-experiment',
-                    'c',
-                    'foo.dart',
-                  ])!,
+              () => parse([
+                '--enable-experiment',
+                'a,b',
+                '--enable-experiment',
+                'c',
+                'foo.dart',
+              ])!,
             );
             expect(options.enabledExperiments, ['a', 'b', 'c']);
           });
 
           test('multiple flags', () {
             var options = overrideKnownFeatures(
               knownFeatures,
-              () =>
-                  parse([
-                    '--enable-experiment',
-                    'a',
-                    '--enable-experiment',
-                    'b',
-                    'foo.dart',
-                  ])!,
+              () => parse([
+                '--enable-experiment',
+                'a',
+                '--enable-experiment',
+                'b',
+                'foo.dart',
+              ])!,
             );
             expect(options.enabledExperiments, ['a', 'b']);
           });
@@ -184,58 +186,63 @@ void main() {
 
       group('format', () {
         test('json', () {
-          var options =
-              parse(['--dart-sdk', '.', '--format=json', 'foo.dart'])!;
+          var options = parse([
+            '--dart-sdk',
+            '.',
+            '--format=json',
+            'foo.dart',
+          ])!;
           expect(options.jsonFormat, isTrue);
           expect(options.machineFormat, isFalse);
         });
 
         test('machine', () {
-          var options =
-              parse(['--dart-sdk', '.', '--format=machine', 'foo.dart'])!;
+          var options = parse([
+            '--dart-sdk',
+            '.',
+            '--format=machine',
+            'foo.dart',
+          ])!;
           expect(options.jsonFormat, isFalse);
           expect(options.machineFormat, isTrue);
         });
       });
 
       test('options', () {
-        var options =
-            parse([
-              '--dart-sdk',
-              '.',
-              '--options',
-              'options.yaml',
-              'foo.dart',
-            ])!;
+        var options = parse([
+          '--dart-sdk',
+          '.',
+          '--options',
+          'options.yaml',
+          'foo.dart',
+        ])!;
         expect(options.defaultAnalysisOptionsPath, endsWith('options.yaml'));
       });
 
       test('sourceFiles', () {
-        var options =
-            parse([
-              '--dart-sdk',
-              '.',
-              '--log',
-              'foo.dart',
-              'foo2.dart',
-              'foo3.dart',
-            ])!;
+        var options = parse([
+          '--dart-sdk',
+          '.',
+          '--log',
+          'foo.dart',
+          'foo2.dart',
+          'foo3.dart',
+        ])!;
         expect(
           options.sourceFiles,
           equals(['foo.dart', 'foo2.dart', 'foo3.dart']),
         );
       });
 
       test('ignore unrecognized flags', () {
-        var options =
-            parse([
-              '--ignore-unrecognized-flags',
-              '--bar',
-              '--baz',
-              '--dart-sdk',
-              '.',
-              'foo.dart',
-            ])!;
+        var options = parse([
+          '--ignore-unrecognized-flags',
+          '--bar',
+          '--baz',
+          '--dart-sdk',
+          '.',
+          'foo.dart',
+        ])!;
         expect(options, isNotNull);
         expect(options.sourceFiles, equals(['foo.dart']));
       });
diff --git a/pkg/analyzer_cli/test/perf_report_test.dart b/pkg/analyzer_cli/test/perf_report_test.dart
@@ -12,10 +12,9 @@ import 'package:test/test.dart';
 
 void main() {
   test('makePerfReport', () {
-    var options =
-        CommandLineOptions.parse(PhysicalResourceProvider.INSTANCE, [
-          'somefile.dart',
-        ])!;
+    var options = CommandLineOptions.parse(PhysicalResourceProvider.INSTANCE, [
+      'somefile.dart',
+    ])!;
     var encoded = makePerfReport(1000, 1234, options, 0, AnalysisStats());
 
     var jsonData = json.decode(encoded);
diff --git a/pkg/analyzer_cli/test/utils.dart b/pkg/analyzer_cli/test/utils.dart
@@ -18,10 +18,9 @@ final String testDirectory = pathos.dirname(
 String get packageRoot {
   // If the package root directory is specified on the command line using
   // -DpkgRoot=..., use it.
-  var pkgRootVar =
-      const bool.hasEnvironment('pkgRoot')
-          ? const String.fromEnvironment('pkgRoot')
-          : null;
+  var pkgRootVar = const bool.hasEnvironment('pkgRoot')
+      ? const String.fromEnvironment('pkgRoot')
+      : null;
   if (pkgRootVar != null) {
     var path = pathos.join(Directory.current.path, pkgRootVar);
     if (!path.endsWith(pathos.separator)) path += pathos.separator;
