Skip to content

Commit 2abb529

Browse files
committed
Make pattern matchas pass exhaustivity check
1 parent 1695228 commit 2abb529

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

doc-tool/src/dotty/tools/dottydoc/model/references.scala

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,6 @@ object references {
2828
}
2929
final case class NoLink(title: String, target: String) extends MaterializableLink
3030

31-
object AndOrTypeReference {
32-
def unapply(ref: Reference): Option[(Reference, String, Reference)] = ref match {
33-
case OrTypeReference(left, right) => Some((left, "|", right))
34-
case AndTypeReference(left, right) => Some((left, "&", right))
35-
case _ => None
36-
}
37-
}
38-
3931
implicit class ReferenceShower(val ref: Reference) extends AnyVal {
4032
def showReference: String = ref match {
4133
case TypeReference(title, _, tparams) =>
@@ -44,8 +36,10 @@ object references {
4436
else ""
4537
}
4638

47-
case AndOrTypeReference(left, part, right) =>
48-
left.showReference + s" $part " + right.showReference
39+
case OrTypeReference(left, right) =>
40+
left.showReference + " | " + right.showReference
41+
case AndTypeReference(left, right) =>
42+
left.showReference + " & " + right.showReference
4943

5044
case FunctionReference(args, ret) =>
5145
if (args.isEmpty)
@@ -67,6 +61,7 @@ object references {
6761
s"$title: $byName${ref.showReference}$repeated"
6862

6963
case ConstantReference(title) => title
64+
case EmptyReference => ""
7065
}
7166
}
7267
}

doc-tool/src/dotty/tools/dottydoc/staticsite/tags.scala

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,11 @@ object tags {
7979
else renderLink(baseurl, tpeLink)
8080
}
8181

82-
case AndOrTypeReference(left, sep, right) =>
83-
s"""${renderReference(left)}<span class="and-or-separator"> $sep </span>${renderReference(right)}"""
82+
case OrTypeReference(left, right) =>
83+
s"""${renderReference(left)}<span class="and-or-separator"> | </span>${renderReference(right)}"""
84+
85+
case AndTypeReference(left, right) =>
86+
s"""${renderReference(left)}<span class="and-or-separator"> &amp; </span>${renderReference(right)}"""
8487

8588
case FunctionReference(args, returnValue) => {
8689
val params =

0 commit comments

Comments
 (0)