diff options
| author | Vlad Ureche <vlad.ureche@gmail.com> | 2012-10-08 15:41:20 +0200 |
|---|---|---|
| committer | Vlad Ureche <vlad.ureche@gmail.com> | 2012-10-11 17:47:46 +0200 |
| commit | c6df7ddd0657ace307eaf6d6bf436cbb24e93df4 (patch) | |
| tree | 6154cc6e590372aa5d9c7e91b4f2e5898b553a48 /src/compiler | |
| parent | 90c7596c0736d56ff7b8d699bd958d28cb213bdf (diff) | |
| download | scala-c6df7ddd0657ace307eaf6d6bf436cbb24e93df4.tar.gz scala-c6df7ddd0657ace307eaf6d6bf436cbb24e93df4.tar.bz2 scala-c6df7ddd0657ace307eaf6d6bf436cbb24e93df4.zip | |
SI-6487 Scaladoc can link to inner classes
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/doc/model/MemberLookup.scala | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/model/MemberLookup.scala b/src/compiler/scala/tools/nsc/doc/model/MemberLookup.scala index 7ab73cceff..09020ae24a 100644 --- a/src/compiler/scala/tools/nsc/doc/model/MemberLookup.scala +++ b/src/compiler/scala/tools/nsc/doc/model/MemberLookup.scala @@ -120,10 +120,7 @@ trait MemberLookup { private object OnlyTerm extends SearchStrategy private def lookupInRootPackage(pos: Position, members: List[String]) = - if (members.length == 1) - lookupInTemplate(pos, members, EmptyPackage) ::: lookupInTemplate(pos, members, RootPackage) - else - lookupInTemplate(pos, members, RootPackage) + lookupInTemplate(pos, members, EmptyPackage) ::: lookupInTemplate(pos, members, RootPackage) private def createLinks(syms: List[(Symbol, Symbol)]): List[LinkTo] = syms.flatMap { case (sym, owner) => @@ -153,7 +150,7 @@ trait MemberLookup { case tplName::rest => def completeSearch(syms: List[Symbol]) = - syms filter {sym => sym.isPackage || sym.isClass || sym.isModule} flatMap (lookupInTemplate(pos, rest, _)) + syms flatMap (lookupInTemplate(pos, rest, _)) completeSearch(lookupInTemplate(pos, tplName, container, OnlyTerm)) match { case Nil => completeSearch(lookupInTemplate(pos, tplName, container, OnlyType)) |