Add a few await(s) in DAS integration tests.

Change-Id: Iee36f383a3b5b21eab1b6bbd9c59115a4e585567
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/250983
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Reviewed-by: Samuel Rawlins <srawlins@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>

pkg/analysis_server/test/integration/analysis/analysis_options_test.dart

@@ -17,10 +17,10 @@ void main() {
 
 @reflectiveTest
 class OptionsIntegrationTest extends AbstractAnalysisServerIntegrationTest {
-  void optionsAnalysisSetup() {
+  Future<void> optionsAnalysisSetup() async {
     // Add an empty Dart file; required to trigger analysis (#35383).
     writeFile(sourcePath('test.dart'), '');
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
   }
 
   Future<void> test_option_warning_optionFile() async {
@@ -31,7 +31,7 @@ linter:
     - camel_case_typo # :)
 ''');
 
-    optionsAnalysisSetup();
+    await optionsAnalysisSetup();
 
     await analysisFinished;
 

pkg/analysis_server/test/integration/analysis/error_test.dart

@@ -36,19 +36,19 @@ void f() {
     expect(errors[0].location.file, equals(filePath));
   }
 
-  Future<void> test_detect_simple_error() {
+  Future<void> test_detect_simple_error() async {
     var pathname = sourcePath('test.dart');
     writeFile(pathname, '''
 void f() {
   print(null) // parse error: missing ';'
 }''');
-    standardAnalysisSetup();
-    return analysisFinished.then((_) {
-      expect(currentAnalysisErrors[pathname], isList);
-      var errors = existingErrorsForFile(pathname);
-      expect(errors, hasLength(1));
-      expect(errors[0].location.file, equals(pathname));
-    });
+    await standardAnalysisSetup();
+
+    await analysisFinished;
+    expect(currentAnalysisErrors[pathname], isList);
+    var errors = existingErrorsForFile(pathname);
+    expect(errors, hasLength(1));
+    expect(errors[0].location.file, equals(pathname));
   }
 
   @failingTest
@@ -77,7 +77,7 @@ abstract class C extends B {
     // ignore: deprecated_member_use_from_same_package
     await sendAnalysisUpdateOptions(
         AnalysisOptions()..enableSuperMixins = true);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     await analysisFinished;
     expect(currentAnalysisErrors[pathname], isList);
     var errors = currentAnalysisErrors[pathname];

pkg/analysis_server/test/integration/analysis/get_errors_non_standard_sdk_test.dart

@@ -126,7 +126,7 @@ import 'dart:core';
 import 'dart:fake';
 ''';
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     await analysisFinished;
     var errors = existingErrorsForFile(pathname);
     expect(errors, hasLength(1));

pkg/analysis_server/test/integration/analysis/get_errors_test.dart

@@ -22,7 +22,7 @@ void f() {
   var x // parse error: missing ';'
 }''';
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     await analysisFinished;
     var result = await sendAnalysisGetErrors(pathname);
     expect(result.errors, equals(currentAnalysisErrors[pathname]));

pkg/analysis_server/test/integration/analysis/get_hover_test.dart

@@ -133,7 +133,7 @@ void f() {
 
   Future<void> test_getHover() async {
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
 
     // Note: analysis.getHover doesn't wait for analysis to complete--it simply
     // returns the latest results that are available at the time that the

pkg/analysis_server/test/integration/analysis/get_imported_elements_test.dart

@@ -95,7 +95,7 @@ class AnalysisGetImportedElementsIntegrationTest
 void f() {}
 ''';
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     await analysisFinished;
 
     await checkNoElements('f() {}');
@@ -112,7 +112,7 @@ void f() {
 }
 ''';
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     await analysisFinished;
 
     if (disableManageImportsOnPaste) {

pkg/analysis_server/test/integration/analysis/get_library_dependencies_test.dart

@@ -28,7 +28,7 @@ class Bar {
 }
 ''';
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     await analysisFinished;
 
     var result = await sendAnalysisGetLibraryDependencies();

pkg/analysis_server/test/integration/analysis/get_navigation_test.dart

@@ -26,7 +26,7 @@ class Bar {
 }
 ''';
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
 
     await analysisFinished;
 
@@ -53,7 +53,7 @@ class Bar {
 }
 ''';
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
 
     await analysisFinished;
 

pkg/analysis_server/test/integration/analysis/get_reachable_sources_test.dart

@@ -30,7 +30,7 @@ class Bar {
 }
 ''';
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     await analysisFinished;
 
     var result =

pkg/analysis_server/test/integration/analysis/highlights_test.dart

@@ -26,7 +26,7 @@ class AnalysisHighlightsTest extends AbstractAnalysisServerIntegrationTest {
 
   Future<void> computeHighlights(String pathname, String text) async {
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     await analysisFinished;
     sendAnalysisSetSubscriptions({
       AnalysisService.HIGHLIGHTS: [pathname]

pkg/analysis_server/test/integration/analysis/hint_sdk_version_async_exported_from_core_test.dart

@@ -29,7 +29,7 @@ environment:
     writeFile(testPath, '''
 Future<int> zero() async => 0;
 ''');
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
 
     // There is a hint with this SDK version constraint.
     await analysisFinished;

pkg/analysis_server/test/integration/analysis/lint_test.dart

@@ -22,7 +22,7 @@ class LintIntegrationTest extends AbstractAnalysisServerIntegrationTest {
     writeFile(source, '''
 class abc { // lint: not CamelCase (should get ignored though)
 }''');
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
 
     await analysisFinished;
     expect(currentAnalysisErrors[source], isList);
@@ -43,7 +43,7 @@ linter:
 class a { // lint: not CamelCase
 }''');
 
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
 
     await analysisFinished;
 

pkg/analysis_server/test/integration/analysis/navigation_test.dart

@@ -54,7 +54,7 @@ void f() {
 part of foo;
 ''';
     writeFile(pathname2, text2);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     sendAnalysisSetSubscriptions({
       AnalysisService.NAVIGATION: [pathname1]
     });

pkg/analysis_server/test/integration/analysis/occurrences_test.dart

@@ -30,7 +30,7 @@ void f() {
 }
 ''';
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     sendAnalysisSetSubscriptions({
       AnalysisService.OCCURRENCES: [pathname]
     });

pkg/analysis_server/test/integration/analysis/outline_test.dart

@@ -41,7 +41,7 @@ class Class2 {
 }
 ''';
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     sendAnalysisSetSubscriptions({
       AnalysisService.OUTLINE: [pathname]
     });

pkg/analysis_server/test/integration/analysis/overrides_test.dart

@@ -52,7 +52,7 @@ class Target extends Base implements Interface1, Interface2 {
 }
 ''';
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     sendAnalysisSetSubscriptions({
       AnalysisService.OVERRIDES: [pathname]
     });

pkg/analysis_server/test/integration/analysis/reanalyze_concurrent_test.dart

@@ -20,7 +20,7 @@ void main() {
 @reflectiveTest
 class ReanalyzeTest extends AbstractAnalysisServerIntegrationTest {
   @TestTimeout(Timeout.factor(2))
-  Future<void> test_reanalyze_concurrent() {
+  Future<void> test_reanalyze_concurrent() async {
     var pathname = sourcePath('test.dart');
     var text = '''
 // Do a bunch of imports so that analysis has some work to do.
@@ -30,18 +30,19 @@ import 'dart:async';
 
 void f() {}''';
     writeFile(pathname, text);
-    standardAnalysisSetup();
-    return analysisFinished.then((_) {
-      sendAnalysisReanalyze();
-      // Wait for reanalysis to start.
-      return onServerStatus.first.then((_) {
-        sendAnalysisReanalyze();
-        return analysisFinished.then((_) {
-          // Now that reanalysis has finished, give the server an extra second
-          // to make sure it doesn't crash.
-          return Future.delayed(Duration(seconds: 1));
-        });
-      });
-    });
+    await standardAnalysisSetup();
+
+    await analysisFinished;
+    await sendAnalysisReanalyze();
+
+    // Wait for reanalysis to start.
+    await onServerStatus.first;
+
+    await sendAnalysisReanalyze();
+    await analysisFinished;
+
+    // Now that reanalysis has finished, give the server an extra second
+    // to make sure it doesn't crash.
+    await Future.delayed(Duration(seconds: 1));
   }
 }

pkg/analysis_server/test/integration/analysis/reanalyze_test.dart

@@ -16,24 +16,24 @@ void main() {
 
 @reflectiveTest
 class ReanalyzeTest extends AbstractAnalysisServerIntegrationTest {
-  Future<void> test_reanalyze() {
+  Future<void> test_reanalyze() async {
     var pathname = sourcePath('test.dart');
     var text = 'void f() {}';
     writeFile(pathname, text);
-    standardAnalysisSetup();
-    return analysisFinished.then((_) {
-      // Make sure that reanalyze causes analysis to restart.
-      var analysisRestarted = false;
-      onServerStatus.listen((ServerStatusParams data) {
-        var analysisStatus = data.analysis;
-        if (analysisStatus != null && analysisStatus.isAnalyzing) {
-          analysisRestarted = true;
-        }
-      });
-      sendAnalysisReanalyze();
-      return analysisFinished.then((_) {
-        expect(analysisRestarted, isTrue);
-      });
+    await standardAnalysisSetup();
+    await analysisFinished;
+
+    // Make sure that reanalyze causes analysis to restart.
+    var analysisRestarted = false;
+    onServerStatus.listen((ServerStatusParams data) {
+      var analysisStatus = data.analysis;
+      if (analysisStatus != null && analysisStatus.isAnalyzing) {
+        analysisRestarted = true;
+      }
     });
+
+    await sendAnalysisReanalyze();
+    await analysisFinished;
+    expect(analysisRestarted, isTrue);
   }
 }

pkg/analysis_server/test/integration/analysis/set_analysis_roots_test.dart

@@ -24,7 +24,7 @@ class Foo {
 ''');
 
     // Calling this will call analysis.setAnalysisRoots.
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
 
     await analysisFinished;
     expect(currentAnalysisErrors[pathname], isEmpty);

pkg/analysis_server/test/integration/analysis/set_general_subscriptions_test.dart

@@ -26,7 +26,7 @@ class Foo {
 }
 ''');
 
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
 
     await sendAnalysisSetGeneralSubscriptions(
         [GeneralAnalysisService.ANALYZED_FILES]);

pkg/analysis_server/test/integration/analysis/set_priority_files_test.dart

@@ -20,7 +20,7 @@ class SetPriorityFilesTest extends AbstractAnalysisServerIntegrationTest {
     writeFile(pathname, 'class Foo { void baz() {} }');
     writeFile(sourcePath('bar.dart'), 'class Bar { void baz() {} }');
 
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     await sendAnalysisSetPriorityFiles([pathname]);
 
     var status = await analysisFinished;

pkg/analysis_server/test/integration/analysis/set_subscriptions_test.dart

@@ -24,7 +24,7 @@ class Foo {
 ''');
 
     // Calling this will subscribe to ServerService.STATUS.
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
 
     await analysisFinished;
     expect(currentAnalysisErrors[pathname], isEmpty);

pkg/analysis_server/test/integration/analysis/update_content_list_test.dart

@@ -16,7 +16,7 @@ void main() {
 
 @reflectiveTest
 class UpdateContentTest extends AbstractAnalysisServerIntegrationTest {
-  Future<void> test_updateContent_list() {
+  Future<void> test_updateContent_list() async {
     var pathname = sourcePath('test.dart');
     var goodText = r'''
 void f() {
@@ -26,27 +26,24 @@ void f() {
     var badText = goodText.replaceAll('"', '');
     // Create a dummy file
     writeFile(pathname, '// dummy text');
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     // Override file contents with badText.
-    sendAnalysisUpdateContent({pathname: AddContentOverlay(badText)});
-    return analysisFinished.then((_) {
-      // The overridden contents (badText) are missing quotation marks.
-      expect(currentAnalysisErrors[pathname], isNotEmpty);
-    }).then((_) {
-      // Prepare a set of edits which add the missing quotation marks, in the
-      // 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();
-      sendAnalysisUpdateContent({pathname: ChangeContentOverlay(edits)});
-      return analysisFinished;
-    }).then((_) {
-      // There should be no errors now, assuming that quotation marks have been
-      // inserted in all the correct places.
-      expect(currentAnalysisErrors[pathname], isEmpty);
-    });
+    await sendAnalysisUpdateContent({pathname: AddContentOverlay(badText)});
+    await analysisFinished;
+    // The overridden contents (badText) are missing quotation marks.
+    expect(currentAnalysisErrors[pathname], isNotEmpty);
+    // Prepare a set of edits which add the missing quotation marks, in the
+    // 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();
+    await sendAnalysisUpdateContent({pathname: ChangeContentOverlay(edits)});
+    await analysisFinished;
+    // There should be no errors now, assuming that quotation marks have been
+    // inserted in all the correct places.
+    expect(currentAnalysisErrors[pathname], isEmpty);
   }
 }

pkg/analysis_server/test/integration/analysis/update_content_test.dart

@@ -25,7 +25,7 @@ void f() {
 
     var badText = goodText.replaceAll(';', '');
     writeFile(path, badText);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
 
     // The contents on disk (badText) are missing a semicolon.
     await analysisFinished;
@@ -73,7 +73,7 @@ void f() {
   print(p);
 }
 ''');
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     await analysisFinished;
     expect(currentAnalysisErrors[pathname], isList);
     var errors1 = existingErrorsForFile(pathname);

pkg/analysis_server/test/integration/analysis/update_options_test.dart

@@ -28,7 +28,7 @@ class Foo {
   void bar() {}
 }
 ''');
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
 
     // ignore: deprecated_member_use_from_same_package
     await sendAnalysisUpdateOptions(AnalysisOptions()..generateHints = false);

pkg/analysis_server/test/integration/analytics/enable_test.dart

@@ -16,7 +16,7 @@ void main() {
 @reflectiveTest
 class EnableTest extends AbstractAnalysisServerIntegrationTest {
   Future<void> test_call_enable() async {
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
 
     // Toggle the value twice; do light verification of the changes, as the
     // analysis server - when running on our CI bots - deliberately does not

pkg/analysis_server/test/integration/analytics/is_enabled_test.dart

@@ -16,7 +16,7 @@ void main() {
 @reflectiveTest
 class IsEnabledTest extends AbstractAnalysisServerIntegrationTest {
   Future<void> test_isEnabled() async {
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
 
     var result = await sendAnalyticsIsEnabled();
     // Very lightweight validation of the returned data.

pkg/analysis_server/test/integration/analytics/send_event_test.dart

@@ -15,7 +15,7 @@ void main() {
 @reflectiveTest
 class SendEventTest extends AbstractAnalysisServerIntegrationTest {
   Future<void> test_send_event() async {
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
 
     // Disable analytics.
     var result1 = await sendAnalyticsIsEnabled();

pkg/analysis_server/test/integration/analytics/send_timing_test.dart

@@ -15,7 +15,7 @@ void main() {
 @reflectiveTest
 class SendTimingTest extends AbstractAnalysisServerIntegrationTest {
   Future<void> test_send_timing() async {
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
 
     // Disable analytics.
     var result1 = await sendAnalyticsIsEnabled();

pkg/analysis_server/test/integration/completion/get_suggestions_test.dart

@@ -90,7 +90,7 @@ void f() {
   test.^
 }
 ''');
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     await analysisFinished;
     // Create an overlay but do not write the file to "disk"
     //   writeFile(pathname, text);
@@ -110,7 +110,7 @@ void f() {
     // Do not write the file to "disk"
     //   writeFile(pathname, text);
     // Don't wait for any results except the completion notifications
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     await analysisFinished;
     // Missing file and no overlay
     //sendAnalysisUpdateContent({path: new AddContentOverlay(content)});

pkg/analysis_server/test/integration/diagnostic/get_diagnostics_test.dart

@@ -16,7 +16,7 @@ void main() {
 @reflectiveTest
 class GetDiagnosticsTest extends AbstractAnalysisServerIntegrationTest {
   Future<void> test_getDiagnostics() async {
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     await analysisFinished;
 
     var result = await sendDiagnosticGetDiagnostics();

pkg/analysis_server/test/integration/diagnostic/get_server_port_test.dart

@@ -19,7 +19,7 @@ void main() {
 @reflectiveTest
 class GetServerPortTest extends AbstractAnalysisServerIntegrationTest {
   Future<void> test_connect() async {
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
 
     var result = await sendDiagnosticGetServerPort();
     expect(result.port, isNotNull);

pkg/analysis_server/test/integration/edit/bulk_fixes_test.dart

@@ -16,7 +16,7 @@ void main() {
 
 @reflectiveTest
 class BulkFixesTest extends AbstractAnalysisServerIntegrationTest {
-  void setupTarget() {
+  Future<void> setupTarget() async {
     writeFile(sourcePath('test.dart'), '''
 class A {
   void f() {}
@@ -25,7 +25,7 @@ class B extends A {
   void f() { }
 }
 ''');
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
   }
 
   Future<void> test_bulk_fix_override() async {
@@ -42,7 +42,7 @@ class B extends A {
   void f() { }
 }
 ''');
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     await analysisFinished;
 
     var result = await sendEditBulkFixes([sourceDirectory.path]);

pkg/analysis_server/test/integration/edit/format_test.dart

@@ -15,7 +15,7 @@ void main() {
 
 @reflectiveTest
 class FormatTest extends AbstractAnalysisServerIntegrationTest {
-  String formatTestSetup({bool withErrors = false}) {
+  Future<String> formatTestSetup({bool withErrors = false}) async {
     var pathname = sourcePath('test.dart');
 
     if (withErrors) {
@@ -41,12 +41,12 @@ class Class1 {
 ''';
       writeFile(pathname, text);
     }
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     return pathname;
   }
 
   Future<void> test_format() async {
-    var pathname = formatTestSetup();
+    var pathname = await formatTestSetup();
 
     var result = await sendEditFormat(pathname, 0, 0);
     expect(result.edits, isNotEmpty);
@@ -55,7 +55,7 @@ class Class1 {
   }
 
   Future<void> test_format_preserve_selection() async {
-    var pathname = formatTestSetup();
+    var pathname = await formatTestSetup();
 
     // format with 'bar' selected
     var initialPosition = readFile(pathname).indexOf('bar()');
@@ -66,7 +66,7 @@ class Class1 {
   }
 
   Future<void> test_format_with_errors() async {
-    var pathname = formatTestSetup(withErrors: true);
+    var pathname = await formatTestSetup(withErrors: true);
 
     try {
       await sendEditFormat(pathname, 0, 0);

pkg/analysis_server/test/integration/edit/get_assists_test.dart

@@ -24,7 +24,7 @@ import 'dart:async';
 var c = Completer();
 ''';
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
 
     await analysisFinished;
     expect(currentAnalysisErrors[pathname], isEmpty);

pkg/analysis_server/test/integration/edit/get_available_refactorings_test.dart

@@ -22,7 +22,7 @@ class GetAvailableRefactoringsTest
 void foo() { }
 ''';
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
 
     await analysisFinished;
     expect(currentAnalysisErrors[pathname], isEmpty);

pkg/analysis_server/test/integration/edit/get_fixes_test.dart

@@ -22,7 +22,7 @@ class GetFixesTest extends AbstractAnalysisServerIntegrationTest {
 FutureOr f;
 ''';
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
 
     await analysisFinished;
     expect(currentAnalysisErrors[pathname], isNotEmpty);
@@ -50,7 +50,7 @@ import 'dart:async';
 FutureOr f;
 ''';
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     await analysisFinished;
 
     var result = await sendEditGetFixes(pathname, text.indexOf('FutureOr f'));

pkg/analysis_server/test/integration/edit/get_postfix_completion_test.dart

@@ -28,7 +28,7 @@ void foo() { }
     var loc = text.indexOf('.tryon');
     text = text.replaceAll('.tryon', '');
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
 
     await analysisFinished;
     expect(currentAnalysisErrors[pathname], isEmpty);

pkg/analysis_server/test/integration/edit/get_refactoring_test.dart

@@ -28,7 +28,7 @@ void bar() {
 }
 ''';
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
 
     await analysisFinished;
     expect(currentAnalysisErrors[pathname], isEmpty);

pkg/analysis_server/test/integration/edit/get_statement_completion_test.dart

@@ -23,7 +23,7 @@ class GetStatementCompletionTest extends AbstractAnalysisServerIntegrationTest {
 void bar() { foo() } // missing semi-colon
 void foo() { }''';
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
 
     await analysisFinished;
     expect(currentAnalysisErrors[pathname], isNotEmpty);

pkg/analysis_server/test/integration/edit/import_elements_test.dart

@@ -79,7 +79,7 @@ class AnalysisGetImportElementsIntegrationTest
 
   Future<void> test_importElements_definingUnit() async {
     writeFile(pathname, 'void f() {}');
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     await analysisFinished;
     var provider = PhysicalResourceProvider.INSTANCE;
     var sdkPath = getSdkPath();
@@ -95,7 +95,7 @@ class AnalysisGetImportElementsIntegrationTest
 
   Future<void> test_importElements_noEdits() async {
     writeFile(pathname, '');
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     await analysisFinished;
 
     await checkNoEdits(<ImportedElements>[]);
@@ -112,7 +112,7 @@ part of 'lib.dart';
 
 class C {}
 ''');
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     await analysisFinished;
     var provider = PhysicalResourceProvider.INSTANCE;
     var sdkPath = getSdkPath();

pkg/analysis_server/test/integration/edit/is_postfix_completion_applicable_test.dart

@@ -27,7 +27,7 @@ void foo() { }
     var loc = text.indexOf('.tryon');
     text = text.replaceAll('.tryon', '');
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
 
     await analysisFinished;
     expect(currentAnalysisErrors[pathname], isEmpty);

pkg/analysis_server/test/integration/edit/list_postfix_completion_templates_test.dart

@@ -27,7 +27,7 @@ void foo() { }
 ''';
     text = text.replaceAll('.tryon', '');
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
 
     await analysisFinished;
 

pkg/analysis_server/test/integration/edit/organize_directives_test.dart

@@ -25,7 +25,7 @@ Completer foo;
 int minified(int x, int y) => min(x, y);
 ''';
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     await analysisFinished;
 
     var result = await sendEditOrganizeDirectives(pathname);
@@ -45,7 +45,7 @@ Completer foo;
 int minified(int x, int y) => min(x, y);
 ''';
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     await analysisFinished;
 
     var result = await sendEditOrganizeDirectives(pathname);
@@ -63,7 +63,7 @@ Completer foo;
 int minified(int x, int y) => min(x, y);
 ''';
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     await analysisFinished;
 
     try {

pkg/analysis_server/test/integration/edit/sort_members_test.dart

@@ -22,7 +22,7 @@ int foo;
 int bar;
 ''';
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     await analysisFinished;
 
     var result = await sendEditSortMembers(pathname);
@@ -38,7 +38,7 @@ int bar;
 int foo;
 ''';
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     await analysisFinished;
 
     var result = await sendEditSortMembers(pathname);
@@ -53,7 +53,7 @@ int foo
 int bar;
 ''';
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     await analysisFinished;
 
     try {

pkg/analysis_server/test/integration/execution/create_context_test.dart

@@ -16,7 +16,7 @@ void main() {
 @reflectiveTest
 class CreateContextTest extends AbstractAnalysisServerIntegrationTest {
   Future<void> test_create() async {
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     var contextId = (await sendExecutionCreateContext(sourceDirectory.path)).id;
     expect(contextId, isNotNull);
   }

pkg/analysis_server/test/integration/execution/delete_context_test.dart

@@ -18,7 +18,7 @@ class DeleteContextTest extends AbstractAnalysisServerIntegrationTest {
   Future<void> test_delete() async {
     var pathname = sourcePath('lib/main.dart');
     writeFile(pathname, '// dummy');
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     await analysisFinished;
 
     var contextId = (await sendExecutionCreateContext(sourceDirectory.path)).id;

pkg/analysis_server/test/integration/execution/map_uri_test.dart

@@ -18,7 +18,7 @@ class MapUriTest extends AbstractAnalysisServerIntegrationTest {
   Future<void> test_mapUri() async {
     var pathname = sourcePath('lib/main.dart');
     writeFile(pathname, '// dummy');
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     await analysisFinished;
 
     var contextId = (await sendExecutionCreateContext(sourceDirectory.path)).id;

pkg/analysis_server/test/integration/execution/set_subscriptions_test.dart

@@ -16,7 +16,7 @@ void main() {
 @reflectiveTest
 class SetSubscriptionsTest extends AbstractAnalysisServerIntegrationTest {
   Future<void> test_subscribe() async {
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     // ignore: deprecated_member_use_from_same_package
     await sendExecutionSetSubscriptions([ExecutionService.LAUNCH_DATA]);
   }

pkg/analysis_server/test/integration/kythe/get_kythe_entries_test.dart

@@ -26,7 +26,7 @@ class Bar {
 }
 ''';
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
 
     await analysisFinished;
 

pkg/analysis_server/test/integration/search/find_element_references_test.dart

@@ -29,7 +29,7 @@ void f() {
 
     pathname = sourcePath('foo.dart');
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     await analysisFinished;
 
     var results = await _findElementReferences(text);
@@ -47,7 +47,7 @@ foo(String str) {}
 
     pathname = sourcePath('foo.dart');
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     await analysisFinished;
 
     var results = (await _findElementReferences(text))!;

pkg/analysis_server/test/integration/search/find_member_declarations_test.dart

@@ -28,7 +28,7 @@ class Foo {
 
     var pathname = sourcePath('foo.dart');
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     await analysisFinished;
 
     var declarationsResult = await sendSearchFindMemberDeclarations('bar');

pkg/analysis_server/test/integration/search/find_member_references_test.dart

@@ -28,7 +28,7 @@ class Foo {
 
     var pathname = sourcePath('foo.dart');
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     await analysisFinished;
 
     var referencesResult = await sendSearchFindMemberReferences('bar');

pkg/analysis_server/test/integration/search/find_top_level_declarations_test.dart

@@ -29,7 +29,7 @@ class Foo {
 
     var pathname = sourcePath('foo.dart');
     writeFile(pathname, text);
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
     await analysisFinished;
 
     var declarationsResult = await sendSearchFindTopLevelDeclarations(r'qu.*');

pkg/analysis_server/test/integration/search/get_type_hierarchy_test.dart

@@ -193,7 +193,7 @@ class Pivot /* target */ extends Base2 {}
     // Write a dummy file which will be overridden by tests using
     // [sendAnalysisUpdateContent].
     writeFile(pathname, '// dummy');
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
 
     // Run all the getTypeHierarchy tests at once so that the server can take
     // advantage of incremental analysis and the test doesn't time out.

pkg/analysis_server/test/integration/server/bazel_changes_test.dart

@@ -123,7 +123,7 @@ class BazelChangesTest extends AbstractAnalysisServerIntegrationTest {
 import 'generated.dart';
 void f() { my_fun(); }
 ''');
-    standardAnalysisSetup();
+    await standardAnalysisSetup();
 
     await processedNotification.future;
     expect(errors, isNotEmpty);

pkg/analysis_server/test/integration/server/command_line_options_test.dart

@@ -50,7 +50,7 @@ class OptionsPackagesIntegrationTest
     );
   }
 
-  Future<void> test_it() {
+  Future<void> test_it() async {
     var pathname = sourcePath('test.dart');
     writeFile(pathname, '''
 import 'package:foo/foo.dart';
@@ -58,10 +58,10 @@ void f() {
   my_foo;
 }
 ''');
-    standardAnalysisSetup();
-    return analysisFinished.then((_) {
-      var errors = existingErrorsForFile(pathname);
-      expect(errors, isEmpty);
-    });
+    await standardAnalysisSetup();
+    await analysisFinished;
+
+    var errors = existingErrorsForFile(pathname);
+    expect(errors, isEmpty);
   }
 }

pkg/analysis_server/test/integration/server/status_test.dart

@@ -40,7 +40,7 @@ class StatusTest extends AbstractAnalysisServerIntegrationTest {
 void f() {
   var x;
 }''');
-    standardAnalysisSetup();
+    unawaited(standardAnalysisSetup());
     expect(analysisBegun.isCompleted, isFalse);
     expect(analysisFinished.isCompleted, isFalse);
     await analysisBegun.future;