summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala
diff options
context:
space:
mode:
authorGilles Dubochet <gilles.dubochet@epfl.ch>2010-04-12 17:30:24 +0000
committerGilles Dubochet <gilles.dubochet@epfl.ch>2010-04-12 17:30:24 +0000
commit8ec16299c89c1eb776f3b6b767461231ad17eeb7 (patch)
tree06264e664aef48edab3add68bca92d78f9b65b33 /src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala
parent010889645cc64ce5c10538a947d37c4760204d0f (diff)
downloadscala-8ec16299c89c1eb776f3b6b767461231ad17eeb7.tar.gz
scala-8ec16299c89c1eb776f3b6b767461231ad17eeb7.tar.bz2
scala-8ec16299c89c1eb776f3b6b767461231ad17eeb7.zip
[scaladoc] Inner objects, which according to th...
[scaladoc] Inner objects, which according to the compiler are actually methods, are now printed as objects by Scaladoc. No review.
Diffstat (limited to 'src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala')
-rw-r--r--src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala b/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala
index 3bd47eef32..d4974d3080 100644
--- a/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala
+++ b/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala
@@ -333,7 +333,7 @@ class ModelFactory(val global: Global, val settings: doc.Settings) extends Comme
def makeMember(aSym: Symbol, inTpl: => DocTemplateImpl): List[MemberImpl] = {
def makeMember0(bSym: Symbol): Option[MemberImpl] = {
- if (bSym.isGetter && bSym.isLazy) // Scala field accessor or Java field
+ if (bSym.isGetter && bSym.isLazy)
Some(new NonTemplateMemberImpl(bSym, inTpl) with Val {
override def isLazyVal = true
})
@@ -341,7 +341,7 @@ class ModelFactory(val global: Global, val settings: doc.Settings) extends Comme
Some(new NonTemplateMemberImpl(bSym, inTpl) with Val {
override def isVar = true
})
- else if (bSym.isMethod && !bSym.isGetterOrSetter && !bSym.isConstructor)
+ else if (bSym.isMethod && !bSym.isGetterOrSetter && !bSym.isConstructor && !bSym.isModule)
Some(new NonTemplateParamMemberImpl(bSym, inTpl) with Def {
override def isDef = true
def typeParams =