Skip to content

Commit f71b71c

Browse files
vlthrfelixmulder
authored andcommitted
Fix exception caused by attempting to serialize NonEntity values
- Added explicit checking for NonEntity when serializing DefaultParams
1 parent e93b78f commit f71b71c

File tree

1 file changed

+28
-21
lines changed

1 file changed

+28
-21
lines changed

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

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,34 @@ case class DefaultParams(
1717
) {
1818
import model.JavaConverters._
1919

20-
def toMap: Map[String, AnyRef] = Map(
21-
"docs" -> docs,
22-
23-
"originalDocs" -> originalDocs,
24-
25-
"page" -> Map(
26-
"url" -> page.url,
27-
"date" -> page.date,
28-
"path" -> page.path
29-
),
30-
31-
"site" -> Map(
32-
"baseurl" -> site.baseurl,
33-
"posts" -> site.posts.map(_.toMap),
34-
"project" -> site.projectTitle
35-
).asJava,
36-
37-
"sidebar" -> sidebar.titles.asJava,
38-
39-
"entity" -> entity.asJava()
40-
)
20+
def toMap: Map[String, AnyRef] = {
21+
val base = Map(
22+
"docs" -> docs,
23+
24+
"originalDocs" -> originalDocs,
25+
26+
"page" -> Map(
27+
"url" -> page.url,
28+
"date" -> page.date,
29+
"path" -> page.path
30+
),
31+
32+
"site" -> Map(
33+
"baseurl" -> site.baseurl,
34+
"posts" -> site.posts.map(_.toMap),
35+
"project" -> site.projectTitle
36+
).asJava,
37+
38+
"sidebar" -> sidebar.titles.asJava
39+
)
40+
val entityMap = entity match {
41+
case NonEntity => Map.empty
42+
case _ => Map(
43+
"entity" -> entity.asJava
44+
)
45+
}
46+
base ++ entityMap
47+
}
4148

4249
def withPosts(posts: Array[BlogPost]): DefaultParams =
4350
copy(site = SiteInfo(site.baseurl, site.projectTitle, posts))

0 commit comments

Comments
 (0)