diff options
| author | Jakob Odersky <jakob@odersky.com> | 2016-07-22 18:34:47 -0700 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2016-08-13 13:26:50 +1000 |
| commit | ad67700b1cc685f115da14a5af759b8859f1e9c2 (patch) | |
| tree | ce4b1028ddc45281d9e87be8508e7a7204a3eeb3 /src/scaladoc/scala/tools/nsc | |
| parent | 4e822d74be9c21377189428ca474ec990af6cc87 (diff) | |
| download | scala-ad67700b1cc685f115da14a5af759b8859f1e9c2.tar.gz scala-ad67700b1cc685f115da14a5af759b8859f1e9c2.tar.bz2 scala-ad67700b1cc685f115da14a5af759b8859f1e9c2.zip | |
Javadoc: fix problems in community build
- fix initialization NPE in doc headers
- fix assertion errors for java fields
- ignore comments when deciding where to put interface methods
- consider DocDefs when checking for constructors
Diffstat (limited to 'src/scaladoc/scala/tools/nsc')
| -rw-r--r-- | src/scaladoc/scala/tools/nsc/doc/ScaladocAnalyzer.scala | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/scaladoc/scala/tools/nsc/doc/ScaladocAnalyzer.scala b/src/scaladoc/scala/tools/nsc/doc/ScaladocAnalyzer.scala index 2152ce234a..d8ec7b18fd 100644 --- a/src/scaladoc/scala/tools/nsc/doc/ScaladocAnalyzer.scala +++ b/src/scaladoc/scala/tools/nsc/doc/ScaladocAnalyzer.scala @@ -216,11 +216,16 @@ abstract class ScaladocSyntaxAnalyzer[G <: Global](val global: G) extends Syntax class ScaladocJavaUnitScanner(unit: CompilationUnit) extends JavaUnitScanner(unit) { - private val docBuffer: StringBuilder = new StringBuilder + private var docBuffer: StringBuilder = _ private var inDocComment = false private var docStart: Int = 0 private var lastDoc: DocComment = null + override def init() = { + docBuffer = new StringBuilder + super.init() + } + // get last doc comment def flushDoc(): DocComment = try lastDoc finally lastDoc = null |