Rename meta annotation sets

Author: dwijnand

compiler/src/dotty/tools/dotc/core/Definitions.scala

@@ -1039,10 +1039,10 @@ class Definitions {
   @tu lazy val JavaRepeatableAnnot: ClassSymbol = requiredClass("java.lang.annotation.Repeatable")
 
   // A list of meta-annotations that are relevant for fields and accessors
-  @tu lazy val FieldAccessorMetaAnnots: Set[Symbol] =
+  @tu lazy val NonBeanMetaAnnots: Set[Symbol] =
     Set(FieldMetaAnnot, GetterMetaAnnot, ParamMetaAnnot, SetterMetaAnnot)
-  @tu lazy val ExtFieldAccessorMetaAnnots: Set[Symbol] =
-    FieldAccessorMetaAnnots + BeanGetterMetaAnnot + BeanSetterMetaAnnot
+  @tu lazy val MetaAnnots: Set[Symbol] =
+    NonBeanMetaAnnots + BeanGetterMetaAnnot + BeanSetterMetaAnnot
 
   // A list of annotations that are commonly used to indicate that a field/method argument or return
   // type is not null. These annotations are used by the nullification logic in JavaNullInterop to

compiler/src/dotty/tools/dotc/transform/Memoize.scala

@@ -117,7 +117,7 @@ class Memoize extends MiniPhase with IdentityDenotTransformer { thisPhase =>
       )
       fieldSym.annotations = sym.annotations.filterConserve { annot =>
         annot.hasOneOfMetaAnnotation(defn.FieldMetaAnnot)
-        || !annot.hasOneOfMetaAnnotation(defn.ExtFieldAccessorMetaAnnots.toList*)
+        || !annot.hasOneOfMetaAnnotation(defn.MetaAnnots.toList*)
       }
       fieldSym.enteredAfter(thisPhase)
     }

compiler/src/dotty/tools/dotc/transform/PostTyper.scala

@@ -188,7 +188,7 @@ class PostTyper extends MacroTransform with IdentityDenotTransformer { thisPhase
         metaAnnotSymBackup: Symbol, keepIfNoRelevantAnnot: Boolean)(using Context): Unit =
       def shouldKeep(annot: Annotation): Boolean =
         annot.hasOneOfMetaAnnotation(metaAnnotSym, metaAnnotSymBackup)
-        || keepIfNoRelevantAnnot && !annot.hasOneOfMetaAnnotation(defn.FieldAccessorMetaAnnots.toList*)
+        || keepIfNoRelevantAnnot && !annot.hasOneOfMetaAnnotation(defn.NonBeanMetaAnnots.toList*)
       if sym.annotations.nonEmpty then
         sym.filterAnnotations(shouldKeep(_))