Move applying LEGACY_ERASURE to isCorrectOverrideOf().

scheglov · commit-bot@chromium.org · commit 0fa3d79a3fdb · 2020-02-12T20:01:27.000Z
Change-Id: Ic9ebd89be8dbbb560b47ae9f96988b552b75ddaa Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/135482 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analyzer/lib/src/dart/element/inheritance_manager3.dart b/pkg/analyzer/lib/src/dart/element/inheritance_manager3.dart
@@ -7,7 +7,6 @@ import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/dart/element/type_system.dart';
 import 'package:analyzer/src/dart/element/member.dart';
 import 'package:analyzer/src/error/correct_override.dart';
-import 'package:analyzer/src/generated/type_system.dart' show TypeSystemImpl;
 import 'package:analyzer/src/generated/utilities_general.dart';
 import 'package:meta/meta.dart';
 
@@ -71,7 +70,7 @@ class InheritanceManager3 {
     if (interface._inheritedMap == null) {
       interface._inheritedMap = {};
       _findMostSpecificFromNamedCandidates(
-        type.element.library.typeSystem,
+        type.element.library,
         interface._inheritedMap,
         interface._overridden,
       );
@@ -99,7 +98,6 @@ class InheritanceManager3 {
 
     var classLibrary = classElement.library;
     var isNonNullableByDefault = classLibrary.isNonNullableByDefault;
-    var typeSystem = classLibrary.typeSystem;
 
     Map<Name, List<ExecutableElement>> namedCandidates = {};
     List<Map<Name, ExecutableElement>> superImplemented = [];
@@ -143,7 +141,7 @@ class InheritanceManager3 {
         // from its superclass constraints, whether it is abstract or concrete.
         var superClass = <Name, ExecutableElement>{};
         _findMostSpecificFromNamedCandidates(
-          typeSystem,
+          classLibrary,
           superClass,
           superClassCandidates,
         );
@@ -203,7 +201,7 @@ class InheritanceManager3 {
     // signature becomes the signature of the class's interface.
     Map<Name, ExecutableElement> map = Map.of(declared);
     List<Conflict> conflicts = _findMostSpecificFromNamedCandidates(
-      typeSystem,
+      classLibrary,
       map,
       namedCandidates,
     );
@@ -384,7 +382,7 @@ class InheritanceManager3 {
   /// such single most specific signature (i.e. no valid override), then add a
   /// new conflict description.
   List<Conflict> _findMostSpecificFromNamedCandidates(
-      TypeSystemImpl typeSystem,
+      LibraryElement library,
       Map<Name, ExecutableElement> map,
       Map<Name, List<ExecutableElement>> namedCandidates) {
     List<Conflict> conflicts;
@@ -418,7 +416,7 @@ class InheritanceManager3 {
       for (var i = candidates.length - 1; i >= 0; i--) {
         validOverride = candidates[i];
         var overrideHelper = CorrectOverrideHelper(
-          typeSystem: typeSystem,
+          library: library,
           thisMember: validOverride,
         );
         for (var j = 0; j < candidates.length; j++) {
diff --git a/pkg/analyzer/lib/src/error/correct_override.dart b/pkg/analyzer/lib/src/error/correct_override.dart
@@ -16,6 +16,7 @@ import 'package:analyzer/src/generated/type_system.dart';
 import 'package:meta/meta.dart';
 
 class CorrectOverrideHelper {
+  final LibraryElement _library;
   final TypeSystemImpl _typeSystem;
 
   final ExecutableElement _thisMember;
@@ -26,9 +27,10 @@ class CorrectOverrideHelper {
   Substitution _superSubstitution;
 
   CorrectOverrideHelper({
-    @required TypeSystemImpl typeSystem,
+    @required LibraryElement library,
     @required ExecutableElement thisMember,
-  })  : _typeSystem = typeSystem,
+  })  : _library = library,
+        _typeSystem = library.typeSystem,
         _thisMember = thisMember {
     _computeThisTypeForSubtype();
   }
@@ -37,6 +39,8 @@ class CorrectOverrideHelper {
   bool isCorrectOverrideOf({
     @required ExecutableElement superMember,
   }) {
+    superMember = _library.toLegacyElementIfOptOut(superMember);
+
     var superType = superMember.type;
     if (!_typeSystem.isSubtypeOf2(_thisTypeForSubtype, superType)) {
       return false;
diff --git a/pkg/analyzer/lib/src/error/inheritance_override.dart b/pkg/analyzer/lib/src/error/inheritance_override.dart
@@ -233,7 +233,7 @@ class _ClassVerifier {
         //  overriding method. The classNameNode is always wrong.
         concreteElement = library.toLegacyElementIfOptOut(concreteElement);
         CorrectOverrideHelper(
-          typeSystem: typeSystem,
+          library: library,
           thisMember: concreteElement,
         ).verify(
           superMember: interfaceElement,
@@ -272,7 +272,7 @@ class _ClassVerifier {
 
     var name = Name(libraryUri, member.name);
     var correctOverrideHelper = CorrectOverrideHelper(
-      typeSystem: typeSystem,
+      library: library,
       thisMember: member,
     );
 
diff --git a/pkg/analyzer/lib/src/generated/error_verifier.dart b/pkg/analyzer/lib/src/generated/error_verifier.dart
@@ -3581,7 +3581,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void> {
 
       if (mixinMember != null) {
         var isCorrect = CorrectOverrideHelper(
-          typeSystem: _typeSystem,
+          library: _currentLibrary,
           thisMember: superMember,
         ).isCorrectOverrideOf(
           superMember: mixinMember,
diff --git a/pkg/analyzer/test/src/diagnostics/invalid_override_test.dart b/pkg/analyzer/test/src/diagnostics/invalid_override_test.dart
@@ -505,6 +505,23 @@ class InvalidOverrideWithNnbdTest extends DriverResolutionTest {
   @override
   bool get typeToStringWithNullability => true;
 
+  test_method_parameter_functionTyped_optOut_extends_optIn() async {
+    newFile('/test/lib/a.dart', content: r'''
+abstract class A {
+  A catchError(void Function(Object) a);
+}
+''');
+
+    await assertNoErrorsInCode('''
+// @dart=2.6
+import 'a.dart';
+
+class B implements A {
+  A catchError(void Function(dynamic) a) => this;
+}
+''');
+  }
+
   test_method_parameter_interfaceOptOut_concreteOptIn() async {
     newFile('/test/lib/a.dart', content: r'''
 class A {
