Fix @protected checks to play nice with generic supers (linter#257).

pkg/analyzer/lib/src/generated/resolver.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library analyzer.src.generated.resolver;
 
 import 'dart:collection';
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
@@ skipping 964 matching lines @@
 //        _errorReporter.reportErrorForNode(
 //            HintCode.OVERRIDE_EQUALS_BUT_NOT_HASH_CODE,
 //            node.name,
 //            [classElement.displayName]);
 //        return true;
 //      }
 //    }
 //    return false;
 //  }
 
-  bool _hasTypeOrSuperType(ClassElement element, InterfaceType type) =>
-      element != null &&
-      (element.type == type || element.allSupertypes.contains(type));
+  bool _hasTypeOrSuperType(ClassElement element, InterfaceType type) {
+    if (element == null) {
+      return false;
+    }
+    if (element.type == type) {

[Brian Wilkerson, 2016/06/06 20:23:00]

I don't understand why this wouldn't be "element == typeElement". I don't know
that it's possible for the 'type' to be something different from 'element.type',
but I think the result would be wrong if it happened.

+      return true;
+    }
+    ClassElement typeElement = type.element;
+    return element.allSupertypes
+        .any((InterfaceType t) => t.element == typeElement);
+  }
 
   /**
    * Given a parenthesized expression, this returns the parent (or recursively grand-parent) of the
    * expression that is a parenthesized expression, but whose parent is not a parenthesized
    * expression.
    *
    * For example given the code `(((e)))`: `(e) -> (((e)))`.
    *
    * @param parenthesizedExpression some expression whose parent is a parenthesized expression
    * @return the first parent or grand-parent that is a parenthesized expression, that does not have
@@ skipping 9926 matching lines @@
       return null;
     }
     if (identical(node.staticElement, variable)) {
       if (node.inSetterContext()) {
         result = true;
       }
     }
     return null;
   }
 }