diff options
| author | Simon Ogorodnik <sem-oro@yandex.ru> | 2016-12-14 17:30:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-14 17:30:08 +0300 |
| commit | 51f984c6249213dd11efd7a95a7f143442b544bd (patch) | |
| tree | 40d97e9609250f088574bfa0529684b7dc90d0e8 | |
| parent | f8246d9e65f37ca64c136479d430abc8446aed98 (diff) | |
| parent | 48167ef4c63e287868fc2a435de6822ede625df2 (diff) | |
| download | dokka-51f984c6249213dd11efd7a95a7f143442b544bd.tar.gz dokka-51f984c6249213dd11efd7a95a7f143442b544bd.tar.bz2 dokka-51f984c6249213dd11efd7a95a7f143442b544bd.zip | |
Merge pull request #126 from Kotlin/0.9.11/GH-90
Fix for #90
| -rw-r--r-- | core/src/main/kotlin/javadoc/docbase.kt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/src/main/kotlin/javadoc/docbase.kt b/core/src/main/kotlin/javadoc/docbase.kt index eafa216b..65b28a42 100644 --- a/core/src/main/kotlin/javadoc/docbase.kt +++ b/core/src/main/kotlin/javadoc/docbase.kt @@ -209,8 +209,12 @@ open class TypeAdapter(override val module: ModuleNodeAdapter, override val node override fun equals(other: Any?): Boolean = other is TypeAdapter && toString() == other.toString() } +class NotAnnotatedTypeAdapter(typeAdapter: AnnotatedTypeAdapter) : Type by typeAdapter { + override fun asAnnotatedType() = null +} + class AnnotatedTypeAdapter(module: ModuleNodeAdapter, node: DocumentationNode) : TypeAdapter(module, node), AnnotatedType { - override fun underlyingType(): Type? = this + override fun underlyingType(): Type? = NotAnnotatedTypeAdapter(this) override fun annotations(): Array<out AnnotationDesc> = nodeAnnotations(this).toTypedArray() } |