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

pkg/analyzer/test/generated/hint_code_test.dart

 // Copyright (c) 2016, 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.test.generated.hint_code_test;
 
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/error.dart';
 import 'package:analyzer/src/generated/source_io.dart';
 import 'package:unittest/unittest.dart';
 
 import '../reflective_tests.dart';
 import '../utils.dart';
 import 'analysis_context_factory.dart';
 import 'resolver_test_case.dart';
 
 main() {
   initializeTestEnvironment();
   runReflectiveTests(HintCodeTest);
 }
 
 @reflectiveTest
 class HintCodeTest extends ResolverTestCase {
-  void test_deadCode_statementAfterRethrow() {
-    Source source = addSource(r'''
-f() {
-  try {
-    var one = 1;
-  } catch (e) {
-    rethrow;
-    var two = 2;
-  }
-}''');
-    computeLibrarySourceErrors(source);
-    assertErrors(source, [HintCode.DEAD_CODE]);
-    verify([source]);
-  }
-
-  void test_deadCode_statementAfterThrow() {
-    Source source = addSource(r'''
-f() {
-  var one = 1;
-  throw 'Stop here';
-  var two = 2;
-}''');
-    computeLibrarySourceErrors(source);
-    assertErrors(source, [HintCode.DEAD_CODE]);
-    verify([source]);
-  }
-
   void fail_isInt() {
     Source source = addSource("var v = 1 is int;");
     computeLibrarySourceErrors(source);
     assertErrors(source, [HintCode.IS_INT]);
     verify([source]);
   }
 
   void fail_isNotInt() {
     Source source = addSource("var v = 1 is! int;");
     computeLibrarySourceErrors(source);
@@ skipping 485 matching lines @@
   while(v) {
     continue;
     var a;
   }
 }''');
     computeLibrarySourceErrors(source);
     assertErrors(source, [HintCode.DEAD_CODE]);
     verify([source]);
   }
 
+  void test_deadCode_statementAfterExitingIf_returns() {
+    Source source = addSource(r'''
+f() {
+  if (1 > 2) {
+    return;
+  } else {
+    return;
+  }
+  var one = 1;
+}''');
+    computeLibrarySourceErrors(source);
+    assertErrors(source, [HintCode.DEAD_CODE]);
+    verify([source]);
+  }
+
+  void test_deadCode_statementAfterRethrow() {
+    Source source = addSource(r'''
+f() {
+  try {
+    var one = 1;
+  } catch (e) {
+    rethrow;
+    var two = 2;
+  }
+}''');
+    computeLibrarySourceErrors(source);
+    assertErrors(source, [HintCode.DEAD_CODE]);
+    verify([source]);
+  }
+
   void test_deadCode_statementAfterReturn_function() {
     Source source = addSource(r'''
 f() {
   var one = 1;
   return;
   var two = 2;
 }''');
     computeLibrarySourceErrors(source);
     assertErrors(source, [HintCode.DEAD_CODE]);
     verify([source]);
@@ skipping 46 matching lines @@
   return;
   var two = 2;
   return;
   var three = 3;
 }''');
     computeLibrarySourceErrors(source);
     assertErrors(source, [HintCode.DEAD_CODE]);
     verify([source]);
   }
 
-  void test_deadCode_statementAfterExitingIf_returns() {
+  void test_deadCode_statementAfterThrow() {
     Source source = addSource(r'''
 f() {
-  if (1 > 2) {
-    return;
-  } else {
-    return;
-  }
   var one = 1;
+  throw 'Stop here';
+  var two = 2;
 }''');
     computeLibrarySourceErrors(source);
     assertErrors(source, [HintCode.DEAD_CODE]);
     verify([source]);
   }
 
   void test_deprecatedAnnotationUse_assignment() {
     Source source = addSource(r'''
 class A {
   @deprecated
@@ skipping 396 matching lines @@
 main() {
   var p1 = new Point(0, 0);
   var p2 = new Point(10, 10);
   int n = p1 + p2;
 }''');
     computeLibrarySourceErrors(source);
     assertErrors(source, [HintCode.INVALID_ASSIGNMENT]);
     verify([source]);
   }
 
+  void test_invalidUseOfProtectedMember_closure() {
+    Source source = addSource(r'''
+import 'package:meta/meta.dart';
+
+class A {
+  @protected
+  int a() => 42;
+}
+void main() {
+  var leak = new A().a;
+  print(leak);
+}''');
+    computeLibrarySourceErrors(source);
+    assertErrors(source, [HintCode.INVALID_USE_OF_PROTECTED_MEMBER]);
+    verify([source]);
+  }
+
   void test_invalidUseOfProtectedMember_field() {
     Source source = addSource(r'''
 import 'package:meta/meta.dart';
 class A {
   @protected
   int a;
 }
 abstract class B {
   int b() => new A().a;
 }''');
@@ skipping 41 matching lines @@
 }
 
 abstract class B implements A {
   int b() => a();
 }''');
     computeLibrarySourceErrors(source);
     assertNoErrors(source);
     verify([source]);
   }
 
-  void test_invalidUseOfProtectedMember_closure() {
-    Source source = addSource(r'''
-import 'package:meta/meta.dart';
-
-class A {
-  @protected
-  int a() => 42;
-}
-void main() {
-  var leak = new A().a;
-  print(leak);
-}''');
-    computeLibrarySourceErrors(source);
-    assertErrors(source, [HintCode.INVALID_USE_OF_PROTECTED_MEMBER]);
-    verify([source]);
-  }
-
   void test_invalidUseOfProtectedMember_getter() {
     Source source = addSource(r'''
 import 'package:meta/meta.dart';
 class A {
   @protected
   int get a => 42;
 }
 class B {
   A a;
   int b() => a.a;
@@ skipping 42 matching lines @@
   void a(){ }
 }
 class B {
   void b() => new A().a();
 }''');
     computeLibrarySourceErrors(source);
     assertErrors(source, [HintCode.INVALID_USE_OF_PROTECTED_MEMBER]);
     verify([source]);
   }
 
+  void test_invalidUseOfProtectedMember_method_OK() {
+    // https://github.com/dart-lang/linter/issues/257
+    Source source = addSource(r'''
+import 'package:meta/meta.dart';
+
+typedef void VoidCallback();
+
+class State<E> {
+  @protected
+  void setState(VoidCallback fn) {}
+}
+
+class Button extends State<Object> {
+  void handleSomething() {
+    setState(() {});
+  }
+}
+''');
+    computeLibrarySourceErrors(source);
+    assertNoErrors(source);
+    verify([source]);
+  }
+
   void test_invalidUseOfProtectedMember_OK_1() {
     Source source = addSource(r'''
 import 'package:meta/meta.dart';
 class A {
   @protected
   void a(){ }
 }
 class B extends A {
   void b() => a();
 }''');
@@ skipping 2281 matching lines @@
   n() {
     var a = m(), b = m();
   }
 }''');
     computeLibrarySourceErrors(source);
     assertErrors(
         source, [HintCode.USE_OF_VOID_RESULT, HintCode.USE_OF_VOID_RESULT]);
     verify([source]);
   }
 }