diff options
| author | Dmitry Jemerov <yole@jetbrains.com> | 2015-10-28 12:29:30 +0100 |
|---|---|---|
| committer | Dmitry Jemerov <yole@jetbrains.com> | 2015-10-29 11:57:22 +0100 |
| commit | ce82e3ef5d2bae1786d9e3fb1fa84d5fe6929fb6 (patch) | |
| tree | b9cb6fd31104724cdaff7dac2cc293e6831dbf57 /src/Kotlin | |
| parent | 47ccfb0937fa70d727a540d3d9a0bbbc6f1bfc6d (diff) | |
| download | dokka-ce82e3ef5d2bae1786d9e3fb1fa84d5fe6929fb6.tar.gz dokka-ce82e3ef5d2bae1786d9e3fb1fa84d5fe6929fb6.tar.bz2 dokka-ce82e3ef5d2bae1786d9e3fb1fa84d5fe6929fb6.zip | |
render 'reified' modifier for type parameter; fix typo re: rendering type parameter bounds
Diffstat (limited to 'src/Kotlin')
| -rw-r--r-- | src/Kotlin/DocumentationBuilder.kt | 6 | ||||
| -rw-r--r-- | src/Kotlin/KotlinLanguageService.kt | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/Kotlin/DocumentationBuilder.kt b/src/Kotlin/DocumentationBuilder.kt index 2ac5e1ec..4b148c39 100644 --- a/src/Kotlin/DocumentationBuilder.kt +++ b/src/Kotlin/DocumentationBuilder.kt @@ -629,10 +629,14 @@ class DocumentationBuilder(val resolutionFacade: ResolutionFacade, if (prefix != "") { node.appendTextNode(prefix, Kind.Modifier) } + if (isReified) { + node.appendTextNode("reified", Kind.Modifier) + } for (constraint in upperBounds) { - if (KotlinBuiltIns.isDefaultBound(constraint)) + if (KotlinBuiltIns.isDefaultBound(constraint)) { continue + } node.appendType(constraint, Kind.UpperBound) } diff --git a/src/Kotlin/KotlinLanguageService.kt b/src/Kotlin/KotlinLanguageService.kt index c08a6cbb..9b6386f8 100644 --- a/src/Kotlin/KotlinLanguageService.kt +++ b/src/Kotlin/KotlinLanguageService.kt @@ -6,7 +6,7 @@ import org.jetbrains.dokka.LanguageService.RenderMode * Implements [LanguageService] and provides rendering of symbols in Kotlin language */ class KotlinLanguageService : LanguageService { - private val fullOnlyModifiers = setOf("public", "protected", "private", "inline", "noinline", "crossinline") + private val fullOnlyModifiers = setOf("public", "protected", "private", "inline", "noinline", "crossinline", "reifiedß") override fun render(node: DocumentationNode, renderMode: RenderMode): ContentNode { return content { |