diff options
| author | Dmitry Jemerov <yole@jetbrains.com> | 2015-02-16 15:55:49 +0100 |
|---|---|---|
| committer | Dmitry Jemerov <yole@jetbrains.com> | 2015-02-16 15:55:49 +0100 |
| commit | 17e25efa87dc6eea3b1e098619a07a65f0b3f8e8 (patch) | |
| tree | e28deac3fbaeec8e9582c9b9ad95397826d38c7e /src | |
| parent | 107ef426ad6163d9a97177e6b8d51cd2291f6daf (diff) | |
| download | dokka-17e25efa87dc6eea3b1e098619a07a65f0b3f8e8.tar.gz dokka-17e25efa87dc6eea3b1e098619a07a65f0b3f8e8.tar.bz2 dokka-17e25efa87dc6eea3b1e098619a07a65f0b3f8e8.zip | |
represent java.lang.Object as 'Any'
Diffstat (limited to 'src')
| -rw-r--r-- | src/Java/JavaDocumentationBuilder.kt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/Java/JavaDocumentationBuilder.kt b/src/Java/JavaDocumentationBuilder.kt index f1a9c520..f3cc38f7 100644 --- a/src/Java/JavaDocumentationBuilder.kt +++ b/src/Java/JavaDocumentationBuilder.kt @@ -186,7 +186,10 @@ public class JavaDocumentationBuilder(private val options: DocumentationOptions) private fun mapTypeName(psiType: PsiType): String = when (psiType) { PsiType.VOID -> "Unit" is PsiPrimitiveType -> psiType.getCanonicalText().capitalize() - is PsiClassType -> psiType.getClassName() + is PsiClassType -> { + val psiClass = psiType.resolve() + if (psiClass?.getQualifiedName() == "java.lang.Object") "Any" else psiType.getClassName() + } is PsiEllipsisType -> mapTypeName(psiType.getComponentType()) is PsiArrayType -> "Array" else -> psiType.getCanonicalText() |