Skip to content

Commit 308da81

Browse files
Florian3kWojciechMazur
authored andcommitted
scaladoc: fix enum case case
[Cherry-picked 8282309]
1 parent f8f98cc commit 308da81

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

scaladoc-testcases/src/tests/enumSignatures.scala

+9-9
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@ package enumSignatures
44

55
enum Enum1
66
{
7-
case A
8-
case B
9-
case C
7+
case A //expected: case A extends Enum1
8+
case B //expected: case B extends Enum1
9+
case C //expected: case C extends Enum1
1010
}
1111
enum Enum2(val i: Int):
12-
case A(s: String) extends Enum2/*<-*/(1)/*->*/
13-
case B(t: String) extends Enum2/*<-*/(2)/*->*/
14-
case C(u: String) extends Enum2/*<-*/(3)/*->*/
12+
case A(s: String) extends Enum2(1) //expected: final case class A(s: String) extends Enum2
13+
case B(t: String) extends Enum2(2) //expected: final case class B(t: String) extends Enum2
14+
case C(u: String) extends Enum2(3) //expected: final case class C(u: String) extends Enum2
1515

1616
enum Enum3(val param: Int):
1717
case A extends Enum3/*<-*/(1)/*->*/ with A
1818
case B extends Enum3/*<-*/(2)/*->*/
1919
case C extends Enum3/*<-*/(3)/*->*/
2020

2121
enum Enum4[+T]:
22-
case G(s: String)
22+
case G(s: String) //expected: final case class G[+T](s: String)
2323
case B extends Enum4[Int] with A
24-
case C[V](s: String) extends Enum4[V]
25-
case D[T](s: String) extends Enum4[T]
24+
case C[V](s: String) extends Enum4[V] //expected: final case class C[V](s: String) extends Enum4[V]
25+
case D[T](s: String) extends Enum4[T] //expected: final case class D[T](s: String) extends Enum4[T]
2626

2727
trait A

scaladoc/src/dotty/tools/scaladoc/api.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ enum Kind(val name: String):
6060
case Trait(override val typeParams: Seq[TypeParameter], override val argsLists: Seq[TermParameterList])
6161
extends Kind("trait") with Classlike
6262
case Enum(override val typeParams: Seq[TypeParameter], override val argsLists: Seq[TermParameterList]) extends Kind("enum") with Classlike
63-
case EnumCase(kind: Object.type | Kind.Type | Val.type | Class) extends Kind("case")
63+
case EnumCase(kind: Object.type | Kind.Type | Val.type | Class) extends Kind(kind.name)
6464
case Def(paramLists: Seq[Either[TermParameterList,TypeParameterList]])
6565
extends Kind("def")
6666
case Extension(on: ExtensionTarget, m: Kind.Def) extends Kind("def")
@@ -146,9 +146,9 @@ case class HierarchyGraph(edges: Seq[(LinkToType, LinkToType)], sealedNodes: Set
146146
def vertecies: Seq[LinkToType] = edges.flatten((a, b) => Seq(a, b)).distinct
147147
def verteciesWithId: Map[LinkToType, Int] = vertecies.zipWithIndex.toMap
148148
def +(edge: (LinkToType, LinkToType)): HierarchyGraph = this ++ Seq(edge)
149-
def ++(edges: Seq[(LinkToType, LinkToType)]): HierarchyGraph =
149+
def ++(edges: Seq[(LinkToType, LinkToType)]): HierarchyGraph =
150150
this.copy(edges = this.edges.view.concat(edges).distinct.toSeq)
151-
151+
152152
object HierarchyGraph:
153153
def empty = HierarchyGraph(Seq.empty)
154154
def withEdges(edges: Seq[(LinkToType, LinkToType)]) = HierarchyGraph.empty ++ edges

scaladoc/src/dotty/tools/scaladoc/translators/ScalaSignatureProvider.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class ScalaSignatureProvider:
7575

7676
MemberSignature(
7777
builder.modifiersAndVisibility(entry),
78-
builder.kind(entry.kind),
78+
List(),
7979
builder.name(entry.name, entry.dri),
8080
builder.keyword(" extends ").signature(modifiedType)
8181
)

scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class ExtensionMethodParamsSignature extends SignatureTest("extensionParams", Si
4545

4646
class ClassModifiers extends SignatureTest("classModifiers", SignatureTest.classlikeKinds)
4747

48-
class EnumSignatures extends SignatureTest("enumSignatures", SignatureTest.all)
48+
class EnumSignatures extends SignatureTest("enumSignatures", "case" +: SignatureTest.all)
4949

5050
class StructuralTypes extends SignatureTest("structuralTypes", SignatureTest.members)
5151

0 commit comments

Comments
 (0)