summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala
diff options
context:
space:
mode:
authorJakob Odersky <jakob@odersky.com>2016-07-22 18:34:47 -0700
committerJason Zaugg <jzaugg@gmail.com>2016-08-13 13:26:50 +1000
commitad67700b1cc685f115da14a5af759b8859f1e9c2 (patch)
treece4b1028ddc45281d9e87be8508e7a7204a3eeb3 /src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala
parent4e822d74be9c21377189428ca474ec990af6cc87 (diff)
downloadscala-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/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala b/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala
index ea323d0fba..99ef4ed373 100644
--- a/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala
@@ -201,7 +201,7 @@ trait MethodSynthesis {
import AnnotationInfo.{mkFilter => annotationFilter}
def addDerivedTrees(typer: Typer, stat: Tree): List[Tree] = stat match {
- case vd @ ValDef(mods, name, tpt, rhs) if deriveAccessors(vd) && !vd.symbol.isModuleVar =>
+ case vd @ ValDef(mods, name, tpt, rhs) if deriveAccessors(vd) && !vd.symbol.isModuleVar && !vd.symbol.isJava =>
stat.symbol.initialize // needed!
val getter = Getter(vd)