diff options
author | Lukas Rytz <lukas.rytz@gmail.com> | 2014-08-26 14:49:01 +0200 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@gmail.com> | 2014-08-26 14:49:01 +0200 |
commit | e27d024c386c817030d872b9773171598e11dd8d (patch) | |
tree | 6070bb44e3c87be079040dbf1e25f5bb2756703a /src/scaladoc | |
parent | 771724494d4a7e73542c04e8e0b50523745fb7a8 (diff) | |
parent | 47908f19e064151140e32819c2edd9e68b34dd0c (diff) | |
download | scala-e27d024c386c817030d872b9773171598e11dd8d.tar.gz scala-e27d024c386c817030d872b9773171598e11dd8d.tar.bz2 scala-e27d024c386c817030d872b9773171598e11dd8d.zip |
Merge remote-tracking branch 'upstream/2.11.x' into backports
Conflicts:
src/library/scala/util/matching/Regex.scala
Diffstat (limited to 'src/scaladoc')
-rw-r--r-- | src/scaladoc/scala/tools/nsc/doc/ScaladocAnalyzer.scala | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/scaladoc/scala/tools/nsc/doc/ScaladocAnalyzer.scala b/src/scaladoc/scala/tools/nsc/doc/ScaladocAnalyzer.scala index ccf18b76de..cbf8ff22ba 100644 --- a/src/scaladoc/scala/tools/nsc/doc/ScaladocAnalyzer.scala +++ b/src/scaladoc/scala/tools/nsc/doc/ScaladocAnalyzer.scala @@ -208,7 +208,7 @@ abstract class ScaladocSyntaxAnalyzer[G <: Global](val global: G) extends Syntax super.skipDocComment() } override def skipBlockComment(): Unit = { - inDocComment = false + inDocComment = false // ??? this means docBuffer won't receive contents of this comment??? docBuffer = new StringBuilder("/*") super.skipBlockComment() } @@ -217,9 +217,10 @@ abstract class ScaladocSyntaxAnalyzer[G <: Global](val global: G) extends Syntax def foundStarComment(start: Int, end: Int) = try { val str = docBuffer.toString val pos = Position.range(unit.source, start, start, end) - unit.comment(pos, str) - if (inDocComment) + if (inDocComment) { + signalParsedDocComment(str, pos) lastDoc = DocComment(str, pos) + } true } finally { docBuffer = null |