Fine. Rename @trackedXyz annotations.

trackedIncludedIntoId -> trackedIncludedInId
trackedDirectlyDisable -> trackedDirectlyOpaque

To better align names with requirement methods.

Change-Id: Id4ede2c54017610c0530109bc2fb5379b3e90823
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/444980
Reviewed-by: Paul Berry <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Johnni Winther <[email protected]>

Author: scheglov

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

@@ -132,7 +132,7 @@ class BindPatternVariableFragmentImpl extends PatternVariableFragmentImpl
 @elementClass
 class ClassElementImpl extends InterfaceElementImpl implements ClassElement {
   @override
-  @trackedIncludedIntoId
+  @trackedIncludedInId
   final Reference reference;
 
   final ClassFragmentImpl _firstFragment;
@@ -204,14 +204,14 @@ class ClassElementImpl extends InterfaceElementImpl implements ClassElement {
   }
 
   @override
-  @trackedDirectlyDisable
+  @trackedDirectlyOpaque
   ClassFragmentImpl get firstFragment {
     globalResultRequirements?.recordOpaqueApiUse(this, 'firstFragment');
     return _firstFragment;
   }
 
   @override
-  @trackedDirectlyDisable
+  @trackedDirectlyOpaque
   List<ClassFragmentImpl> get fragments {
     globalResultRequirements?.recordOpaqueApiUse(this, 'fragments');
     return [
@@ -266,7 +266,7 @@ class ClassElementImpl extends InterfaceElementImpl implements ClassElement {
   }
 
   @override
-  @trackedIncludedIntoId
+  @trackedIncludedInId
   bool get isAbstract {
     return hasModifier(Modifier.ABSTRACT);
   }
@@ -276,7 +276,7 @@ class ClassElementImpl extends InterfaceElementImpl implements ClassElement {
   }
 
   @override
-  @trackedIncludedIntoId
+  @trackedIncludedInId
   bool get isBase {
     return hasModifier(Modifier.BASE);
   }
@@ -286,11 +286,11 @@ class ClassElementImpl extends InterfaceElementImpl implements ClassElement {
   }
 
   @override
-  @trackedIncludedIntoId
+  @trackedIncludedInId
   bool get isConstructable => firstFragment.isConstructable;
 
   @override
-  @trackedIncludedIntoId
+  @trackedIncludedInId
   bool get isDartCoreEnum {
     return name == 'Enum' && library.isDartCore;
   }
@@ -302,12 +302,12 @@ class ClassElementImpl extends InterfaceElementImpl implements ClassElement {
   }
 
   @override
-  @trackedIncludedIntoId
+  @trackedIncludedInId
   bool get isDartCoreObject {
     return name == 'Object' && library.isDartCore;
   }
 
-  @trackedIncludedIntoId
+  @trackedIncludedInId
   bool get isDartCoreRecord {
     return name == 'Record' && library.isDartCore;
   }
@@ -350,14 +350,14 @@ class ClassElementImpl extends InterfaceElementImpl implements ClassElement {
   }
 
   @override
-  @trackedIncludedIntoId
+  @trackedIncludedInId
   bool get isExhaustive => firstFragment.isExhaustive;
 
   @override
   bool get isExtendableOutside => !isInterface && !isFinal && !isSealed;
 
   @override
-  @trackedIncludedIntoId
+  @trackedIncludedInId
   bool get isFinal {
     return hasModifier(Modifier.FINAL);
   }
@@ -370,7 +370,7 @@ class ClassElementImpl extends InterfaceElementImpl implements ClassElement {
   bool get isImplementableOutside => !isBase && !isFinal && !isSealed;
 
   @override
-  @trackedIncludedIntoId
+  @trackedIncludedInId
   bool get isInterface {
     return hasModifier(Modifier.INTERFACE);
   }
@@ -388,15 +388,15 @@ class ClassElementImpl extends InterfaceElementImpl implements ClassElement {
   }
 
   @override
-  @trackedIncludedIntoId
+  @trackedIncludedInId
   bool get isMixinApplication {
     return globalResultRequirements.includedInId(() {
       return firstFragment.isMixinApplication;
     });
   }
 
   @override
-  @trackedIncludedIntoId
+  @trackedIncludedInId
   bool get isMixinClass {
     return hasModifier(Modifier.MIXIN_CLASS);
   }
@@ -406,7 +406,7 @@ class ClassElementImpl extends InterfaceElementImpl implements ClassElement {
   }
 
   @override
-  @trackedIncludedIntoId
+  @trackedIncludedInId
   bool get isSealed {
     return hasModifier(Modifier.SEALED);
   }
@@ -416,22 +416,22 @@ class ClassElementImpl extends InterfaceElementImpl implements ClassElement {
   }
 
   @override
-  @trackedIncludedIntoId
+  @trackedIncludedInId
   bool get isValidMixin => firstFragment.isValidMixin;
 
   @override
   ElementKind get kind => ElementKind.CLASS;
 
   @override
-  @trackedDirectlyDisable
+  @trackedDirectlyOpaque
   T? accept<T>(ElementVisitor2<T> visitor) {
     globalResultRequirements?.recordOpaqueApiUse(this, 'accept2');
     return visitor.visitClassElement(this);
   }
 
   @Deprecated('Use accept instead')
   @override
-  @trackedDirectlyDisable
+  @trackedDirectlyOpaque
   T? accept2<T>(ElementVisitor2<T> visitor) {
     return accept(visitor);
   }
@@ -1790,7 +1790,7 @@ abstract class ElementImpl implements Element {
   bool get isPublic => !isPrivate;
 
   @override
-  @trackedIncludedIntoId
+  @trackedIncludedInId
   LibraryElementImpl? get library {
     return globalResultRequirements.includedInId(() {
       return firstFragment.libraryFragment?.element as LibraryElementImpl?;
@@ -4033,7 +4033,7 @@ abstract class InstanceElementImpl extends ElementImpl
   }
 
   @override
-  @trackedIncludedIntoId
+  @trackedIncludedInId
   String get displayName {
     return globalResultRequirements.includedInId(() {
       return firstFragment.displayName;
@@ -4090,15 +4090,15 @@ abstract class InstanceElementImpl extends ElementImpl
   bool get isPublic => firstFragment.isPublic;
 
   @override
-  @trackedIncludedIntoId
+  @trackedIncludedInId
   bool get isSimplyBounded {
     return globalResultRequirements.includedInId(() {
       return firstFragment.isSimplyBounded;
     });
   }
 
   @override
-  @trackedIncludedIntoId
+  @trackedIncludedInId
   bool get isSynthetic {
     return globalResultRequirements.includedInId(() {
       return firstFragment.isSynthetic;
@@ -4113,7 +4113,7 @@ abstract class InstanceElementImpl extends ElementImpl
   LibraryElementImpl get library2 => library;
 
   @override
-  @trackedIncludedIntoId
+  @trackedIncludedInId
   MetadataImpl get metadata {
     return globalResultRequirements.includedInId(() {
       return firstFragment.metadata;
@@ -4141,7 +4141,7 @@ abstract class InstanceElementImpl extends ElementImpl
   List<MethodElementImpl> get methods2 => methods;
 
   @override
-  @trackedIncludedIntoId
+  @trackedIncludedInId
   String? get name {
     return globalResultRequirements.includedInId(() {
       return firstFragment.name;
@@ -4174,7 +4174,7 @@ abstract class InstanceElementImpl extends ElementImpl
   List<SetterElementImpl> get setters2 => setters;
 
   @override
-  @trackedIncludedIntoId
+  @trackedIncludedInId
   List<TypeParameterElementImpl> get typeParameters {
     return globalResultRequirements.includedInId(() {
       return firstFragment.typeParameters
@@ -4723,7 +4723,7 @@ abstract class InterfaceElementImpl extends InstanceElementImpl
           .map;
 
   @override
-  @trackedIncludedIntoId
+  @trackedIncludedInId
   List<InterfaceTypeImpl> get interfaces {
     return globalResultRequirements.includedInId(() {
       return firstFragment.interfaces;
@@ -4743,15 +4743,15 @@ abstract class InterfaceElementImpl extends InstanceElementImpl
   }
 
   @override
-  @trackedIncludedIntoId
+  @trackedIncludedInId
   List<InterfaceTypeImpl> get mixins {
     return globalResultRequirements.includedInId(() {
       return firstFragment.mixins;
     });
   }
 
   @override
-  @trackedIncludedIntoId
+  @trackedIncludedInId
   InterfaceTypeImpl? get supertype {
     return globalResultRequirements.includedInId(() {
       return firstFragment.supertype;

pkg/analyzer/lib/src/fine/annotations.dart

@@ -8,7 +8,7 @@
 /// annotated, as follows:
 ///
 /// Public getters and fields must be annotated with one of:
-///   [trackedIncludedIntoId]
+///   [trackedIncludedInId]
 ///   [trackedDirectly]
 ///   [trackedIndirectly]
 ///
@@ -19,24 +19,13 @@ const elementClass = _ElementClass();
 
 /// Annotation for methods that must record the fact of the invocation.
 ///
-/// In contrast to [trackedIncludedIntoId], the result of the method is not
+/// In contrast to [trackedIncludedInId], the result of the method is not
 /// reflected in the ID of the target class, so we need to record this
 /// requirement separately.
 ///
 /// Examples: `getMethod(name)`, `getNamedConstructor(name)`.
 const trackedDirectly = _TrackedDirectly();
 
-/// Annotation for methods that are too invasive, and if invoked for anything
-/// other than the current library, disable fine-grained dependencies
-/// optimizations. So, the result will be re-computed if just anything in
-/// its transitive closure of imported libraries changed.
-///
-/// Examples: `fragments`, `visitChildren()`.
-///
-/// We must make sure that the analyzer itself does not use such APIs.
-/// We should try to fix any popular lint rules that use such APIs.
-const trackedDirectlyDisable = _TrackedDirectlyDisable();
-
 /// As [trackedDirectly], but for methods that are expensive.
 ///
 /// For example, `get methods` adds dependency on all declared methods, but
@@ -49,14 +38,25 @@ const trackedDirectlyDisable = _TrackedDirectlyDisable();
 /// We should try to fix any popular lint rules that use such APIs.
 const trackedDirectlyExpensive = _TrackedDirectlyExpensive();
 
+/// Annotation for methods that are too invasive, and if invoked for anything
+/// other than the current library, disable fine-grained dependencies
+/// optimizations. So, the result will be re-computed if just anything in
+/// its transitive closure of imported libraries changed.
+///
+/// Examples: `fragments`, `visitChildren()`.
+///
+/// We must make sure that the analyzer itself does not use such APIs.
+/// We should try to fix any popular lint rules that use such APIs.
+const trackedDirectlyOpaque = _TrackedDirectlyOpaque();
+
 /// Annotation for getters that don't require recording.
 ///
 /// The library manifest builder must compare the value of the getter with
 /// the previous value in the manifest, and give the element a new ID if the
 /// value is different.
 ///
 /// Examples: `isAbstract`, `interfaces`, `returnType`.
-const trackedIncludedIntoId = _TrackedIncludedIntoId();
+const trackedIncludedInId = _TrackedIncludedInId();
 
 /// Annotation for methods that don't require recording.
 ///
@@ -73,16 +73,16 @@ final class _TrackedDirectly extends _TrackedKind {
   const _TrackedDirectly();
 }
 
-final class _TrackedDirectlyDisable extends _TrackedDirectly {
-  const _TrackedDirectlyDisable();
-}
-
 final class _TrackedDirectlyExpensive extends _TrackedDirectly {
   const _TrackedDirectlyExpensive();
 }
 
-final class _TrackedIncludedIntoId extends _TrackedKind {
-  const _TrackedIncludedIntoId();
+final class _TrackedDirectlyOpaque extends _TrackedDirectly {
+  const _TrackedDirectlyOpaque();
+}
+
+final class _TrackedIncludedInId extends _TrackedKind {
+  const _TrackedIncludedInId();
 }
 
 final class _TrackedIndirectly extends _TrackedKind {