[ package:vm_service ] Enable more lints

Change-Id: I1a7548297fa8562ea81f3d4e32db2aba53661189
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/335960
Reviewed-by: Derek Xu <[email protected]>
Commit-Queue: Ben Konyi <[email protected]>

Author: bkonyi

pkg/vm_service/test/analysis_options.yaml

@@ -14,16 +14,16 @@ analyzer:
 
 linter:
   rules:
-    # always_declare_return_types: true
-    # avoid_escaping_inner_quotes: true
-    # avoid_void_async: true
-    # cancel_subscriptions: true
-    # close_sinks: true
+    always_declare_return_types: true
+    avoid_escaping_inner_quotes: true
+    avoid_void_async: true
+    cancel_subscriptions: true
+    close_sinks: true
     constant_identifier_names: false # Disabled for LINE_N style constants in tests
     directives_ordering: true
-    # no_adjacent_strings_in_list: true
-    # prefer_final_locals: true
-    # prefer_void_to_null: true
-    # require_trailing_commas: true
-    # unnecessary_parenthesis: true
-    # unnecessary_raw_strings: true
+    no_adjacent_strings_in_list: true
+    prefer_final_locals: true
+    prefer_void_to_null: true
+    require_trailing_commas: true
+    unnecessary_parenthesis: true
+    unnecessary_raw_strings: true

pkg/vm_service/test/async_generator_breakpoint_test.dart

