aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDmitry Jemerov <yole@jetbrains.com>2015-02-26 15:29:55 +0100
committerDmitry Jemerov <yole@jetbrains.com>2015-02-26 15:29:55 +0100
commit6459ec0493241336c9db8dc6d53abce17f3126cd (patch)
tree6a875ebf0e9da946c2c9640ffe9dc57da7db44fb /src
parent86a6db8d277f1cc8240d35f83bb6d2ead3b51e02 (diff)
downloaddokka-6459ec0493241336c9db8dc6d53abce17f3126cd.tar.gz
dokka-6459ec0493241336c9db8dc6d53abce17f3126cd.tar.bz2
dokka-6459ec0493241336c9db8dc6d53abce17f3126cd.zip
in a qualified name, when we've reached a class, resolve lower-level members in the member scope of the class, not in its outer scope (otherwise we sometimes show a wrong function in @sample instead of showing that it's unresolved)
Diffstat (limited to 'src')
-rw-r--r--src/Kotlin/ContentBuilder.kt5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/Kotlin/ContentBuilder.kt b/src/Kotlin/ContentBuilder.kt
index de5ac956..56d2a407 100644
--- a/src/Kotlin/ContentBuilder.kt
+++ b/src/Kotlin/ContentBuilder.kt
@@ -175,7 +175,10 @@ private fun DocumentationBuilder.resolveInScope(functionName: String, scope: Jet
symbol = null
break
}
- currentScope = getResolutionScope(session, partSymbol)
+ currentScope = if (partSymbol is ClassDescriptor)
+ partSymbol.getDefaultType().getMemberScope()
+ else
+ getResolutionScope(session, partSymbol)
symbol = partSymbol
}