diff options
| author | Heather Miller <heather.miller@epfl.ch> | 2011-09-17 23:27:27 +0000 |
|---|---|---|
| committer | Heather Miller <heather.miller@epfl.ch> | 2011-09-17 23:27:27 +0000 |
| commit | a26fc299cac88706ef6bdbdee56bc161d4435aef (patch) | |
| tree | f9c3f56ce80db9585722cdd39e1effa1d8bb1d23 /src | |
| parent | 3defd7a0a0b6c1ebe086ad0a467b7b43ba8f92e9 (diff) | |
| download | scala-a26fc299cac88706ef6bdbdee56bc161d4435aef.tar.gz scala-a26fc299cac88706ef6bdbdee56bc161d4435aef.tar.bz2 scala-a26fc299cac88706ef6bdbdee56bc161d4435aef.zip | |
Scaladoc now hides members with @bridge annotat...
Scaladoc now hides members with @bridge annotation, contributed by Simon
Ochsenreither. Closes SI-4924
Diffstat (limited to 'src')
4 files changed, 8 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/html/page/Template.scala b/src/compiler/scala/tools/nsc/doc/html/page/Template.scala index ba1aba2f0b..d152c3e2bf 100644 --- a/src/compiler/scala/tools/nsc/doc/html/page/Template.scala +++ b/src/compiler/scala/tools/nsc/doc/html/page/Template.scala @@ -29,7 +29,7 @@ class Template(tpl: DocTemplateEntity) extends HtmlPage { </xml:group> val valueMembers = - tpl.methods ++ tpl.values ++ tpl.templates.filter(x => x.isObject || x.isPackage) sorted + tpl.methods.filterNot(_.isBridge) ++ tpl.values ++ tpl.templates.filter(x => x.isObject || x.isPackage) sorted val (absValueMembers, nonAbsValueMembers) = valueMembers partition (_.isAbstract) diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.css b/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.css index 7dfde695e5..4f552b7169 100644 --- a/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.css +++ b/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.css @@ -345,7 +345,7 @@ div.members > ol > li:last-child { .cmt {} .cmt p { -/* margin: 0.7em 0;*/ + margin: 0.7em 0; } .cmt p:first-child { @@ -552,8 +552,8 @@ div.fullcommenttop dl.paramcmts > dd, div.fullcomment dl.paramcmts > dd { display: block; padding-left: 10px; - float: left; margin-bottom: 5px; + margin-left: 70px; } /* Members filter tool */ diff --git a/src/compiler/scala/tools/nsc/doc/model/Entity.scala b/src/compiler/scala/tools/nsc/doc/model/Entity.scala index 813d0b2f2e..42f0f67fa7 100644 --- a/src/compiler/scala/tools/nsc/doc/model/Entity.scala +++ b/src/compiler/scala/tools/nsc/doc/model/Entity.scala @@ -301,6 +301,10 @@ trait NonTemplateMemberEntity extends MemberEntity { * It corresponds to a real member, and provides a simplified, yet compatible signature for that member. */ def isUseCase: Boolean + /** Whether this member is a bridge member. A bridge member does only exist for binary compatibility reasons + * and should not appear in ScalaDoc. */ + def isBridge: Boolean + } diff --git a/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala b/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala index ea77a55c16..2a7f11325c 100644 --- a/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala +++ b/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala @@ -274,6 +274,7 @@ class ModelFactory(val global: Global, val settings: doc.Settings) { override def qualifiedName = optimize(inTemplate.qualifiedName + "#" + name) lazy val definitionName = optimize(inDefinitionTemplates.head.qualifiedName + "#" + name) def isUseCase = sym.isSynthetic + def isBridge = sym.isBridge } abstract class NonTemplateParamMemberImpl(sym: Symbol, inTpl: => DocTemplateImpl) extends NonTemplateMemberImpl(sym, inTpl) { |