Elements. Rename / deprecate ClassElement.isXyzIn

Change-Id: I5ebc171cd8de04526cdde35f4140635f6bea7edd
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/428845
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>

Author: scheglov

pkg/analysis_server/lib/src/cider/local_library_contributor.dart

@@ -62,12 +62,12 @@ class LibraryElementSuggestionBuilder
   void visitClassElement(ClassElement element) {
     AstNode node = request.target.containingNode;
     var libraryElement = request.libraryElement;
-    if (node is ExtendsClause && !element.isExtendableIn2(libraryElement)) {
+    if (node is ExtendsClause && !element.isExtendableIn(libraryElement)) {
       return;
     } else if (node is ImplementsClause &&
-        !element.isImplementableIn2(libraryElement)) {
+        !element.isImplementableIn(libraryElement)) {
       return;
-    } else if (node is WithClause && !element.isMixableIn2(libraryElement)) {
+    } else if (node is WithClause && !element.isMixableIn(libraryElement)) {
       return;
     }
     _visitInterfaceElement(element);

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

@@ -1672,10 +1672,10 @@ class DeclarationHelper {
   void _suggestClass(ClassElement element, ImportData? importData) {
     if (visibilityTracker.isVisible(element: element, importData: importData)) {
       if ((mustBeExtendable &&
-              !element.isExtendableIn2(request.libraryElement)) ||
+              !element.isExtendableIn(request.libraryElement)) ||
           (mustBeImplementable &&
-              !element.isImplementableIn2(request.libraryElement)) ||
-          (mustBeMixable && !element.isMixableIn2(request.libraryElement))) {
+              !element.isImplementableIn(request.libraryElement)) ||
+          (mustBeMixable && !element.isMixableIn(request.libraryElement))) {
         return;
       }
       if (!(mustBeConstant && !objectPatternAllowed) && !excludeTypeNames) {

pkg/analyzer/CHANGELOG.md

@@ -17,6 +17,7 @@
   This allows the analyzer to have an internal implementation
   class corresponding to `ElementDirective`.
 * Deprecate `NamedType.name2`, use `name` instead.
+* Deprecate `ClassElement.isXyzIn2`, use `isXyzIn` instead.
 
 ## 7.4.1
 * Restore `InstanceElement.augmented` getter.

pkg/analyzer/api.txt

@@ -2999,9 +2999,12 @@ package:analyzer/dart/element/element.dart:
     isMixinClass (getter: bool)
     isSealed (getter: bool)
     isValidMixin (getter: bool)
-    isExtendableIn2 (method: bool Function(LibraryElement))
-    isImplementableIn2 (method: bool Function(LibraryElement))
-    isMixableIn2 (method: bool Function(LibraryElement))
+    isExtendableIn (method: bool Function(LibraryElement))
+    isExtendableIn2 (method: bool Function(LibraryElement), deprecated)
+    isImplementableIn (method: bool Function(LibraryElement))
+    isImplementableIn2 (method: bool Function(LibraryElement), deprecated)
+    isMixableIn (method: bool Function(LibraryElement))
+    isMixableIn2 (method: bool Function(LibraryElement), deprecated)
   ClassFragment (class extends Object implements InterfaceFragment):
     new (constructor: ClassFragment Function())
     element (getter: ClassElement)

pkg/analyzer/lib/dart/element/element.dart

@@ -309,14 +309,29 @@ abstract class ClassElement implements InterfaceElement {
 
   /// Whether the class, assuming that it is within scope, can be extended by
   /// classes in the given [library].
+  bool isExtendableIn(LibraryElement library);
+
+  /// Whether the class, assuming that it is within scope, can be extended by
+  /// classes in the given [library].
+  @Deprecated('Use isExtendableIn instead')
   bool isExtendableIn2(LibraryElement library);
 
   /// Whether the class, assuming that it is within scope, can be implemented by
   /// classes, mixins, and enums in the given [library].
+  bool isImplementableIn(LibraryElement library);
+
+  /// Whether the class, assuming that it is within scope, can be implemented by
+  /// classes, mixins, and enums in the given [library].
+  @Deprecated('Use isImplementableIn instead')
   bool isImplementableIn2(LibraryElement library);
 
   /// Whether the class, assuming that it is within scope, can be mixed-in by
   /// classes and enums in the given [library].
+  bool isMixableIn(LibraryElement library);
+
+  /// Whether the class, assuming that it is within scope, can be mixed-in by
+  /// classes and enums in the given [library].
+  @Deprecated('Use isMixableIn instead')
   bool isMixableIn2(LibraryElement library);
 }
 

pkg/analyzer/lib/src/dart/element/element.dart

@@ -360,32 +360,50 @@ class ClassElementImpl2 extends InterfaceElementImpl2 implements ClassElement {
 
   @override
   @trackedIndirectly
-  bool isExtendableIn2(LibraryElement library) {
+  bool isExtendableIn(LibraryElement library) {
     if (library == library2) {
       return true;
     }
     return !isInterface && !isFinal && !isSealed;
   }
 
+  @Deprecated('Use isExtendableIn instead')
+  @override
+  bool isExtendableIn2(LibraryElement library) {
+    return isExtendableIn(library);
+  }
+
   @override
   @trackedIndirectly
-  bool isImplementableIn2(LibraryElement library) {
+  bool isImplementableIn(LibraryElement library) {
     if (library == library2) {
       return true;
     }
     return !isBase && !isFinal && !isSealed;
   }
 
+  @Deprecated('Use isImplementableIn instead')
+  @override
+  bool isImplementableIn2(LibraryElement library) {
+    return isImplementableIn(library);
+  }
+
   @override
   @trackedIndirectly
-  bool isMixableIn2(LibraryElement library) {
+  bool isMixableIn(LibraryElement library) {
     if (library == library2) {
       return true;
     } else if (library2.featureSet.isEnabled(Feature.class_modifiers)) {
       return isMixinClass && !isInterface && !isFinal && !isSealed;
     }
     return true;
   }
+
+  @Deprecated('Use isMixableIn instead')
+  @override
+  bool isMixableIn2(LibraryElement library) {
+    return isMixableIn(library);
+  }
 }
 
 /// An [InterfaceFragmentImpl] which is a class.