Issue 25538. Fix for overriding invisible private members.

[email protected]

Bug: dart-lang#25538
Change-Id: I61904881c602f373df839bc546b1e65665997bb9
Reviewed-on: https://dart-review.googlesource.com/c/86480
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

pkg/analysis_server/lib/src/services/completion/dart/override_contributor.dart

@@ -206,12 +206,15 @@ class OverrideContributor implements DartCompletionContributor {
    */
   List<Name> _namesToOverride(
       ClassElement classElement, Iterable<Name> interfaceNames) {
-    var notDefinedNames = <Name>[];
+    var libraryUri = classElement.library.source.uri;
+    var namesToOverride = <Name>[];
     for (var name in interfaceNames) {
-      if (!_hasMember(classElement, name.name)) {
-        notDefinedNames.add(name);
+      if (name.isAccessibleFor(libraryUri)) {
+        if (!_hasMember(classElement, name.name)) {
+          namesToOverride.add(name);
+        }
       }
     }
-    return notDefinedNames;
+    return namesToOverride;
   }
 }

pkg/analysis_server/test/services/completion/dart/override_contributor_test.dart

@@ -175,6 +175,62 @@ method() {
         selectionLength: 22);
   }
 
+  test_private_otherLibrary() async {
+    addSource('/lib.dart', '''
+class A {
+  void foo() {}
+  void _bar() {}
+}
+''');
+    addTestSource(r'''
+import 'lib.dart';
+
+class B extends A {
+  f^
+}
+''');
+    await computeSuggestions();
+
+    _assertOverride('''
+@override
+  void foo() {
+    // TODO: implement foo
+    super.foo();
+  }''', displayText: 'foo() { … }', selectionOffset: 56, selectionLength: 12);
+
+    expect(suggestions, _notSuggestedPredicate((suggestion) {
+      return suggestion.completion.contains('void _bar()');
+    }));
+  }
+
+  test_private_thisLibrary() async {
+    addTestSource(r'''
+class A {
+  void foo() {}
+  void _bar() {}
+}
+
+class B extends A {
+  f^
+}
+''');
+    await computeSuggestions();
+
+    _assertOverride('''
+@override
+  void foo() {
+    // TODO: implement foo
+    super.foo();
+  }''', displayText: 'foo() { … }', selectionOffset: 56, selectionLength: 12);
+
+    _assertOverride('''
+@override
+  void _bar() {
+    // TODO: implement _bar
+    super._bar();
+  }''', displayText: '_bar() { … }', selectionOffset: 58, selectionLength: 13);
+  }
+
   test_withExistingOverride() async {
     addTestSource('''
 class A {
@@ -244,4 +300,8 @@ method() {
     expect(cs.displayText, displayText);
     return cs;
   }
+
+  static Matcher _notSuggestedPredicate(bool Function(CompletionSuggestion) f) {
+    return isNot(contains(predicate(f)));
+  }
 }