@@ -89,7 +89,7 @@ Future testAsync(VmService service, IsolateRef isolateRef) async {
   unawaited(
     service.evaluate(isolateId, lib.id!, 'testerReady = true').then(
       (Response result) async {
-        Obj res =
+        final Obj res =
             await service.getObject(isolateId, (result as InstanceRef).id!);
         print(res);
         expect((res as Instance).valueAsString, equals('true'));
@@ -114,7 +114,7 @@ Future testAsync(VmService service, IsolateRef isolateRef) async {
 
 final tests = <IsolateTest>[testAsync];
 
-main([args = const <String>[]]) => runIsolateTests(
+void main([args = const <String>[]]) => runIsolateTests(
       args,
       tests,
       'async_generator_breakpoint_test.dart',

pkg/vm_service/test/async_next_regression_18877_test.dart

@@ -20,9 +20,9 @@ const LINE_B = 34;
 const LINE_C = 35;
 // AUTOGENERATED END
 
-foo() async {}
+Future<void> foo() async {}
 
-doAsync(stop) async {
+Future<void> doAsync(stop) async {
   // Flutter issue 18877:
   // If a closure is defined in the context of an async method, stepping over
   // an await causes the implicit breakpoint to be set for that closure instead
@@ -34,10 +34,9 @@ doAsync(stop) async {
   await foo(); // LINE_B
   await foo(); // LINE_C
   baz();
-  return null;
 }
 
-testMain() {
+void testMain() {
   // With two runs of doAsync floating around, async step should only cause
   // us to stop in the run we started in.
   doAsync(false);

pkg/vm_service/test/async_next_test.dart

@@ -7,29 +7,36 @@ import 'dart:developer';
 import 'common/service_test_common.dart';
 import 'common/test_helper.dart';
 
-const int LINE_D = 18;
-const int LINE_A = 19;
-const int LINE_B = 20;
-const int LINE_C = 21;
+// AUTOGENERATED START
+//
+// Update these constants by running:
+//
+// dart pkg/vm_service/test/update_line_numbers.dart <test.dart>
+//
+const LINE_D = 25;
+const LINE_A = 26;
+const LINE_B = 27;
+const LINE_C = 28;
+// AUTOGENERATED END
 
-foo() async {}
+Future<void> foo() async {}
 
-doAsync(stop) async {
-  if (stop) debugger();
-  await foo(); // Line A.
-  await foo(); // Line B.
-  await foo(); // Line C.
-  return null;
+Future<void> doAsync(bool stop) async {
+  if (stop) debugger(); // LINE_D
+  await foo(); // LINE_A
+  await foo(); // LINE_B
+  await foo(); // LINE_C
+  return;
 }
 
-testMain() {
+void testMain() {
   // With two runs of doAsync floating around, async step should only cause
   // us to stop in the run we started in.
   doAsync(false);
   doAsync(true);
 }
 
-var tests = <IsolateTest>[
+final tests = <IsolateTest>[
   hasStoppedAtBreakpoint,
   stoppedAtLine(LINE_D),
   stepOver, // foo()
@@ -45,7 +52,7 @@ var tests = <IsolateTest>[
   resumeIsolate,
 ];
 
-main([args = const <String>[]]) => runIsolateTests(
+void main([args = const <String>[]]) => runIsolateTests(
       args,
       tests,
       'async_next_test.dart',

pkg/vm_service/test/async_scope_test.dart

@@ -10,69 +10,81 @@ import 'package:vm_service/vm_service.dart';
 import 'common/service_test_common.dart';
 import 'common/test_helper.dart';
 
-const int LINE_A = 20;
-const int LINE_B = 26;
+// AUTOGENERATED START
+//
+// Update these constants by running:
+//
+// dart pkg/vm_service/test/update_line_numbers.dart <test.dart>
+//
+const LINE_A = 28;
+const LINE_B = 35;
+const LINE_C = 40;
+// AUTOGENERATED END
 
-foo() {}
+void foo() {}
 
-doAsync(param1) async {
-  var local1 = param1 + 1;
-  foo(); // Line A.
+Future<void> doAsync(int param1) async {
+  final local1 = param1 + 1;
+  foo(); // LINE_A
+  // ignore: await_only_futures
   await local1;
 }
 
-doAsyncStar(param2) async* {
-  var local2 = param2 + 1;
-  foo(); // Line B.
+Stream<int> doAsyncStar(int param2) async* {
+  final local2 = param2 + 1;
+  foo(); // LINE_B
   yield local2;
 }
 
-testeeDo() {
-  debugger();
+void testeeDo() {
+  debugger(); // LINE_C
 
   doAsync(1).then((_) {
     doAsyncStar(1).listen((_) {});
   });
 }
 
 Future<void> checkAsyncVarDescriptors(
-    VmService? service, IsolateRef? isolateRef) async {
-  final isolateId = isolateRef!.id!;
-  final stack = await service!.getStack(isolateId);
+  VmService service,
+  IsolateRef isolateRef,
+) async {
+  final isolateId = isolateRef.id!;
+  final stack = await service.getStack(isolateId);
   expect(stack.frames!.length, greaterThanOrEqualTo(1));
   final frame = stack.frames![0];
   final vars = frame.vars!.map((v) => v.name).join(' ');
   expect(vars, 'param1 local1'); // no :async_op et al
 }
 
 Future checkAsyncStarVarDescriptors(
-    VmService? service, IsolateRef? isolateRef) async {
-  final isolateId = isolateRef!.id!;
-  final stack = await service!.getStack(isolateId);
+  VmService service,
+  IsolateRef isolateRef,
+) async {
+  final isolateId = isolateRef.id!;
+  final stack = await service.getStack(isolateId);
   expect(stack.frames!.length, greaterThanOrEqualTo(1));
   final frame = stack.frames![0];
   final vars = frame.vars!.map((v) => v.name).join(' ');
   expect(vars, 'param2 local2'); // no :async_op et al
 }
 
-var tests = <IsolateTest>[
-  hasStoppedAtBreakpoint, // debugger()
+final tests = <IsolateTest>[
+  hasStoppedAtBreakpoint,
+  stoppedAtLine(LINE_C),
   setBreakpointAtLine(LINE_A),
   setBreakpointAtLine(LINE_B),
   resumeIsolate,
-
   hasStoppedAtBreakpoint,
   stoppedAtLine(LINE_A),
   checkAsyncVarDescriptors,
   resumeIsolate,
-
   hasStoppedAtBreakpoint,
   stoppedAtLine(LINE_B),
   checkAsyncStarVarDescriptors,
   resumeIsolate,
 ];
 
-main([args = const <String>[]]) => runIsolateTests(
+Future<void> main([args = const <String>[]]) => runIsolateTests(
       args,
       tests,
       'async_scope_test.dart',

pkg/vm_service/test/async_single_step_exception_test.dart

@@ -6,21 +6,28 @@ import 'dart:developer';
 import 'common/service_test_common.dart';
 import 'common/test_helper.dart';
 
-const LINE_A = 19;
-const LINE_B = 20;
-const LINE_0 = 24;
-const LINE_C = 25;
-const LINE_D = 27;
-const LINE_E = 30;
-const LINE_F = 33;
-const LINE_G = 35;
+// AUTOGENERATED START
+//
+// Update these constants by running:
+//
+// dart pkg/vm_service/test/update_line_numbers.dart <test.dart>
+//
+const LINE_A = 26;
+const LINE_B = 27;
+const LINE_0 = 31;
+const LINE_C = 32;
+const LINE_D = 34;
+const LINE_E = 37;
+const LINE_F = 40;
+const LINE_G = 42;
+// AUTOGENERATED END
 
-helper() async {
+Future<Never> helper() async {
   print('helper'); // LINE_A.
   throw 'a'; // LINE_B.
 }
 
-testMain() async {
+Future<void> testMain() async {
   debugger(); // LINE_0.
   print('mmmmm'); // LINE_C.
   try {
@@ -35,7 +42,7 @@ testMain() async {
   print('z'); // LINE_G.
 }
 
-var tests = <IsolateTest>[
+final tests = <IsolateTest>[
   hasStoppedAtBreakpoint,
   stoppedAtLine(LINE_0), // debugger
   stepOver,
@@ -73,10 +80,10 @@ var tests = <IsolateTest>[
 
   hasStoppedAtBreakpoint,
   stoppedAtLine(LINE_G), // print(z)
-  resumeIsolate
+  resumeIsolate,
 ];
 
-main([args = const <String>[]]) => runIsolateTests(
+void main([args = const <String>[]]) => runIsolateTests(
       args,
       tests,
       'async_single_step_exception_test.dart',

pkg/vm_service/test/async_single_step_into_test.dart

@@ -6,21 +6,28 @@ import 'dart:developer';
 import 'common/service_test_common.dart';
 import 'common/test_helper.dart';
 
-const LINE_A = 16;
-const LINE_B = 17;
-const LINE_0 = 21;
-const LINE_C = 22;
-const LINE_D = 23;
-
-helper() async {
+// AUTOGENERATED START
+//
+// Update these constants by running:
+//
+// dart pkg/vm_service/test/update_line_numbers.dart <test.dart>
+//
+const LINE_A = 23;
+const LINE_B = 24;
+const LINE_0 = 28;
+const LINE_C = 29;
+const LINE_D = 30;
+// AUTOGENERATED END
+
+Future<void> helper() async {
   print('helper'); // LINE_A.
   print('foobar'); // LINE_B.
 }
 
-testMain() {
+Future<void> testMain() async {
   debugger(); // LINE_0.
   print('mmmmm'); // LINE_C.
-  helper(); // LINE_D.
+  await helper(); // LINE_D.
   print('z');
 }
 
@@ -42,10 +49,10 @@ var tests = <IsolateTest>[
 
   hasStoppedAtBreakpoint,
   stoppedAtLine(LINE_B),
-  resumeIsolate
+  resumeIsolate,
 ];
 
-main([args = const <String>[]]) => runIsolateTestsSynchronous(
+void main([args = const <String>[]]) => runIsolateTests(
       args,
       tests,
       'async_single_step_into_test.dart',