summaryrefslogtreecommitdiff
path: root/src/scaladoc/scala/tools/nsc/doc/model/ModelFactoryImplicitSupport.scala
diff options
context:
space:
mode:
authorSom Snytt <som.snytt@gmail.com>2015-06-14 01:22:34 -0700
committerSom Snytt <som.snytt@gmail.com>2015-06-14 01:22:34 -0700
commita3961f5d873609658e93c6c9abfdbaa6ea8f2e30 (patch)
tree187ca4cc9293396d9d8873e2ac22aa0e8ca3ed99 /src/scaladoc/scala/tools/nsc/doc/model/ModelFactoryImplicitSupport.scala
parent0bc7fa67d130f75079df79814b33ef073254e27a (diff)
downloadscala-a3961f5d873609658e93c6c9abfdbaa6ea8f2e30.tar.gz
scala-a3961f5d873609658e93c6c9abfdbaa6ea8f2e30.tar.bz2
scala-a3961f5d873609658e93c6c9abfdbaa6ea8f2e30.zip
SI-9354 ScalaDoc members added via by-name view
Eligible views were looked up by exact from type without including the by-name dodge. By-name views are now included without consideration whether ScalaDoc processes possible duplicates correctly.
Diffstat (limited to 'src/scaladoc/scala/tools/nsc/doc/model/ModelFactoryImplicitSupport.scala')
-rw-r--r--src/scaladoc/scala/tools/nsc/doc/model/ModelFactoryImplicitSupport.scala8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/scaladoc/scala/tools/nsc/doc/model/ModelFactoryImplicitSupport.scala b/src/scaladoc/scala/tools/nsc/doc/model/ModelFactoryImplicitSupport.scala
index f984b4579f..778839a1f5 100644
--- a/src/scaladoc/scala/tools/nsc/doc/model/ModelFactoryImplicitSupport.scala
+++ b/src/scaladoc/scala/tools/nsc/doc/model/ModelFactoryImplicitSupport.scala
@@ -90,8 +90,12 @@ trait ModelFactoryImplicitSupport {
else {
val context: global.analyzer.Context = global.analyzer.rootContext(NoCompilationUnit)
- val results = global.analyzer.allViewsFrom(sym.tpe_*, context, sym.typeParams)
+ val results = global.analyzer.allViewsFrom(sym.tpe_*, context, sym.typeParams) ++
+ global.analyzer.allViewsFrom(byNameType(sym.tpe_*), context, sym.typeParams)
var conversions = results.flatMap(result => makeImplicitConversion(sym, result._1, result._2, context, inTpl))
+ //debug(results.mkString("All views\n ", "\n ", "\n"))
+ //debug(conversions.mkString("Conversions\n ", "\n ", "\n"))
+
// also keep empty conversions, so they appear in diagrams
// conversions = conversions.filter(!_.members.isEmpty)
@@ -193,7 +197,7 @@ trait ModelFactoryImplicitSupport {
List(new ImplicitConversionImpl(sym, result.tree.symbol, toType, constraints, inTpl))
} catch {
case i: ImplicitNotFound =>
- //println(" Eliminating: " + toType)
+ //debug(s" Eliminating: $toType")
Nil
}
}