Protect against double definition. Update semanticdb

Author: bishabosha

compiler/src/dotty/tools/dotc/ast/DesugarEnums.scala

@@ -171,7 +171,10 @@ object DesugarEnums {
               constraints.enumCases.map((i, enumValue) => CaseDef(Literal(Constant(i)), EmptyTree, enumValue))
               :+ default(ordinal)))
 
-    scaffolding ::: valueCtor ::: fromOrdinal :: Nil
+    if !enumClass.exists then
+      Nil
+    else
+      scaffolding ::: valueCtor ::: fromOrdinal :: Nil
   end enumLookupMethods
 
   /** A creation method for a value of enum type `E`, which is defined as follows:
@@ -281,8 +284,8 @@ object DesugarEnums {
     ordinalMeth(Literal(Constant(ord)))
 
   def fromOrdinalMeth(body: Tree => Tree)(using Context): DefDef =
-    DefDef(nme.fromOrdinal, Nil, List(param(nme.ordinalDollar_, defn.IntType) :: Nil),
-      rawRef(enumClass.typeRef), body(Ident(nme.ordinalDollar_))).withFlags(Synthetic)
+    DefDef(nme.fromOrdinal, Nil, (param(nme.ordinal, defn.IntType) :: Nil) :: Nil,
+      rawRef(enumClass.typeRef), body(Ident(nme.ordinal))).withFlags(Synthetic)
 
   /** Expand a module definition representing a parameterless enum case */
   def expandEnumModule(name: TermName, impl: Template, mods: Modifiers, definesLookups: Boolean, span: Span)(using Context): Tree = {

tests/run/enum-values.scala

@@ -31,11 +31,11 @@ enum ClassOnly: // this should still generate the `ordinal` and `fromOrdinal` co
 @main def Test: Unit =
   import Color._, Tag._, Expr._, ListLike._, TypeCtorsK._, MixedParams._, ClassOnly._
 
-  type FromOrdinal[T <: AnyRef] = {
+  type FromOrdinal[T] = {
     def fromOrdinal(ordinal: Int): T
   }
 
-  type ValueOf[T <: AnyRef] = {
+  type ValueOf[T] = {
     def valueOf(s: String): T
   }
 

tests/semanticdb/metac.expect

@@ -641,7 +641,7 @@ Schema => SemanticDB v4
 Uri => Enums.scala
 Text => empty
 Language => Scala
-Symbols => 181 entries
+Symbols => 185 entries
 Occurrences => 203 entries
 
 Symbols:
@@ -651,37 +651,35 @@ _empty_/Enums.Coin#`<init>`(). => primary ctor <init>
 _empty_/Enums.Coin#`<init>`().(value) => param value
 _empty_/Enums.Coin#value. => val method value
 _empty_/Enums.Coin. => final object Coin
-_empty_/Enums.Coin.$fromOrdinal(). => method $fromOrdinal
-_empty_/Enums.Coin.$fromOrdinal().(_$ordinal) => param _$ordinal
 _empty_/Enums.Coin.$values. => val method $values
 _empty_/Enums.Coin.Dime. => case val static enum method Dime
 _empty_/Enums.Coin.Dollar. => case val static enum method Dollar
 _empty_/Enums.Coin.Nickel. => case val static enum method Nickel
 _empty_/Enums.Coin.Penny. => case val static enum method Penny
 _empty_/Enums.Coin.Quarter. => case val static enum method Quarter
+_empty_/Enums.Coin.fromOrdinal(). => method fromOrdinal
+_empty_/Enums.Coin.fromOrdinal().(ordinal) => param ordinal
 _empty_/Enums.Coin.valueOf(). => method valueOf
 _empty_/Enums.Coin.valueOf().($name) => param $name
 _empty_/Enums.Coin.values(). => method values
 _empty_/Enums.Colour# => abstract sealed enum class Colour
 _empty_/Enums.Colour#`<init>`(). => primary ctor <init>
 _empty_/Enums.Colour. => final object Colour
-_empty_/Enums.Colour.$fromOrdinal(). => method $fromOrdinal
-_empty_/Enums.Colour.$fromOrdinal().(_$ordinal) => param _$ordinal
 _empty_/Enums.Colour.$new(). => method $new
 _empty_/Enums.Colour.$new().($name) => param $name
 _empty_/Enums.Colour.$new().(_$ordinal) => param _$ordinal
 _empty_/Enums.Colour.$values. => val method $values
 _empty_/Enums.Colour.Blue. => case val static enum method Blue
 _empty_/Enums.Colour.Green. => case val static enum method Green
 _empty_/Enums.Colour.Red. => case val static enum method Red
+_empty_/Enums.Colour.fromOrdinal(). => method fromOrdinal
+_empty_/Enums.Colour.fromOrdinal().(ordinal) => param ordinal
 _empty_/Enums.Colour.valueOf(). => method valueOf
 _empty_/Enums.Colour.valueOf().($name) => param $name
 _empty_/Enums.Colour.values(). => method values
 _empty_/Enums.Directions# => abstract sealed enum class Directions
 _empty_/Enums.Directions#`<init>`(). => primary ctor <init>
 _empty_/Enums.Directions. => final object Directions
-_empty_/Enums.Directions.$fromOrdinal(). => method $fromOrdinal
-_empty_/Enums.Directions.$fromOrdinal().(_$ordinal) => param _$ordinal
 _empty_/Enums.Directions.$new(). => method $new
 _empty_/Enums.Directions.$new().($name) => param $name
 _empty_/Enums.Directions.$new().(_$ordinal) => param _$ordinal
@@ -690,15 +688,15 @@ _empty_/Enums.Directions.East. => case val static enum method East
 _empty_/Enums.Directions.North. => case val static enum method North
 _empty_/Enums.Directions.South. => case val static enum method South
 _empty_/Enums.Directions.West. => case val static enum method West
+_empty_/Enums.Directions.fromOrdinal(). => method fromOrdinal
+_empty_/Enums.Directions.fromOrdinal().(ordinal) => param ordinal
 _empty_/Enums.Directions.valueOf(). => method valueOf
 _empty_/Enums.Directions.valueOf().($name) => param $name
 _empty_/Enums.Directions.values(). => method values
 _empty_/Enums.Maybe# => abstract sealed enum class Maybe
 _empty_/Enums.Maybe#[A] => covariant typeparam A
 _empty_/Enums.Maybe#`<init>`(). => primary ctor <init>
 _empty_/Enums.Maybe. => final object Maybe
-_empty_/Enums.Maybe.$fromOrdinal(). => method $fromOrdinal
-_empty_/Enums.Maybe.$fromOrdinal().(_$ordinal) => param _$ordinal
 _empty_/Enums.Maybe.$values. => val method $values
 _empty_/Enums.Maybe.Just# => final case enum class Just
 _empty_/Enums.Maybe.Just#[A] => covariant typeparam A
@@ -721,6 +719,8 @@ _empty_/Enums.Maybe.Just.unapply(). => method unapply
 _empty_/Enums.Maybe.Just.unapply().(x$1) => param x$1
 _empty_/Enums.Maybe.Just.unapply().[A] => typeparam A
 _empty_/Enums.Maybe.None. => case val static enum method None
+_empty_/Enums.Maybe.fromOrdinal(). => method fromOrdinal
+_empty_/Enums.Maybe.fromOrdinal().(ordinal) => param ordinal
 _empty_/Enums.Maybe.valueOf(). => method valueOf
 _empty_/Enums.Maybe.valueOf().($name) => param $name
 _empty_/Enums.Maybe.values(). => method values
@@ -744,14 +744,14 @@ _empty_/Enums.Planet.Neptune. => case val static enum method Neptune
 _empty_/Enums.Planet.Saturn. => case val static enum method Saturn
 _empty_/Enums.Planet.Uranus. => case val static enum method Uranus
 _empty_/Enums.Planet.Venus. => case val static enum method Venus
+_empty_/Enums.Planet.fromOrdinal(). => method fromOrdinal
+_empty_/Enums.Planet.fromOrdinal().(ordinal) => param ordinal
 _empty_/Enums.Planet.valueOf(). => method valueOf
 _empty_/Enums.Planet.valueOf().($name) => param $name
 _empty_/Enums.Planet.values(). => method values
 _empty_/Enums.Suits# => abstract sealed enum class Suits
 _empty_/Enums.Suits#`<init>`(). => primary ctor <init>
 _empty_/Enums.Suits. => final object Suits
-_empty_/Enums.Suits.$fromOrdinal(). => method $fromOrdinal
-_empty_/Enums.Suits.$fromOrdinal().(_$ordinal) => param _$ordinal
 _empty_/Enums.Suits.$new(). => method $new
 _empty_/Enums.Suits.$new().($name) => param $name
 _empty_/Enums.Suits.$new().(_$ordinal) => param _$ordinal
@@ -765,26 +765,26 @@ _empty_/Enums.Suits.extension_isBlack(). => method extension_isBlack
 _empty_/Enums.Suits.extension_isBlack().(suit) => param suit
 _empty_/Enums.Suits.extension_isRed(). => method extension_isRed
 _empty_/Enums.Suits.extension_isRed().(suit) => param suit
+_empty_/Enums.Suits.fromOrdinal(). => method fromOrdinal
+_empty_/Enums.Suits.fromOrdinal().(ordinal) => param ordinal
 _empty_/Enums.Suits.valueOf(). => method valueOf
 _empty_/Enums.Suits.valueOf().($name) => param $name
 _empty_/Enums.Suits.values(). => method values
 _empty_/Enums.Tag# => abstract sealed enum class Tag
 _empty_/Enums.Tag#[A] => typeparam A
 _empty_/Enums.Tag#`<init>`(). => primary ctor <init>
 _empty_/Enums.Tag. => final object Tag
-_empty_/Enums.Tag.$fromOrdinal(). => method $fromOrdinal
-_empty_/Enums.Tag.$fromOrdinal().(_$ordinal) => param _$ordinal
 _empty_/Enums.Tag.$values. => val method $values
 _empty_/Enums.Tag.BooleanTag. => case val static enum method BooleanTag
 _empty_/Enums.Tag.IntTag. => case val static enum method IntTag
+_empty_/Enums.Tag.fromOrdinal(). => method fromOrdinal
+_empty_/Enums.Tag.fromOrdinal().(ordinal) => param ordinal
 _empty_/Enums.Tag.valueOf(). => method valueOf
 _empty_/Enums.Tag.valueOf().($name) => param $name
 _empty_/Enums.Tag.values(). => method values
 _empty_/Enums.WeekDays# => abstract sealed enum class WeekDays
 _empty_/Enums.WeekDays#`<init>`(). => primary ctor <init>
 _empty_/Enums.WeekDays. => final object WeekDays
-_empty_/Enums.WeekDays.$fromOrdinal(). => method $fromOrdinal
-_empty_/Enums.WeekDays.$fromOrdinal().(_$ordinal) => param _$ordinal
 _empty_/Enums.WeekDays.$new(). => method $new
 _empty_/Enums.WeekDays.$new().($name) => param $name
 _empty_/Enums.WeekDays.$new().(_$ordinal) => param _$ordinal
@@ -796,6 +796,8 @@ _empty_/Enums.WeekDays.Sunday. => case val static enum method Sunday
 _empty_/Enums.WeekDays.Thursday. => case val static enum method Thursday
 _empty_/Enums.WeekDays.Tuesday. => case val static enum method Tuesday
 _empty_/Enums.WeekDays.Wednesday. => case val static enum method Wednesday
+_empty_/Enums.WeekDays.fromOrdinal(). => method fromOrdinal
+_empty_/Enums.WeekDays.fromOrdinal().(ordinal) => param ordinal
 _empty_/Enums.WeekDays.valueOf(). => method valueOf
 _empty_/Enums.WeekDays.valueOf().($name) => param $name
 _empty_/Enums.WeekDays.values(). => method values
@@ -817,6 +819,8 @@ _empty_/Enums.`<:<`.Refl.toString(). => method toString
 _empty_/Enums.`<:<`.Refl.unapply(). => method unapply
 _empty_/Enums.`<:<`.Refl.unapply().(x$1) => param x$1
 _empty_/Enums.`<:<`.Refl.unapply().[C] => typeparam C
+_empty_/Enums.`<:<`.fromOrdinal(). => method fromOrdinal
+_empty_/Enums.`<:<`.fromOrdinal().(ordinal) => param ordinal
 _empty_/Enums.`<:<`.given_T(). => final implicit method given_T
 _empty_/Enums.`<:<`.given_T().[T] => typeparam T
 _empty_/Enums.extension_unwrap(). => method extension_unwrap