extract StaticMemberContributor from PrefixedElementContributor

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

Index: pkg/analysis_server/test/services/completion/prefixed_element_contributor_test.dart
diff --git a/pkg/analysis_server/test/services/completion/prefixed_element_contributor_test.dart b/pkg/analysis_server/test/services/completion/prefixed_element_contributor_test.dart
index 6e15a0c7b5f14470fc1f5738cef51a20d0fda2f9..f8f064c23cd993c536c5b9814f4905522aa01665 100644
--- a/pkg/analysis_server/test/services/completion/prefixed_element_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/prefixed_element_contributor_test.dart
@@ -61,19 +61,6 @@ void f(Derived d) {
     });
   }
 
-  fail_enumConst_deprecated() {
-    addTestSource('@deprecated enum E { one, two } main() {E.^}');
-    return computeFull((bool result) {
-      assertNotSuggested('E');
-      // TODO(danrubel) Investigate why enum suggestion is not marked
-      // as deprecated if enum ast element is deprecated
-      assertSuggestEnumConst('one', isDeprecated: true);
-      assertSuggestEnumConst('two', isDeprecated: true);
-      assertNotSuggested('index');
-      assertSuggestField('values', 'List<E>', isDeprecated: true);
-    });
-  }
-
   fail_test_PrefixedIdentifier_trailingStmt_const_untyped() {
     // SimpleIdentifier  PrefixedIdentifier  ExpressionStatement
     addTestSource('const g = "hello"; f() {g.^ int y = 0;}');
@@ -92,10 +79,11 @@ void f(Derived d) {
     addTestSource('enum E { one, two } main() {E.^}');
     return computeFull((bool result) {
       assertNotSuggested('E');
-      assertSuggestEnumConst('one');
-      assertSuggestEnumConst('two');
+      // Suggested by StaticMemberContributor
+      assertNotSuggested('one');
+      assertNotSuggested('two');
       assertNotSuggested('index');
-      assertSuggestField('values', 'List<E>');
+      assertNotSuggested('values');
     });
   }
 
@@ -103,10 +91,11 @@ void f(Derived d) {
     addTestSource('enum E { one, two } main() {E.o^}');
     return computeFull((bool result) {
       assertNotSuggested('E');
-      assertSuggestEnumConst('one');
-      assertSuggestEnumConst('two');
+      // Suggested by StaticMemberContributor
+      assertNotSuggested('one');
+      assertNotSuggested('two');
       assertNotSuggested('index');
-      assertSuggestField('values', 'List<E>');
+      assertNotSuggested('values');
     });
   }
 
@@ -114,10 +103,11 @@ void f(Derived d) {
     addTestSource('enum E { one, two } main() {E.^ int g;}');
     return computeFull((bool result) {
       assertNotSuggested('E');
-      assertSuggestEnumConst('one');
-      assertSuggestEnumConst('two');
+      // Suggested by StaticMemberContributor
+      assertNotSuggested('one');
+      assertNotSuggested('two');
       assertNotSuggested('index');
-      assertSuggestField('values', 'List<E>');
+      assertNotSuggested('values');
     });
   }
 
@@ -220,7 +210,8 @@ void f(C<int> c) {
   test_keyword() {
     addTestSource('class C { static C get instance => null; } main() {C.in^}');
     return computeFull((bool result) {
-      assertSuggestGetter('instance', 'C');
+      // Suggested by StaticMemberContributor
+      assertNotSuggested('instance');
     });
   }
 
@@ -481,9 +472,10 @@ class C {
 void main() {C.^}''');
     return computeFull((bool result) {
       assertNotSuggested('f1');
-      assertSuggestInvocationField('f2', 'int');
+      // Suggested by StaticMemberContributor
+      assertNotSuggested('f2');
       assertNotSuggested('m1');
-      assertSuggestMethod('m2', 'C', null);
+      assertNotSuggested('m2');
     });
   }
 
@@ -499,9 +491,10 @@ class C {
 void main() {C.^ print("something");}''');
     return computeFull((bool result) {
       assertNotSuggested('f1');
-      assertSuggestInvocationField('f2', 'int');
+      // Suggested by StaticMemberContributor
+      assertNotSuggested('f2');
       assertNotSuggested('m1');
-      assertSuggestMethod('m2', 'C', null);
+      assertNotSuggested('m2');
     });
   }