Scaladoc feature that shows implicit conversions

See https://github.com/VladUreche/scala/tree/feature/doc-implicits for the history.
See https://scala-webapps.epfl.ch/jenkins/view/scaladoc/job/scaladoc-implicits-nightly/ for nightlies.

Many thanks fly out to Adriaan for his help with implicit search!

1 files changed, 4 insertions, 2 deletions

diff --git a/src/compiler/scala/tools/nsc/doc/DocFactory.scala b/src/compiler/scala/tools/nsc/doc/DocFactory.scala
index f32564f097..76a8b87ba7 100644
--- a/src/compiler/scala/tools/nsc/doc/DocFactory.scala
+++ b/src/compiler/scala/tools/nsc/doc/DocFactory.scala
@@ -58,7 +58,7 @@ class DocFactory(val reporter: Reporter, val settings: doc.Settings) { processor
       case Right(sourceCode) =>
         new compiler.Run() compileSources List(new BatchSourceFile("newSource", sourceCode))
     }
-    
+
     if (reporter.hasErrors)
       return None
 
@@ -80,6 +80,7 @@ class DocFactory(val reporter: Reporter, val settings: doc.Settings) { processor
     val modelFactory = (
       new { override val global: compiler.type = compiler }
         with model.ModelFactory(compiler, settings)
+        with model.ModelFactoryImplicitSupport
         with model.comment.CommentFactory
         with model.TreeFactory {
           override def templateShouldDocument(sym: compiler.Symbol) =
@@ -89,7 +90,8 @@ class DocFactory(val reporter: Reporter, val settings: doc.Settings) { processor
 
     modelFactory.makeModel match {
       case Some(madeModel) =>
-        println("model contains " + modelFactory.templatesCount + " documentable templates")
+        if (settings.reportModel)
+          println("model contains " + modelFactory.templatesCount + " documentable templates")
         Some(madeModel)
       case None =>
         println("no documentable class found in compilation units")