diff options
| -rw-r--r-- | src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala | 1 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/ScaladocModelTest.scala | 5 |
2 files changed, 5 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 010bb98549..a1ba086ce1 100644 --- a/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala +++ b/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala @@ -853,6 +853,7 @@ class ModelFactory(val global: Global, val settings: doc.Settings) { } def findMember(aSym: Symbol, inTpl: DocTemplateImpl): Option[MemberImpl] = { + normalizeTemplate(aSym.owner) inTpl.members.find(_.sym == aSym) } diff --git a/src/partest/scala/tools/partest/ScaladocModelTest.scala b/src/partest/scala/tools/partest/ScaladocModelTest.scala index f399b86029..b8a41aabe4 100644 --- a/src/partest/scala/tools/partest/ScaladocModelTest.scala +++ b/src/partest/scala/tools/partest/ScaladocModelTest.scala @@ -86,7 +86,10 @@ abstract class ScaladocModelTest extends DirectTest { private[this] def newDocFactory: DocFactory = { settings = new Settings(_ => ()) settings.scaladocQuietRun = true // yaay, no more "model contains X documentable templates"! - new DocFactory(new ConsoleReporter(settings), settings) + val args = extraSettings + " " + scaladocSettings + val command = new ScalaDoc.Command((CommandLineParser tokenize (args)), settings) + val docFact = new DocFactory(new ConsoleReporter(settings), settings) + docFact } // compile with scaladoc and output the result |