test diagnostic cleanup and fastFail bit-flip (#3003)

pq · web-flow · commit 6247ab5bd2c8 · 2021-10-05T16:27:34.000-07:00
* test diagnostic cleanup and fastFail bit-flip

* API fixes
diff --git a/lib/src/rules/always_declare_return_types.dart b/lib/src/rules/always_declare_return_types.dart
@@ -67,13 +67,13 @@ class _Visitor extends SimpleAstVisitor<void> {
   static const LintCode functionCode = LintCode(
       "always_declare_return_types", // ignore: prefer_single_quotes
       "The function '{0}' should have a return type but doesn't.",
-      correction:
+      correctionMessage:
           "Try adding a return type to the function."); // ignore: prefer_single_quotes
 
   static const LintCode methodCode = LintCode(
       "always_declare_return_types", // ignore: prefer_single_quotes
       "The method '{0}' should have a return type but doesn't.",
-      correction:
+      correctionMessage:
           "Try adding a return type to the method."); // ignore: prefer_single_quotes
 
   final LintRule rule;
diff --git a/lib/src/rules/avoid_renaming_method_parameters.dart b/lib/src/rules/avoid_renaming_method_parameters.dart
@@ -68,7 +68,7 @@ class _Visitor extends SimpleAstVisitor<void> {
   static const LintCode parameterCode = LintCode(
       "avoid_renaming_method_parameters", // ignore: prefer_single_quotes
       "The parameter '{0}' should have the name '{1}' to match the name used in the overridden method.",
-      correction:
+      correctionMessage:
           "Try renaming the parameter."); // ignore: prefer_single_quotes
 
   final LintRule rule;
diff --git a/lib/src/rules/exhaustive_cases.dart b/lib/src/rules/exhaustive_cases.dart
@@ -94,7 +94,7 @@ class _Visitor extends SimpleAstVisitor {
   static const LintCode lintCode = LintCode(
     'exhaustive_cases',
     "Missing case clause for '{0}'.",
-    correction: 'Try adding a case clause for the missing constant.',
+    correctionMessage: 'Try adding a case clause for the missing constant.',
   );
 
   final LintRule rule;
diff --git a/lib/src/rules/hash_and_equals.dart b/lib/src/rules/hash_and_equals.dart
@@ -69,10 +69,10 @@ class HashAndEquals extends LintRule {
 class _Visitor extends SimpleAstVisitor<void> {
   static const LintCode hashMemberCode = LintCode(
       'hash_and_equals', 'Override `==` if overriding `hashCode`.',
-      correction: 'Implement `==`.');
+      correctionMessage: 'Implement `==`.');
   static const LintCode equalsMemberCode = LintCode(
       'hash_and_equals', 'Override `hashCode` if overriding `==`.',
-      correction: 'Implement `hashCode`.');
+      correctionMessage: 'Implement `hashCode`.');
 
   final LintRule rule;
 
diff --git a/lib/src/rules/use_named_constants.dart b/lib/src/rules/use_named_constants.dart
@@ -76,7 +76,8 @@ class _Visitor extends SimpleAstVisitor<void> {
                 arguments: ['${element.name}.${field.name}'],
                 errorCode: const LintCode(lintName,
                     "The constant '{0}' should be referenced instead of duplicating its value.",
-                    correction: "Try using the predefined constant '{0}'."));
+                    correctionMessage:
+                        "Try using the predefined constant '{0}'."));
             return;
           }
         }
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -12,7 +12,7 @@ environment:
   sdk: '>=2.12.0 <3.0.0'
 
 dependencies:
-  analyzer: '>=2.4.0 <3.0.0'
+  analyzer: '>=2.5.0 <3.0.0'
   args: ^2.0.0
   collection: ^1.15.0
   glob: ^2.0.0
