diff options
| author | Dmitry Jemerov <yole@jetbrains.com> | 2016-01-05 18:58:24 +0100 |
|---|---|---|
| committer | Dmitry Jemerov <yole@jetbrains.com> | 2016-01-05 18:58:24 +0100 |
| commit | b3ce9a8eed32523c3ef2ee1ce186434bd14a6e64 (patch) | |
| tree | 3981b083a92695b4c841808ce4c31e2aa491661a /core/src/main/kotlin/Kotlin | |
| parent | c59a3d8455ad45d679c47a387f854bdd81a01952 (diff) | |
| download | dokka-b3ce9a8eed32523c3ef2ee1ce186434bd14a6e64.tar.gz dokka-b3ce9a8eed32523c3ef2ee1ce186434bd14a6e64.tar.bz2 dokka-b3ce9a8eed32523c3ef2ee1ce186434bd14a6e64.zip | |
distinguish inherited companion object members
Diffstat (limited to 'core/src/main/kotlin/Kotlin')
| -rw-r--r-- | core/src/main/kotlin/Kotlin/DocumentationBuilder.kt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt b/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt index 3a35b764..a9701778 100644 --- a/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt +++ b/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt @@ -235,12 +235,13 @@ class DocumentationBuilder (!options.skipDeprecated || !isDeprecated()) } - fun DocumentationNode.appendMembers(descriptors: Iterable<DeclarationDescriptor>): List<DocumentationNode> { + fun DocumentationNode.appendMembers(descriptors: Iterable<DeclarationDescriptor>, + inheritedLinkKind: RefKind = RefKind.InheritedMember): List<DocumentationNode> { val nodes = descriptors.map { descriptor -> if (descriptor is CallableMemberDescriptor && descriptor.kind == CallableMemberDescriptor.Kind.FAKE_OVERRIDE) { val baseDescriptor = descriptor.overriddenDescriptors.firstOrNull() if (baseDescriptor != null) { - link(this, baseDescriptor, RefKind.InheritedMember) + link(this, baseDescriptor, inheritedLinkKind) } null } @@ -314,7 +315,7 @@ class DocumentationBuilder if (companionObjectDescriptor != null) { val descriptors = companionObjectDescriptor.defaultType.memberScope.getContributedDescriptors() val descriptorsToDocument = descriptors.filter { it !is CallableDescriptor || !it.isInheritedFromAny() } - node.appendMembers(descriptorsToDocument) + node.appendMembers(descriptorsToDocument, RefKind.InheritedCompanionObjectMember) } node.appendAnnotations(this) node.appendModifiers(this) |