diff options
Diffstat (limited to 'doc-tool/src/dotty/tools/dottydoc/model')
-rw-r--r-- | doc-tool/src/dotty/tools/dottydoc/model/JavaConverters.scala (renamed from doc-tool/src/dotty/tools/dottydoc/model/java.scala) | 5 | ||||
-rw-r--r-- | doc-tool/src/dotty/tools/dottydoc/model/comment/CommentCleaner.scala | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/doc-tool/src/dotty/tools/dottydoc/model/java.scala b/doc-tool/src/dotty/tools/dottydoc/model/JavaConverters.scala index b30c10734..9c423c3ea 100644 --- a/doc-tool/src/dotty/tools/dottydoc/model/java.scala +++ b/doc-tool/src/dotty/tools/dottydoc/model/JavaConverters.scala @@ -7,7 +7,7 @@ import references._ import _root_.java.util.HashMap import _root_.java.util.LinkedList -object java { +object JavaConverters { import scala.collection.JavaConverters._ import _root_.java.util.{ Optional => JOptional, Map => JMap } @@ -253,7 +253,8 @@ object java { "scala" -> ref ).asJava - case EmptyReference => ??? + case EmptyReference => + throw new IllegalStateException("Empty reference discovered while converting to Java Map") } } diff --git a/doc-tool/src/dotty/tools/dottydoc/model/comment/CommentCleaner.scala b/doc-tool/src/dotty/tools/dottydoc/model/comment/CommentCleaner.scala index 30b3b0de0..5b60cd5f9 100644 --- a/doc-tool/src/dotty/tools/dottydoc/model/comment/CommentCleaner.scala +++ b/doc-tool/src/dotty/tools/dottydoc/model/comment/CommentCleaner.scala @@ -4,6 +4,7 @@ package comment trait CommentCleaner { import Regexes._ + import java.util.regex.Matcher def clean(comment: String): List[String] = { def cleanLine(line: String): String = { @@ -18,7 +19,7 @@ trait CommentCleaner { val javadoclessComment = JavadocTags.replaceAllIn(safeComment, { javadocReplacement(_) }) val markedTagComment = SafeTags.replaceAllIn(javadoclessComment, { mtch => - _root_.java.util.regex.Matcher.quoteReplacement(safeTagMarker + mtch.matched + safeTagMarker) + Matcher.quoteReplacement(safeTagMarker + mtch.matched + safeTagMarker) }) markedTagComment.lines.toList map (cleanLine) } |