[CQ] [server] anticipate strict_top_level_inference

Related to https://dart-review.googlesource.com/c/sdk/+/412383

(Note: presubmit required some re-formatting 🤷)


Change-Id: Ib18c7c1c1fceaa0007d804fbcb6397055242fa42
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/412362
Reviewed-by: Brian Wilkerson <[email protected]>
Reviewed-by: Konstantin Shcheglov <[email protected]>
Commit-Queue: Phil Quitslund <[email protected]>
Auto-Submit: Phil Quitslund <[email protected]>

Author: pq

pkg/analysis_server/benchmark/integration/operation.dart

@@ -82,7 +82,7 @@ class ResponseOperation extends Operation {
     return converter.processExpectedResponse(id, completer);
   }
 
-  bool _equal(expectedResult, actualResult) {
+  bool _equal(Object? expectedResult, Object? actualResult) {
     if (expectedResult is Map && actualResult is Map) {
       if (expectedResult.length == actualResult.length) {
         return expectedResult.keys.every((key) {
@@ -105,7 +105,7 @@ class ResponseOperation extends Operation {
   }
 
   /// Compare the expected and actual server response result.
-  void _processResult(actualResult) {
+  void _processResult(Object? actualResult) {
     var expectedResult = responseJson['result'];
     if (!_equal(expectedResult, actualResult)) {
       var expectedError = responseJson['error'];

pkg/analysis_server/test/client/impl/expect_mixin.dart

@@ -8,7 +8,7 @@ typedef _Predicate<T> = bool Function(T value);
 
 /// Lightweight expect that can be run outside of a test context.
 mixin ExpectMixin {
-  void expect(actual, matcher, {String? reason}) {
+  void expect(Object? actual, Object? matcher, {String? reason}) {
     matcher = _wrapMatcher(matcher);
     var matchState = {};
     try {
@@ -21,7 +21,7 @@ mixin ExpectMixin {
     throw Exception(reason);
   }
 
-  static Matcher _wrapMatcher(x) {
+  static Matcher _wrapMatcher(Object? x) {
     if (x is Matcher) {
       return x;
     } else if (x is _Predicate<Object>) {

pkg/analysis_server/test/integration/support/integration_tests.dart

@@ -70,7 +70,7 @@ void outOfTestExpect(
 }
 
 String _defaultFailFormatter(
-  actual,
+  dynamic actual,
   Matcher matcher,
   String? reason,
   Map<Object?, Object?> matchState,
@@ -952,7 +952,7 @@ abstract class _RecursiveMatcher extends Matcher {
   /// the mismatch.  [describeSubstructure] is used to describe which
   /// substructure did not match.
   void checkSubstructure(
-    item,
+    Object? item,
     Matcher matcher,
     List<MismatchDescriber> mismatches,
     Description Function(Description) describeSubstructure,
@@ -981,7 +981,7 @@ abstract class _RecursiveMatcher extends Matcher {
 
   @override
   Description describeMismatch(
-    item,
+    Object? item,
     Description mismatchDescription,
     Map<Object?, Object?> matchState,
     bool verbose,
@@ -1026,7 +1026,7 @@ abstract class _RecursiveMatcher extends Matcher {
 
   /// Populate [mismatches] with descriptions of all the ways in which [item]
   /// does not match.
-  void populateMismatches(item, List<MismatchDescriber> mismatches);
+  void populateMismatches(Object? item, List<MismatchDescriber> mismatches);
 
   /// Create a [MismatchDescriber] describing a mismatch with a simple string.
   MismatchDescriber simpleDescription(String description) => (

pkg/analysis_server/test/lsp/code_lens/augmentations_test.dart

@@ -20,6 +20,7 @@ void main() {
   });
 }
 
+@reflectiveTest
 abstract class AbstractAugmentationCodeLensTest
     extends AbstractLspAnalysisServerTest {
   late TestCode libraryCode;

pkg/analysis_server/test/shared/shared_dtd_tests.dart

@@ -139,7 +139,7 @@ mixin SharedDtdTests on LspRequestHelpersMixin {
     await dtdProcess.dispose();
   }
 
-  test_connectToDtd_failure_alreadyRegistered() async {
+  Future<void> test_connectToDtd_failure_alreadyRegistered() async {
     await initializeServer();
     await sendConnectToDtdRequest();
     await expectLater(
@@ -153,7 +153,7 @@ mixin SharedDtdTests on LspRequestHelpersMixin {
     );
   }
 
-  test_connectToDtd_failure_invalidUri() async {
+  Future<void> test_connectToDtd_failure_invalidUri() async {
     await initializeServer();
     await expectLater(
       sendConnectToDtdRequest(uri: invalidUri),
@@ -168,7 +168,7 @@ mixin SharedDtdTests on LspRequestHelpersMixin {
     );
   }
 
-  test_connectToDtd_success_afterFailureToConnect() async {
+  Future<void> test_connectToDtd_success_afterFailureToConnect() async {
     await initializeServer();
 
     // Perform a failed connection.
@@ -188,7 +188,7 @@ mixin SharedDtdTests on LspRequestHelpersMixin {
     await sendConnectToDtdRequest();
   }
 
-  test_connectToDtd_success_afterPreviousDtdShutdown() async {
+  Future<void> test_connectToDtd_success_afterPreviousDtdShutdown() async {
     await initializeServer();
 
     // Connect to the initial DTD.
@@ -205,20 +205,23 @@ mixin SharedDtdTests on LspRequestHelpersMixin {
     await sendConnectToDtdRequest();
   }
 
+  Future<void>
   test_connectToDtd_success_doesNotRegister_connectToDtdMethod() async {
     await initializeServer();
     await sendConnectToDtdRequest();
 
     expectMethod(CustomMethods.connectToDtd, available: false);
   }
 
+  Future<void>
   test_connectToDtd_success_doesNotRegister_experimentalMethods() async {
     await initializeServer();
     await sendConnectToDtdRequest();
 
     expectMethod(CustomMethods.experimentalEcho, available: false);
   }
 
+  Future<void>
   test_connectToDtd_success_doesNotRegister_fileStateMethods() async {
     await initializeServer();
     await sendConnectToDtdRequest();
@@ -230,6 +233,7 @@ mixin SharedDtdTests on LspRequestHelpersMixin {
     expectMethod(Method.textDocument_didChange, available: false);
   }
 
+  Future<void>
   test_connectToDtd_success_doesNotRegister_initializationMethods() async {
     await initializeServer();
     await sendConnectToDtdRequest();
@@ -239,15 +243,15 @@ mixin SharedDtdTests on LspRequestHelpersMixin {
     expectMethod(Method.initialized, available: false);
   }
 
-  test_connectToDtd_success_registers_experimentalMethods() async {
+  Future<void> test_connectToDtd_success_registers_experimentalMethods() async {
     await initializeServer();
     await sendConnectToDtdRequest(registerExperimentalHandlers: true);
 
     expectMethod(CustomMethods.experimentalEcho);
   }
 
   @SkippedTest(reason: 'Shared LSP methods are currently disabled')
-  test_connectToDtd_success_registers_standardLspMethods() async {
+  Future<void> test_connectToDtd_success_registers_standardLspMethods() async {
     await initializeServer();
     await sendConnectToDtdRequest();
 
@@ -260,7 +264,7 @@ mixin SharedDtdTests on LspRequestHelpersMixin {
   }
 
   @SkippedTest(reason: 'Shared LSP methods are currently disabled')
-  test_service_failure_hover() async {
+  Future<void> test_service_failure_hover() async {
     await initializeServer();
     await sendConnectToDtdRequest();
 
@@ -291,7 +295,7 @@ mixin SharedDtdTests on LspRequestHelpersMixin {
     await expectLater(call, throwsA(expectedException));
   }
 
-  test_service_success_echo() async {
+  Future<void> test_service_success_echo() async {
     await initializeServer();
     await sendConnectToDtdRequest(registerExperimentalHandlers: true);
 
@@ -306,7 +310,7 @@ mixin SharedDtdTests on LspRequestHelpersMixin {
     expect(result, equals({'a': 'b'}));
   }
 
-  test_service_success_echo_nullResponse() async {
+  Future<void> test_service_success_echo_nullResponse() async {
     await initializeServer();
     await sendConnectToDtdRequest(registerExperimentalHandlers: true);
 
@@ -322,7 +326,7 @@ mixin SharedDtdTests on LspRequestHelpersMixin {
   }
 
   @SkippedTest(reason: 'Shared LSP methods are currently disabled')
-  test_service_success_hover() async {
+  Future<void> test_service_success_hover() async {
     var code = TestCode.parse('''
 /// A function.
 void [!myFun^ction!]() {}
@@ -361,7 +365,7 @@ void [!myFun^ction!]() {}
   }
 
   @SkippedTest(reason: 'Shared LSP methods are currently disabled')
-  test_service_unregisteredOnShutdown() async {
+  Future<void> test_service_unregisteredOnShutdown() async {
     await initializeServer();
     await sendConnectToDtdRequest();