Skip to content

Commit 3428580

Browse files
committed
Fix dottydoc ast phase
1 parent 83c0c21 commit 3428580

File tree

3 files changed

+3
-14
lines changed

3 files changed

+3
-14
lines changed

compiler/test/dotc/scala-collections.blacklist

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,6 @@
4242
../scala-scala/src/library/scala/concurrent/package.scala
4343
# -Ycheck:arrayConstructors failure
4444

45-
46-
47-
48-
49-
## Errors involving dottydoc:
50-
51-
../scala-scala/src/library/scala/sys/SystemProperties.scala
52-
# Test dotty.tools.dottydoc.TestWhitelistedCollections.arrayHasDocumentation failed
53-
54-
55-
5645
## Errors having to do with unavailable APIs or language features:
5746

5847
../scala-scala/src/library/scala/reflect/ClassManifestDeprecatedApis.scala

compiler/test/dotc/scala-collections.whitelist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@
401401
../scala-scala/src/library/scala/compat/Platform.scala
402402

403403
../scala-scala/src/library/scala/sys/package.scala
404-
#../scala-scala/src/library/scala/sys/SystemProperties.scala
404+
../scala-scala/src/library/scala/sys/SystemProperties.scala
405405
../scala-scala/src/library/scala/sys/Prop.scala
406406
../scala-scala/src/library/scala/sys/PropImpl.scala
407407
../scala-scala/src/library/scala/sys/BooleanProp.scala

doc-tool/src/dotty/tools/dottydoc/core/DocASTPhase.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import dotc.CompilationUnit
88
import dotc.config.Printers.dottydoc
99
import dotc.core.Contexts.Context
1010
import dotc.core.Comments.ContextDocstrings
11-
import dotc.core.Types.NoType
11+
import dotc.core.Types._//NoType
1212
import dotc.core.Phases.Phase
1313
import dotc.core.Symbols.{ Symbol, NoSymbol }
1414

@@ -46,7 +46,7 @@ class DocASTPhase extends Phase {
4646

4747
def membersFromSymbol(sym: Symbol): List[Entity] = {
4848
if (sym.info ne NoType) {
49-
val defs = sym.info.bounds.hi.membersBasedOnFlags(Flags.Method, Flags.Synthetic | Flags.Private)
49+
val defs = sym.info.bounds.hi.finalResultType.membersBasedOnFlags(Flags.Method, Flags.Synthetic | Flags.Private)
5050
.filterNot(_.symbol.owner.name.show == "Any")
5151
.map { meth =>
5252
DefImpl(

0 commit comments

Comments
 (0)