Standardize naming and definition order of annotation classes

1 files changed, 23 insertions, 23 deletions

diff --git a/src/dotty/tools/dotc/core/Definitions.scala b/src/dotty/tools/dotc/core/Definitions.scala
index 384ae47a8..c419806de 100644
--- a/src/dotty/tools/dotc/core/Definitions.scala
+++ b/src/dotty/tools/dotc/core/Definitions.scala
@@ -398,54 +398,54 @@ class Definitions {
   lazy val NonLocalReturnControlTypeRef   = ctx.requiredClassRef("scala.runtime.NonLocalReturnControl")
 
   // Annotation base classes
-  lazy val AnnotationTypeRef              = ctx.requiredClassRef("scala.annotation.Annotation") // ### AnnotationTypeRef --> AnnotRef?
+  lazy val AnnotationTypeRef              = ctx.requiredClassRef("scala.annotation.Annotation")
   def AnnotationClass = AnnotationTypeRef.symbol.asClass
   lazy val ClassfileAnnotationTypeRef     = ctx.requiredClassRef("scala.annotation.ClassfileAnnotation")
   def ClassfileAnnotationClass = ClassfileAnnotationTypeRef.symbol.asClass
   lazy val StaticAnnotationTypeRef        = ctx.requiredClassRef("scala.annotation.StaticAnnotation")
   def StaticAnnotationClass = StaticAnnotationTypeRef.symbol.asClass
-  lazy val TailrecAnnotationTypeRef       = ctx.requiredClassRef("scala.annotation.tailrec")
-  def TailrecAnnotationClass = TailrecAnnotationTypeRef.symbol.asClass
-  lazy val RemoteAnnotRef                   = ctx.requiredClassRef("scala.remote")
-  def RemoteAnnot = RemoteAnnotRef.symbol.asClass
-  lazy val SerialVersionUIDAnnotRef         = ctx.requiredClassRef("scala.SerialVersionUID")
-  def SerialVersionUIDAnnot = SerialVersionUIDAnnotRef.symbol.asClass
-  lazy val TransientAnnotRef                = ctx.requiredClassRef("scala.transient")
-  def TransientAnnot = TransientAnnotRef.symbol.asClass
-  lazy val NativeAnnotRef                   = ctx.requiredClassRef("scala.native")
-  def NativeAnnot = NativeAnnotRef.symbol.asClass
-  lazy val ScalaStrictFPAnnotRef            = ctx.requiredClassRef("scala.annotation.strictfp")
-  def ScalaStrictFPAnnot = ScalaStrictFPAnnotRef.symbol.asClass
 
   // Annotation classes
   lazy val AliasAnnotRef = ctx.requiredClassRef("dotty.annotation.internal.Alias")
   def AliasAnnot = AliasAnnotRef.symbol.asClass
+  lazy val AnnotationDefaultAnnotRef = ctx.requiredClassRef("dotty.annotation.internal.AnnotationDefault")
+  def AnnotationDefaultAnnot = AnnotationDefaultAnnotRef.symbol.asClass
   lazy val ChildAnnotRef = ctx.requiredClassRef("dotty.annotation.internal.Child")
   def ChildAnnot = ChildAnnotRef.symbol.asClass
-  lazy val RepeatedAnnotRef = ctx.requiredClassRef("dotty.annotation.internal.Repeated")
-  def RepeatedAnnot = RepeatedAnnotRef.symbol.asClass
-  lazy val InvariantBetweenAnnotRef = ctx.requiredClassRef("dotty.annotation.internal.InvariantBetween")
-  def InvariantBetweenAnnot = InvariantBetweenAnnotRef.symbol.asClass
   lazy val CovariantBetweenAnnotRef = ctx.requiredClassRef("dotty.annotation.internal.CovariantBetween")
   def CovariantBetweenAnnot = CovariantBetweenAnnotRef.symbol.asClass
   lazy val ContravariantBetweenAnnotRef = ctx.requiredClassRef("dotty.annotation.internal.ContravariantBetween")
   def ContravariantBetweenAnnot = ContravariantBetweenAnnotRef.symbol.asClass
+  lazy val DeprecatedAnnotRef = ctx.requiredClassRef("scala.deprecated")
+  def DeprecatedAnnot = DeprecatedAnnotRef.symbol.asClass
+  lazy val InvariantBetweenAnnotRef = ctx.requiredClassRef("dotty.annotation.internal.InvariantBetween")
+  def InvariantBetweenAnnot = InvariantBetweenAnnotRef.symbol.asClass
+  lazy val MigrationAnnotRef = ctx.requiredClassRef("scala.annotation.migration")
+  def MigrationAnnot = MigrationAnnotRef.symbol.asClass
+  lazy val NativeAnnotRef                   = ctx.requiredClassRef("scala.native")
+  def NativeAnnot = NativeAnnotRef.symbol.asClass
+  lazy val RemoteAnnotRef                   = ctx.requiredClassRef("scala.remote")
+  def RemoteAnnot = RemoteAnnotRef.symbol.asClass
+  lazy val RepeatedAnnotRef = ctx.requiredClassRef("dotty.annotation.internal.Repeated")
+  def RepeatedAnnot = RepeatedAnnotRef.symbol.asClass
   lazy val ScalaSignatureAnnotRef = ctx.requiredClassRef("scala.reflect.ScalaSignature")
   def ScalaSignatureAnnot = ScalaSignatureAnnotRef.symbol.asClass
   lazy val ScalaLongSignatureAnnotRef = ctx.requiredClassRef("scala.reflect.ScalaLongSignature")
   def ScalaLongSignatureAnnot = ScalaLongSignatureAnnotRef.symbol.asClass
+  lazy val ScalaStrictFPAnnotRef            = ctx.requiredClassRef("scala.annotation.strictfp")
+  def ScalaStrictFPAnnot = ScalaStrictFPAnnotRef.symbol.asClass
+  lazy val SerialVersionUIDAnnotRef         = ctx.requiredClassRef("scala.SerialVersionUID")
+  def SerialVersionUIDAnnot = SerialVersionUIDAnnotRef.symbol.asClass
   lazy val TASTYSignatureAnnotRef = ctx.requiredClassRef("scala.annotation.internal.TASTYSignature")
   def TASTYSignatureAnnot = TASTYSignatureAnnotRef.symbol.asClass
   lazy val TASTYLongSignatureAnnotRef = ctx.requiredClassRef("scala.annotation.internal.TASTYLongSignature")
   def TASTYLongSignatureAnnot = TASTYLongSignatureAnnotRef.symbol.asClass
-  lazy val DeprecatedAnnotRef = ctx.requiredClassRef("scala.deprecated")
-  def DeprecatedAnnot = DeprecatedAnnotRef.symbol.asClass
-  lazy val MigrationAnnotRef = ctx.requiredClassRef("scala.annotation.migration")
-  def MigrationAnnot = MigrationAnnotRef.symbol.asClass
-  lazy val AnnotationDefaultAnnotRef = ctx.requiredClassRef("dotty.annotation.internal.AnnotationDefault")
-  def AnnotationDefaultAnnot = AnnotationDefaultAnnotRef.symbol.asClass
+  lazy val TailrecAnnotRef = ctx.requiredClassRef("scala.annotation.tailrec")
+  def TailrecAnnot = TailrecAnnotRef.symbol.asClass
   lazy val ThrowsAnnotRef = ctx.requiredClassRef("scala.throws")
   def ThrowsAnnot = ThrowsAnnotRef.symbol.asClass
+  lazy val TransientAnnotRef                = ctx.requiredClassRef("scala.transient")
+  def TransientAnnot = TransientAnnotRef.symbol.asClass
   lazy val UncheckedAnnotRef = ctx.requiredClassRef("scala.unchecked")
   def UncheckedAnnot = UncheckedAnnotRef.symbol.asClass
   lazy val UncheckedStableAnnotRef = ctx.requiredClassRef("scala.annotation.unchecked.uncheckedStable")