Fixed cast exception (issue 27405)

R=pquitslund@google.com, scheglov@google.com Review URL: https://codereview.chromium.org//2355343002 .
dart-lang · Sep 21, 2016 · 6968141 · 6968141
1 parent 407d736
commit 6968141
Showing 1 changed file with 49 additions and 42 deletions.
diff --git a/lib/src/util/dart_type_utilities.dart b/lib/src/util/dart_type_utilities.dart
@@ -5,65 +5,49 @@
 library linter.src.util.dart_type_utilities;
 
 import 'dart:collection';
+
+import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
-import 'package:analyzer/dart/ast/ast.dart';
 
 typedef bool AstNodePredicate(AstNode node);
 
 class DartTypeUtilities {
-  static bool unrelatedTypes(DartType leftType, DartType rightType) {
-    if (leftType == null ||
-        leftType.isBottom ||
-        leftType.isDynamic ||
-        rightType == null ||
-        rightType.isBottom ||
-        rightType.isDynamic) {
-      return false;
-    }
-    if (leftType == rightType ||
-        leftType.isMoreSpecificThan(rightType) ||
-        rightType.isMoreSpecificThan(leftType)) {
+  static bool extendsClass(DartType type, String className, String library) =>
+      type != null &&
+          type.name == className &&
+          type.element.library.name == library ||
+      (type is InterfaceType &&
+          extendsClass(type.superclass, className, library));
+
+  static bool implementsAnyInterface(
+      DartType type, Iterable<InterfaceTypeDefinition> definitions) {
+    if (type is! InterfaceType) {
       return false;
     }
-    Element leftElement = leftType.element;
-    Element rightElement = rightType.element;
-    if (leftElement is ClassElement && rightElement is ClassElement) {
-      return leftElement.supertype.isObject ||
-          leftElement.supertype != rightElement.supertype;
-    }
-    return false;
-  }
-
-  static bool implementsInterface(
-      DartType type, String interface, String library) {
-    bool predicate(InterfaceType i) =>
-        i.name == interface && i.element.library.name == library;
+    bool predicate(InterfaceType i) => definitions
+        .any((d) => i.name == d.name && i.element.library.name == d.library);
     ClassElement element = type.element;
     return predicate(type) ||
         !element.isSynthetic &&
             type is InterfaceType &&
             element.allSupertypes.any(predicate);
   }
 
-  static bool implementsAnyInterface(
-      DartType type, Iterable<InterfaceTypeDefinition> definitions) {
-    bool predicate(InterfaceType i) => definitions
-        .any((d) => i.name == d.name && i.element.library.name == d.library);
+  static bool implementsInterface(
+      DartType type, String interface, String library) {
+    if (type is! InterfaceType) {
+      return false;
+    }
+    bool predicate(InterfaceType i) =>
+        i.name == interface && i.element.library.name == library;
     ClassElement element = type.element;
     return predicate(type) ||
         !element.isSynthetic &&
             type is InterfaceType &&
             element.allSupertypes.any(predicate);
   }
 
-  static bool extendsClass(DartType type, String className, String library) =>
-      type != null &&
-          type.name == className &&
-          type.element.library.name == library ||
-      (type is InterfaceType &&
-          extendsClass(type.superclass, className, library));
-
   /// Builds the list resulting from traversing the node in DFS and does not
   /// include the node itself.
   static Iterable<AstNode> traverseNodesInDFS(AstNode node) {
@@ -74,6 +58,29 @@ class DartTypeUtilities {
     });
     return nodes;
   }
+
+  static bool unrelatedTypes(DartType leftType, DartType rightType) {
+    if (leftType == null ||
+        leftType.isBottom ||
+        leftType.isDynamic ||
+        rightType == null ||
+        rightType.isBottom ||
+        rightType.isDynamic) {
+      return false;
+    }
+    if (leftType == rightType ||
+        leftType.isMoreSpecificThan(rightType) ||
+        rightType.isMoreSpecificThan(leftType)) {
+      return false;
+    }
+    Element leftElement = leftType.element;
+    Element rightElement = rightType.element;
+    if (leftElement is ClassElement && rightElement is ClassElement) {
+      return leftElement.supertype.isObject ||
+          leftElement.supertype != rightElement.supertype;
+    }
+    return false;
+  }
 }
 
 class InterfaceTypeDefinition {
@@ -82,6 +89,11 @@ class InterfaceTypeDefinition {
 
   InterfaceTypeDefinition(this.name, this.library);
 
+  @override
+  int get hashCode {
+    return name.hashCode ^ library.hashCode;
+  }
+
   @override
   bool operator ==(Object other) {
     if (identical(this, other)) {
@@ -91,9 +103,4 @@ class InterfaceTypeDefinition {
         this.name == other.name &&
         this.library == other.library;
   }
-
-  @override
-  int get hashCode {
-    return name.hashCode ^ library.hashCode;
-  }
 }