Skip to content

Commit f1eaafd

Browse files
committed
Fix scala#4295 temporarily.
1 parent 8394d19 commit f1eaafd

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ object JavaConverters {
1414
def asJava = opt.getOrElse(null)
1515
}
1616

17-
implicit class OptMap(val opt: Option[JMap[String, _]]) extends AnyVal {
18-
def asJava = opt.getOrElse(Map.empty.asJava)
19-
}
17+
def emptyJMap[V]: JMap[String, V] = Map.empty[String, V].asJava
2018

2119
implicit class JavaComment(val cmt: Comment) extends AnyVal {
2220
def asJava: JMap[String, _] = Map(
@@ -150,7 +148,7 @@ object JavaConverters {
150148
"name" -> ent.name,
151149
"path" -> ent.path.asJava,
152150
"children" -> ent.children.map(_.asJava).asJava,
153-
"comment" -> ent.comment.map(_.asJava).asJava,
151+
"comment" -> ent.comment.map(_.asJava).getOrElse(emptyJMap),
154152
"signature" -> ent.signature
155153
)
156154
val members = ent match {
@@ -201,13 +199,13 @@ object JavaConverters {
201199
}
202200
val implicitlyAddedEntity = ent match {
203201
case ent: ImplicitlyAddedEntity => Map(
204-
"implicitlyAddedFrom" -> ent.implicitlyAddedFrom.map(_.asJava).asJava
202+
"implicitlyAddedFrom" -> ent.implicitlyAddedFrom.map(_.asJava).getOrElse(emptyJMap)
205203
)
206204
case _ => Map.empty
207205
}
208206
val typeAlias : Map[String, _] = ent match {
209207
case ent: TypeAlias => Map(
210-
"alias" -> ent.alias.map(_.asJava).asJava
208+
"alias" -> ent.alias.map(_.asJava).getOrElse(emptyJMap)
211209
)
212210
case _ => Map.empty
213211
}

0 commit comments

Comments
 (0)