diff --git a/test/mocks.dart b/test/mocks.dart
@@ -130,7 +130,7 @@ class TestErrorCode extends ErrorCode {
 
   TestErrorCode(String name, String message)
       : super(
-          message: message,
+          problemMessage: message,
           name: name,
           uniqueName: 'TestErrorCode.$name',
         );
diff --git a/test/rule_test.dart b/test/rule_test.dart
@@ -202,7 +202,7 @@ void defineSoloRuleTest(String ruleToTest) {
 }
 
 void testRule(String ruleName, File file,
-    {bool debug = true, bool failOnErrors = false, String? analysisOptions}) {
+    {bool debug = true, bool failOnErrors = true, String? analysisOptions}) {
   test(ruleName, () async {
     if (!file.existsSync()) {
       throw Exception('No rule found defined at: ${file.path}');
diff --git a/test/rules/null_closures.dart b/test/rules/null_closures.dart
@@ -8,10 +8,59 @@ import '../rule_test_support.dart';
 
 main() {
   defineReflectiveSuite(() {
+    defineReflectiveTests(NullClosuresPreNNBDTest);
     defineReflectiveTests(NullClosuresTest);
   });
 }
 
+@reflectiveTest
+class NullClosuresPreNNBDTest extends LintRuleTest {
+  @override
+  String get lintRule => 'null_closures';
+
+  test_list_firstWhere() async {
+    await assertNoDiagnostics(r'''
+// @dart=2.9
+
+f() => <int>[2, 4, 6].firstWhere((e) => e.isEven, orElse: () => null);
+''');
+  }
+
+  test_list_generate() async {
+    await assertDiagnostics(r'''
+// @dart=2.9
+
+f() => List.generate(3, null);
+''', [
+      lint('null_closures', 38, 4),
+    ]);
+  }
+
+  test_list_where() async {
+    await assertDiagnostics(r'''
+// @dart=2.9
+
+f() => <int>[2, 4, 6].where(null);
+''', [
+      lint('null_closures', 42, 4),
+    ]);
+  }
+
+  test_map_putIfAbsent() async {
+    await assertDiagnostics(r'''
+// @dart=2.9
+
+f() {
+  var map = <int, int>{};
+  map.putIfAbsent(7, null);
+  return map;
+}
+''', [
+      lint('null_closures', 67, 4),
+    ]);
+  }
+}
+
 @reflectiveTest
 class NullClosuresTest extends LintRuleTest {
   @override
diff --git a/test_data/rules/avoid_void_async.dart b/test_data/rules/avoid_void_async.dart
@@ -19,8 +19,6 @@ void d() async => null; // LINT
 void e() => null; // OK
 Future<void> f() async => null; // OK
 
-void g() async* {} // LINT
-void h() sync* {} // LINT
 Stream<void> i() async* {} // OK
 Iterable<void> j() sync* {} // OK
 
@@ -46,8 +44,6 @@ class Foo {
   void e() => null; // OK
   Future<void> f() async => null; // OK
 
-  void g() async* {} // LINT
-  void h() sync* {} // LINT
   Stream<void> i() async* {} // OK
   Iterable<void> j() sync* {} // OK
 
diff --git a/test_data/rules/experiments/nnbd/rules/null_closures.dart b/test_data/rules/experiments/nnbd/rules/null_closures.dart
diff --git a/test_data/rules/null_closures.dart b/test_data/rules/null_closures.dart
@@ -10,8 +10,6 @@ import 'dart:core';
 void list_firstWhere() {
   // firstWhere has a _named_ closure argument.
   <int>[2, 4, 6].firstWhere((e) => e.isEven, orElse: null); // LINT
-  <int>[2, 4, 6].firstWhere((e) => e.isEven, orElse: () => null); // OK
-  <int>[2, 4, 6].where(null); // LINT
   <int>[2, 4, 6].where((e) => e.isEven); // OK
 }
 
@@ -24,7 +22,6 @@ void iterable_singleWhere() {
 void map_putIfAbsent() {
   // putIfAbsent has a _required_ closure argument.
   var map = <int, int?>{};
-  map.putIfAbsent(7, null); // LINT
   map.putIfAbsent(7, () => null); // OK
 }
 
@@ -36,7 +33,6 @@ void future_wait() {
 
 void list_generate() {
   // List.generate is a _constructor_ with a _positional_ argument.
-  new List.generate(3, null); // LINT
   new List.generate(3, (_) => null); // OK
 }
 
diff --git a/test_data/rules/prefer_bool_in_asserts.dart b/test_data/rules/prefer_bool_in_asserts.dart
@@ -6,15 +6,12 @@
 
 // test w/ `dart test -N prefer_bool_in_asserts`
 
+// todo(pq): remove w/ lint-- https://github.com/dart-lang/linter/issues/3002
 main() {
   assert(true); // OK
   assert(true, 'message'); // OK
-  assert(() => true); // LINT
-  assert(() => true, 'message'); // LINT
   assert((() => true)()); // OK
   assert((() => true)(), 'message'); // OK
-  assert(() { return true; }); // LINT
-  assert(() { return true; }, 'message'); // LINT
   assert(() { return true; }()); // OK
   assert(() { return true; }(), 'message'); // OK
   assert(() { throw ""; }()); // OK
@@ -25,15 +22,3 @@ m1(p) {
 m2(Object p) {
   assert(() { return p; }()); // OK
 }
-m3<T>(T p) {
-  assert(() { return p; }()); // OK
-}
-m4<T extends List>(T p) {
-  assert(() { return p; }()); // LINT
-}
-m5<S, T extends S>(T p) {
-  assert(() { return p; }()); // OK
-}
-m6<S extends List, T extends S>(T p) {
-  assert(() { return p; }()); // LINT
-}
diff --git a/test_data/rules/unnecessary_parenthesis.dart b/test_data/rules/unnecessary_parenthesis.dart
@@ -93,7 +93,7 @@ main() async {
   // would attempt to call a _static_ method on the target.
   (String).hashCode;
   (int).runtimeType;
-  (bool).noSuchMethod();
+  (bool).noSuchMethod(invocation()!);
   (double).toString();
 
   ({false: 'false', true: 'true'}).forEach((k, v) => print('$k: $v'));
@@ -103,6 +103,8 @@ main() async {
   ([false, true]).forEach(print); // LINT
 }
 
+Invocation? invocation() => null;
+
 m({p}) => null;
 
 bool Function(dynamic) get fn => (x) => x is bool ? x : false;
@@ -129,5 +131,5 @@ class UnnecessaryParenthesis {
 
   UnnecessaryParenthesis()
       : c = (ClassWithClassWithFunction()
-          ..c = ClassWithFunction().f = () => 42); // OK
+          ..c = (ClassWithFunction()..f = () => 42)); // OK
 }
diff --git a/test_data/rules/use_build_context_synchronously.dart b/test_data/rules/use_build_context_synchronously.dart
@@ -7,6 +7,10 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
+extension on BuildContext {
+  bool get mounted => false;
+}
+
 void mountedBinOpAnd(BuildContext context, bool condition) async {
   await Future<void>.delayed(Duration());
   if (condition && context.mounted) {
@@ -303,7 +307,7 @@ class _MyState extends State<MyWidget> {
   }
 
   @override
-  Widget build(BuildContext context) => const Placeholder();
+  Widget build(BuildContext context) => Placeholder();
 }
 
 void topLevel(BuildContext context) async {

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,8 @@ class _Visitor extends SimpleAstVisitor<void> {`
`76`	`76`	`arguments: ['${element.name}.${field.name}'],`
`77`	`77`	`errorCode: const LintCode(lintName,`
`78`	`78`	`"The constant '{0}' should be referenced instead of duplicating its value.",`
`79`		`- correction: "Try using the predefined constant '{0}'."));`
	`79`	`+ correctionMessage:`
	`80`	`+ "Try using the predefined constant '{0}'."));`
`80`	`81`	`return;`
`81`	`82`	`}`
`82`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ void defineSoloRuleTest(String ruleToTest) {`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`void testRule(String ruleName, File file,`
`205`		`- {bool debug = true, bool failOnErrors = false, String? analysisOptions}) {`
	`205`	`+ {bool debug = true, bool failOnErrors = true, String? analysisOptions}) {`
`206`	`206`	`test(ruleName, () async {`
`207`	`207`	`if (!file.existsSync()) {`
`208`	`208`	`throw Exception('No rule found defined at: ${file.path}');`