Bump DAS to use Dart SDK 3.9.0

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

Author: srawlins

pkg/analysis_server/benchmark/perf/dart_analyze.dart

@@ -139,18 +139,17 @@ class CmdLineSeveralProjectsBenchmark extends AbstractCmdLineBenchmark {
   String get workingDir => packageRoot;
 
   @override
-  List<String> analyzeWhat(bool quick) =>
-      quick
-          ? ['meta']
-          : [
-            'analysis_server',
-            'analysis_server_client',
-            'analyzer',
-            'analyzer_cli',
-            'analyzer_plugin',
-            'analyzer_utilities',
-            '_fe_analyzer_shared',
-          ];
+  List<String> analyzeWhat(bool quick) => quick
+      ? ['meta']
+      : [
+          'analysis_server',
+          'analysis_server_client',
+          'analyzer',
+          'analyzer_cli',
+          'analyzer_plugin',
+          'analyzer_utilities',
+          '_fe_analyzer_shared',
+        ];
 }
 
 class CmdLineSmallFileBenchmark extends AbstractCmdLineBenchmark {

pkg/analysis_server/integration_test/analysis/get_reachable_sources_test.dart

@@ -34,8 +34,8 @@ class Bar {
     await analysisFinished;
 
     var result =
-    // ignore: deprecated_member_use_from_same_package
-    await sendAnalysisGetReachableSources(pathname);
+        // ignore: deprecated_member_use_from_same_package
+        await sendAnalysisGetReachableSources(pathname);
     var sources = result.sources;
     var keys = sources.keys.toList();
     var url = File(pathname).uri.toString();

pkg/analysis_server/integration_test/analysis/occurrences_test.dart

@@ -52,10 +52,9 @@ void f() {
     }
 
     void check(String elementName, Iterable<String> expectedOccurrences) {
-      var expectedOffsets =
-          expectedOccurrences
-              .map((String substring) => text.indexOf(substring))
-              .toSet();
+      var expectedOffsets = expectedOccurrences
+          .map((String substring) => text.indexOf(substring))
+          .toSet();
       var foundOffsets = findOffsets(elementName);
       expect(foundOffsets, equals(expectedOffsets));
     }
@@ -102,10 +101,9 @@ void f() {
     }
 
     void check(String elementName, Iterable<String> expectedOccurrences) {
-      var expectedOffsets =
-          expectedOccurrences
-              .map((String substring) => text.indexOf(substring))
-              .toSet();
+      var expectedOffsets = expectedOccurrences
+          .map((String substring) => text.indexOf(substring))
+          .toSet();
       var foundOffsets = findOffsets(elementName);
       expect(foundOffsets, equals(expectedOffsets));
     }
@@ -156,10 +154,9 @@ void f() {
     }
 
     void check(String elementName, Iterable<String> expectedOccurrences) {
-      var expectedOffsets =
-          expectedOccurrences
-              .map((String substring) => text.indexOf(substring))
-              .toSet();
+      var expectedOffsets = expectedOccurrences
+          .map((String substring) => text.indexOf(substring))
+          .toSet();
       var foundOffsets = findOffsets(elementName);
       expect(foundOffsets, equals(expectedOffsets));
     }
@@ -212,10 +209,9 @@ void f() {
     }
 
     void check(String elementName, Iterable<String> expectedOccurrences) {
-      var expectedOffsets =
-          expectedOccurrences
-              .map((String substring) => text.indexOf(substring))
-              .toSet();
+      var expectedOffsets = expectedOccurrences
+          .map((String substring) => text.indexOf(substring))
+          .toSet();
       var foundOffsets = findOffsets(elementName);
       expect(foundOffsets, equals(expectedOffsets));
     }

pkg/analysis_server/integration_test/analysis/update_content_list_test.dart

@@ -37,11 +37,10 @@ void f() {
     // order in which they appear in the file.  If these edits are applied in
     // the wrong order, some of the quotation marks will be in the wrong
     // places, and there will still be errors.
-    var edits =
-        '"'
-            .allMatches(goodText)
-            .map((Match match) => SourceEdit(match.start, 0, '"'))
-            .toList();
+    var edits = '"'
+        .allMatches(goodText)
+        .map((Match match) => SourceEdit(match.start, 0, '"'))
+        .toList();
     await sendAnalysisUpdateContent({pathname: ChangeContentOverlay(edits)});
     await analysisFinished;
     // There should be no errors now, assuming that quotation marks have been

pkg/analysis_server/integration_test/coverage_test.dart

@@ -23,35 +23,29 @@ void main() {
   var lines = coverageFile.readAsLinesSync();
 
   // ## server domain
-  var coveredDomains =
-      lines
-          .where((line) => line.startsWith('## ') && line.endsWith(' domain'))
-          .map(
-            (line) =>
-                line
-                    .substring('##'.length, line.length - 'domain'.length)
-                    .trim(),
-          )
-          .toSet();
+  var coveredDomains = lines
+      .where((line) => line.startsWith('## ') && line.endsWith(' domain'))
+      .map(
+        (line) =>
+            line.substring('##'.length, line.length - 'domain'.length).trim(),
+      )
+      .toSet();
 
   // Remove any ' (test failed)' suffixes.
-  lines =
-      lines.map((String line) {
-        var index = line.indexOf('(');
-        return index != -1 ? line.substring(0, index).trim() : line;
-      }).toList();
+  lines = lines.map((String line) {
+    var index = line.indexOf('(');
+    return index != -1 ? line.substring(0, index).trim() : line;
+  }).toList();
 
   // - [ ] server.getVersion
-  var allMembers =
-      lines
-          .where((line) => line.startsWith('- '))
-          .map((line) => line.substring('- [ ]'.length).trim())
-          .toSet();
-  var coveredMembers =
-      lines
-          .where((line) => line.startsWith('- [x]'))
-          .map((line) => line.substring('- [x]'.length).trim())
-          .toSet();
+  var allMembers = lines
+      .where((line) => line.startsWith('- '))
+      .map((line) => line.substring('- [ ]'.length).trim())
+      .toSet();
+  var coveredMembers = lines
+      .where((line) => line.startsWith('- [x]'))
+      .map((line) => line.substring('- [x]'.length).trim())
+      .toSet();
 
   // generate domain tests
   for (var domain in api.domains) {
@@ -85,10 +79,9 @@ void main() {
             expect(
               fileExists,
               isMarkedAsCovered,
-              reason:
-                  isMarkedAsCovered
-                      ? '$testName marked as covered but has no test at $testPath'
-                      : '$testName marked as not covered has test at $testPath',
+              reason: isMarkedAsCovered
+                  ? '$testName marked as covered but has no test at $testPath'
+                  : '$testName marked as not covered has test at $testPath',
             );
           });
         }

pkg/analysis_server/integration_test/lsp_server/integration_tests.dart

@@ -139,10 +139,9 @@ abstract class AbstractLspAnalysisServerIntegrationTest
   @mustCallSuper
   Future<void> setUp() async {
     // Set up temporary folder for the test.
-    projectFolderPath =
-        Directory.systemTemp
-            .createTempSync('analysisServer_test_integration_lspProject')
-            .resolveSymbolicLinksSync();
+    projectFolderPath = Directory.systemTemp
+        .createTempSync('analysisServer_test_integration_lspProject')
+        .resolveSymbolicLinksSync();
     _temporaryFolders.add(projectFolderPath);
     newFolder(projectFolderPath);
     newFolder(path.join(projectFolderPath, 'lib'));

pkg/analysis_server/integration_test/server/blaze_changes_test.dart

@@ -56,12 +56,11 @@ class BlazeChangesTest extends AbstractAnalysisServerIntegrationTest {
     await super.setUp();
     oldSourceDirectory = sourceDirectory;
 
-    tmpPath =
-        Directory(
-          Directory.systemTemp
-              .createTempSync('analysisServer_test_integration_blazeProject')
-              .resolveSymbolicLinksSync(),
-        ).path;
+    tmpPath = Directory(
+      Directory.systemTemp
+          .createTempSync('analysisServer_test_integration_blazeProject')
+          .resolveSymbolicLinksSync(),
+    ).path;
     _temporaryFolders.add(tmpPath);
     workspacePath = inTmpDir('workspace_root');
     writeFile(inWorkspace(file_paths.blazeWorkspaceMarker), '');

pkg/analysis_server/integration_test/support/integration_test_methods.dart

@@ -285,8 +285,8 @@ abstract class IntegrationTest {
   ///
   ///   The stack trace associated with the generation of the error, used for
   ///   debugging the server.
-  late final Stream<ServerErrorParams> onServerError =
-      _onServerError.stream.asBroadcastStream();
+  late final Stream<ServerErrorParams> onServerError = _onServerError.stream
+      .asBroadcastStream();
 
   /// Stream controller for [onServerError].
   final _onServerError = StreamController<ServerErrorParams>(sync: true);
@@ -314,8 +314,8 @@ abstract class IntegrationTest {
   /// Parameters
   ///
   /// entry: ServerLogEntry
-  late final Stream<ServerLogParams> onServerLog =
-      _onServerLog.stream.asBroadcastStream();
+  late final Stream<ServerLogParams> onServerLog = _onServerLog.stream
+      .asBroadcastStream();
 
   /// Stream controller for [onServerLog].
   final _onServerLog = StreamController<ServerLogParams>(sync: true);
@@ -341,8 +341,8 @@ abstract class IntegrationTest {
   ///
   ///   Note: this status type is deprecated, and is no longer sent by the
   ///   server.
-  late final Stream<ServerStatusParams> onServerStatus =
-      _onServerStatus.stream.asBroadcastStream();
+  late final Stream<ServerStatusParams> onServerStatus = _onServerStatus.stream
+      .asBroadcastStream();
 
   /// Stream controller for [onServerStatus].
   final _onServerStatus = StreamController<ServerStatusParams>(sync: true);
@@ -973,8 +973,9 @@ abstract class IntegrationTest {
   /// errors: List<AnalysisError>
   ///
   ///   The errors contained in the file.
-  late final Stream<AnalysisErrorsParams> onAnalysisErrors =
-      _onAnalysisErrors.stream.asBroadcastStream();
+  late final Stream<AnalysisErrorsParams> onAnalysisErrors = _onAnalysisErrors
+      .stream
+      .asBroadcastStream();
 
   /// Stream controller for [onAnalysisErrors].
   final _onAnalysisErrors = StreamController<AnalysisErrorsParams>(sync: true);
@@ -1436,8 +1437,8 @@ abstract class IntegrationTest {
   ///
   ///   The existing imports in the library.
   late final Stream<CompletionExistingImportsParams>
-  onCompletionExistingImports =
-      _onCompletionExistingImports.stream.asBroadcastStream();
+  onCompletionExistingImports = _onCompletionExistingImports.stream
+      .asBroadcastStream();
 
   /// Stream controller for [onCompletionExistingImports].
   final _onCompletionExistingImports =
@@ -1723,8 +1724,9 @@ abstract class IntegrationTest {
   ///
   ///   True if this is that last set of results that will be returned for the
   ///   indicated search.
-  late final Stream<SearchResultsParams> onSearchResults =
-      _onSearchResults.stream.asBroadcastStream();
+  late final Stream<SearchResultsParams> onSearchResults = _onSearchResults
+      .stream
+      .asBroadcastStream();
 
   /// Stream controller for [onSearchResults].
   final _onSearchResults = StreamController<SearchResultsParams>(sync: true);
@@ -3014,8 +3016,9 @@ abstract class IntegrationTest {
   /// outline: FlutterOutline
   ///
   ///   The outline associated with the file.
-  late final Stream<FlutterOutlineParams> onFlutterOutline =
-      _onFlutterOutline.stream.asBroadcastStream();
+  late final Stream<FlutterOutlineParams> onFlutterOutline = _onFlutterOutline
+      .stream
+      .asBroadcastStream();
 
   /// Stream controller for [onFlutterOutline].
   final _onFlutterOutline = StreamController<FlutterOutlineParams>(sync: true);

pkg/analysis_server/integration_test/support/integration_tests.dart

@@ -604,11 +604,9 @@ class Server {
   ]) {
     // Provide a default implementation of the reverse request processor that
     // just throws because there are many tests that don't use reverse-requests.
-    reverseRequestProcessor ??=
-        (_) =>
-            throw UnimplementedError(
-              "A reverse request was received but the test did not provide 'reverseRequestProcessor'",
-            );
+    reverseRequestProcessor ??= (_) => throw UnimplementedError(
+      "A reverse request was received but the test did not provide 'reverseRequestProcessor'",
+    );
 
     _process.stdout.transform(utf8.decoder).transform(LineSplitter()).listen((
       String line,
@@ -620,18 +618,16 @@ class Server {
       //   {"event":"server.connected","params":{...}}The Dart VM service is listening on ...
       const dartVMServiceMessage = 'The Dart VM service is listening on ';
       if (trimmedLine.contains(dartVMServiceMessage)) {
-        trimmedLine =
-            trimmedLine
-                .substring(0, trimmedLine.indexOf(dartVMServiceMessage))
-                .trim();
+        trimmedLine = trimmedLine
+            .substring(0, trimmedLine.indexOf(dartVMServiceMessage))
+            .trim();
       }
       const devtoolsMessage =
           'The Dart DevTools debugger and profiler is available at:';
       if (trimmedLine.contains(devtoolsMessage)) {
-        trimmedLine =
-            trimmedLine
-                .substring(0, trimmedLine.indexOf(devtoolsMessage))
-                .trim();
+        trimmedLine = trimmedLine
+            .substring(0, trimmedLine.indexOf(devtoolsMessage))
+            .trim();
       }
       if (trimmedLine.isEmpty) {
         return;
@@ -998,10 +994,9 @@ abstract class _RecursiveMatcher extends Matcher {
         mismatchDescription = mismatchDescription
             .add(' (should be ')
             .addDescriptionOf(matcher);
-        var subDescription =
-            matcher
-                .describeMismatch(item, StringDescription(), subState, false)
-                .toString();
+        var subDescription = matcher
+            .describeMismatch(item, StringDescription(), subState, false)
+            .toString();
         if (subDescription.isNotEmpty) {
           mismatchDescription = mismatchDescription
               .add('; ')
@@ -1062,10 +1057,9 @@ abstract class _RecursiveMatcher extends Matcher {
   void populateMismatches(Object? item, List<MismatchDescriber> mismatches);
 
   /// Create a [MismatchDescriber] describing a mismatch with a simple string.
-  MismatchDescriber simpleDescription(String description) => (
-    Description mismatchDescription,
-  ) {
-    mismatchDescription.add(description);
-    return mismatchDescription;
-  };
+  MismatchDescriber simpleDescription(String description) =>
+      (Description mismatchDescription) {
+        mismatchDescription.add(description);
+        return mismatchDescription;
+      };
 }

pkg/analysis_server/lib/plugin/protocol/protocol_dart.dart

@@ -257,17 +257,15 @@ int _preferRequiredParams(
   engine.FormalParameterElement e1,
   engine.FormalParameterElement e2,
 ) {
-  var rank1 =
-      (e1.isRequiredNamed || e1.metadata.hasRequired)
-          ? 0
-          : !e1.isNamed
-          ? -1
-          : 1;
-  var rank2 =
-      (e2.isRequiredNamed || e2.metadata.hasRequired)
-          ? 0
-          : !e2.isNamed
-          ? -1
-          : 1;
+  var rank1 = (e1.isRequiredNamed || e1.metadata.hasRequired)
+      ? 0
+      : !e1.isNamed
+      ? -1
+      : 1;
+  var rank2 = (e2.isRequiredNamed || e2.metadata.hasRequired)
+      ? 0
+      : !e2.isNamed
+      ? -1
+      : 1;
   return rank1 - rank2;
 }