summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dubochet <gilles.dubochet@epfl.ch>2011-02-23 20:50:10 +0000
committerGilles Dubochet <gilles.dubochet@epfl.ch>2011-02-23 20:50:10 +0000
commitc9a2180b1bb3319464d6744da0c6bc84c832ea79 (patch)
treedda3c6cebd69a90d48399435a4e58af0b9c6353a
parent10ec23352caad02c1d069b909f5eaa26d306637e (diff)
downloadscala-c9a2180b1bb3319464d6744da0c6bc84c832ea79.tar.gz
scala-c9a2180b1bb3319464d6744da0c6bc84c832ea79.tar.bz2
scala-c9a2180b1bb3319464d6744da0c6bc84c832ea79.zip
[scaladoc] No companion linking is attempted fr...
[scaladoc] No companion linking is attempted from inner object to abstract type member. Closes #4180. No review.
-rw-r--r--src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala b/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala
index 7901b1e05a..5db4b0db4f 100644
--- a/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala
+++ b/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala
@@ -224,7 +224,8 @@ class ModelFactory(val global: Global, val settings: doc.Settings) { thisFactory
def isDocTemplate = true
def companion = sym.companionSymbol match {
case NoSymbol => None
- case comSym if !isEmptyJavaObject(comSym) => Some(makeDocTemplate(comSym, inTpl))
+ case comSym if !isEmptyJavaObject(comSym) && (comSym.isClass || comSym.isModule || isNestedObjectLazyVal(comSym)) =>
+ Some(makeDocTemplate(comSym, inTpl))
case _ => None
}
}