Merge branch 'master' into rule_renames2

dart-lang · Mar 14, 2017 · 8074da2 · 8074da2
2 parents 1321c2c + 429b1f8
commit 8074da2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/src/rules/invariant_booleans.dart b/lib/src/rules/invariant_booleans.dart
@@ -313,7 +313,8 @@ class _Visitor extends SimpleAstVisitor {
 
   _reportExpressionIfConstantValue(Expression node) {
     // Right part discards reporting a subexpression already reported.
-    if (resolutionMap.bestTypeForExpression(node).name != 'bool' ||
+    if (node == null ||
+        resolutionMap.bestTypeForExpression(node).name != 'bool' ||
         !_isAnalyzedNode(node.parent)) {
       return;
     }

diff --git a/lib/src/rules/prefer_initializing_formals.dart b/lib/src/rules/prefer_initializing_formals.dart
@@ -109,7 +109,8 @@ class _Visitor extends SimpleAstVisitor {
     bool isConstructorFieldInitializerToLint(
         ConstructorFieldInitializer constructorFieldInitializer) {
       final expression = constructorFieldInitializer.expression;
-      return !constructorFieldInitializer.fieldName.bestElement.isPrivate &&
+      return !(constructorFieldInitializer.fieldName.bestElement?.isPrivate ??
+              true) &&
           expression is SimpleIdentifier &&
           parameters.contains(expression.bestElement);
     }