diff options
| author | Felix Mulder <felix.mulder@gmail.com> | 2017-01-17 13:21:36 +0100 |
|---|---|---|
| committer | Felix Mulder <felix.mulder@gmail.com> | 2017-01-31 14:32:38 +0100 |
| commit | 8f85e18db4ba2be95f39ff080e988e430222d310 (patch) | |
| tree | 76b9d245e9abdca8fa650b701b32a3accabc892d /doc-tool/src | |
| parent | 4d67243c4b6aea2038b160091088ca0998d7be90 (diff) | |
| download | dotty-8f85e18db4ba2be95f39ff080e988e430222d310.tar.gz dotty-8f85e18db4ba2be95f39ff080e988e430222d310.tar.bz2 dotty-8f85e18db4ba2be95f39ff080e988e430222d310.zip | |
Don't collect param accessors in `DocASTPhase`
Diffstat (limited to 'doc-tool/src')
| -rw-r--r-- | doc-tool/src/dotty/tools/dottydoc/core/DocASTPhase.scala | 8 | ||||
| -rw-r--r-- | doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/doc-tool/src/dotty/tools/dottydoc/core/DocASTPhase.scala b/doc-tool/src/dotty/tools/dottydoc/core/DocASTPhase.scala index cc47144fc..a3e71340c 100644 --- a/doc-tool/src/dotty/tools/dottydoc/core/DocASTPhase.scala +++ b/doc-tool/src/dotty/tools/dottydoc/core/DocASTPhase.scala @@ -45,7 +45,7 @@ class DocASTPhase extends Phase { } def membersFromSymbol(sym: Symbol): List[Entity] = { - if (sym.info ne NoType) { + if (sym.info.exists) { val defs = sym.info.bounds.hi.finalResultType.membersBasedOnFlags(Flags.Method, Flags.Synthetic | Flags.Private) .filterNot(_.symbol.owner.name.show == "Any") .map { meth => @@ -62,7 +62,9 @@ class DocASTPhase extends Phase { ) }.toList - val vals = sym.info.fields.filterNot(_.symbol.is(Flags.Private | Flags.Synthetic)).map { value => + // don't add privates, synthetics or class parameters (i.e. value class constructor val) + val vals = sym.info.fields.filterNot(_.symbol.is(Flags.ParamAccessor | Flags.Private | Flags.Synthetic)).map { value => + println(value + " " + value.symbol.flags) val kind = if (value.symbol.is(Flags.Mutable)) "var" else "val" ValImpl( value.symbol, @@ -90,7 +92,7 @@ class DocASTPhase extends Phase { /** type alias */ case t: TypeDef if !t.isClassDef => val sym = t.symbol - TypeAliasImpl(sym, annotations(sym), flags(t), t.name.show, path(sym), None) + TypeAliasImpl(sym, annotations(sym), flags(t), t.name.show.split("\\$\\$").last, path(sym), None) /** trait */ case t @ TypeDef(n, rhs) if t.symbol.is(Flags.Trait) => diff --git a/doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala b/doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala index 0a8cff347..e991148d6 100644 --- a/doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala +++ b/doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala @@ -136,6 +136,7 @@ case class Site(val root: JFile, val projectTitle: String, val documentation: Ma def generateApiDocs(outDir: JFile = new JFile(root.getAbsolutePath + "/_site"))(implicit ctx: Context): this.type = createOutput(outDir) { def genDoc(e: model.Entity): Unit = { + /*dottydoc.*/println(s"Generating doc page for: ${e.path.mkString(".")}") // Suffix is index.html for packages and therefore the additional depth // is increased by 1 val (suffix, offset) = |