de-linting (keeping ahead of the Joneses) (dart-lang#1823)

* linting * linting
5lineofcode · Nov 6, 2019 · 0b18afa · 0b18afa
1 parent 6b264ac
commit 0b18afa
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 12 deletions.
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -89,9 +89,10 @@ linter:
 #    - prefer_generic_function_type_aliases # under review (see #1068)
     - prefer_initializing_formals
     - prefer_inlined_adds
-#    - prefer_interpolation_to_compose_strings
+    - prefer_interpolation_to_compose_strings
 #    - prefer_iterable_whereType (included in pedantic)
 #    - prefer_mixin
+    - prefer_null_aware_operators
     - prefer_relative_imports
     - prefer_single_quotes
     - prefer_spread_collections
@@ -114,7 +115,8 @@ linter:
     - unnecessary_parenthesis
     - unnecessary_statements
     - unnecessary_this
+    - use_function_type_syntax_for_parameters
     - use_setters_to_change_properties
     - use_string_buffers
     - use_to_and_as_if_applicable
-#    - void_checks # under review (see #1068)
+    - void_checks # under review (see #1068)
diff --git a/lib/src/rules/control_flow_in_finally.dart b/lib/src/rules/control_flow_in_finally.dart
@@ -128,7 +128,7 @@ abstract class ControlFlowInFinallyBlockReporterMixin {
 
   AstNode _findEnablerNode(
       AstNode ancestor,
-      bool finallyBlockAncestorPredicate(AstNode n),
+      bool Function(AstNode n) finallyBlockAncestorPredicate,
       AstNode node,
       TryStatement tryStatement) {
     AstNode enablerNode;

diff --git a/lib/src/rules/invariant_booleans.dart b/lib/src/rules/invariant_booleans.dart
@@ -128,7 +128,7 @@ class _ContradictionReportRule extends LintRule {
   _ContradictionReportRule(ContradictoryComparisons comparisons)
       : super(
             name: 'invariant_booleans',
-            description: _desc + ' verify: ${comparisons.first}.',
+            description: '$_desc verify: ${comparisons.first}.',
             details: _details,
             group: Group.errors);
 }

diff --git a/lib/src/rules/overridden_fields.dart b/lib/src/rules/overridden_fields.dart
@@ -163,8 +163,6 @@ class _Visitor extends SimpleAstVisitor<void> {
     }
     InterfaceType interface =
         interfaces.firstWhere(containsOverriddenMember, orElse: () => null);
-    return interface == null
-        ? null
-        : interface.accessors.firstWhere(isOverriddenMember);
+    return interface?.accessors?.firstWhere(isOverriddenMember);
   }
 }
diff --git a/test/engine_test.dart b/test/engine_test.dart
@@ -28,7 +28,8 @@ main() {
 void defineLinterEngineTests() {
   group('engine', () {
     group('reporter', () {
-      _test(String label, String expected, report(PrintingReporter r)) {
+      _test(
+          String label, String expected, Function(PrintingReporter r) report) {
         test(label, () {
           String msg;
           PrintingReporter reporter = PrintingReporter((m) => msg = m);

diff --git a/test/integration_test.dart b/test/integration_test.dart
@@ -854,7 +854,7 @@ defineTests() {
 
         Map<String, YamlNode> options = _getOptionsFromString(src);
         var configuredLints =
-            ((options['linter'] as YamlMap)['rules'] as YamlList);
+            (options['linter'] as YamlMap)['rules'] as YamlList;
 
         // rules are sorted
         expect(

diff --git a/test/util/test_utils.dart b/test/util/test_utils.dart
@@ -5,6 +5,6 @@
 import 'package:matcher/matcher.dart';
 import 'package:test/test.dart';
 
-void testEach<T>(Iterable<T> values, bool f(T s), Matcher m) {
+void testEach<T>(Iterable<T> values, bool Function(T s) f, Matcher m) {
   values.forEach((s) => test('"$s"', () => expect(f(s), m)));
 }
diff --git a/tool/scorecard.dart b/tool/scorecard.dart
@@ -174,7 +174,7 @@ class ScoreCard {
     scores.add(score);
   }
 
-  void forEach(void f(LintScore element)) {
+  void forEach(void Function(LintScore element) f) {
     scores.forEach(f);
   }
 
@@ -273,7 +273,7 @@ class ScoreCard {
     return scorecard;
   }
 
-  void removeWhere(bool test(LintScore element)) {
+  void removeWhere(bool Function(LintScore element) test) {
     scores.removeWhere(test);
   }
 }