aboutsummaryrefslogtreecommitdiff
path: root/core/src/main/kotlin/javadoc
diff options
context:
space:
mode:
authorSimon Ogorodnik <Simon.Ogorodnik@jetbrains.com>2019-03-13 16:30:07 +0300
committerSimon Ogorodnik <Simon.Ogorodnik@jetbrains.com>2019-03-13 18:56:18 +0300
commit69eefa767ccf692297cbdb9dc44240a4fa67aa3c (patch)
treee3004b0e7549b1d2c5ec0613650ff274cc3c61b5 /core/src/main/kotlin/javadoc
parent730a56645ebac9bc8acde2f2179d86d330b584b0 (diff)
downloaddokka-69eefa767ccf692297cbdb9dc44240a4fa67aa3c.tar.gz
dokka-69eefa767ccf692297cbdb9dc44240a4fa67aa3c.tar.bz2
dokka-69eefa767ccf692297cbdb9dc44240a4fa67aa3c.zip
Fix nullability annotations in javadoc
#446 fixed
Diffstat (limited to 'core/src/main/kotlin/javadoc')
-rw-r--r--core/src/main/kotlin/javadoc/docbase.kt5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/src/main/kotlin/javadoc/docbase.kt b/core/src/main/kotlin/javadoc/docbase.kt
index fbf8c464..118b134a 100644
--- a/core/src/main/kotlin/javadoc/docbase.kt
+++ b/core/src/main/kotlin/javadoc/docbase.kt
@@ -114,7 +114,7 @@ class AnnotationTypeDocAdapter(module: ModuleNodeAdapter, node: DocumentationNod
}
class AnnotationDescAdapter(val module: ModuleNodeAdapter, val node: DocumentationNode) : AnnotationDesc {
- override fun annotationType(): AnnotationTypeDoc? = AnnotationTypeDocAdapter(module, node) // TODO ?????
+ override fun annotationType(): AnnotationTypeDoc? = AnnotationTypeDocAdapter(module, node.links.find { it.kind == NodeKind.AnnotationClass } ?: node) // TODO ?????
override fun isSynthesized(): Boolean = false
override fun elementValues(): Array<out AnnotationDesc.ElementValuePair>? = emptyArray() // TODO
}
@@ -411,6 +411,9 @@ open class ClassDocumentationNodeAdapter(module: ModuleNodeAdapter, val classNod
return classNode.simpleName()
}
+ override fun qualifiedName(): String? {
+ return super.qualifiedName()
+ }
override fun constructors(filter: Boolean): Array<out ConstructorDoc> = classNode.members(NodeKind.Constructor).map { ConstructorAdapter(module, it) }.toTypedArray()
override fun constructors(): Array<out ConstructorDoc> = constructors(true)
override fun importedPackages(): Array<out PackageDoc> = emptyArray()