Merge pull request #3824 from retronym/ticket/8672

SI-8672 Better end-of-sentence detection for Scaladoc

1 files changed, 11 insertions, 1 deletions

diff --git a/src/scaladoc/scala/tools/nsc/doc/base/CommentFactoryBase.scala b/src/scaladoc/scala/tools/nsc/doc/base/CommentFactoryBase.scala
index a933c35c99..19cc27b40b 100755
--- a/src/scaladoc/scala/tools/nsc/doc/base/CommentFactoryBase.scala
+++ b/src/scaladoc/scala/tools/nsc/doc/base/CommentFactoryBase.scala
@@ -666,7 +666,7 @@ trait CommentFactoryBase { this: MemberLookupBase =>
     }
 
     def summary(): Inline = {
-      val i = inline(check("."))
+      val i = inline(checkSentenceEnded())
       Summary(
         if (jump("."))
           Chain(List(i, Text(".")))
@@ -785,6 +785,16 @@ trait CommentFactoryBase { this: MemberLookupBase =>
       })
     }
 
+    def checkSentenceEnded(): Boolean = {
+      (char == '.') && {
+        val poff = offset
+        nextChar() // read '.'
+        val ok = char == endOfText || char == endOfLine || isWhitespace(char)
+        offset = poff
+        ok
+      }
+    }
+
     def reportError(pos: Position, message: String) {
       reporter.warning(pos, message)
     }