diff options
| author | Dmitry Jemerov <yole@jetbrains.com> | 2015-02-26 16:44:09 +0100 |
|---|---|---|
| committer | Dmitry Jemerov <yole@jetbrains.com> | 2015-02-26 16:44:09 +0100 |
| commit | 9829559af837927b25c8dcc207e58806fab7832f (patch) | |
| tree | e47cbc6787f4a7eb821a8e8219e457d8ac854abb | |
| parent | 722c9afcdf43e27ae82b30f8b21a6d0f967a7ee2 (diff) | |
| download | dokka-9829559af837927b25c8dcc207e58806fab7832f.tar.gz dokka-9829559af837927b25c8dcc207e58806fab7832f.tar.bz2 dokka-9829559af837927b25c8dcc207e58806fab7832f.zip | |
don't show java.lang.Object in the list of Java class supertypes
| -rw-r--r-- | src/Java/JavaDocumentationBuilder.kt | 14 | ||||
| -rw-r--r-- | test/data/format/javaLinkTag.html | 2 | ||||
| -rw-r--r-- | test/data/format/javaSeeTag.html | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/src/Java/JavaDocumentationBuilder.kt b/src/Java/JavaDocumentationBuilder.kt index a7016ae6..4652500e 100644 --- a/src/Java/JavaDocumentationBuilder.kt +++ b/src/Java/JavaDocumentationBuilder.kt @@ -203,12 +203,14 @@ public class JavaDocumentationBuilder(private val options: DocumentationOptions, return node } - fun ignoreSupertype(psiType: PsiClassType): Boolean { - if (psiType.getClassName() == "Enum") { - val psiClass = psiType.resolve() - if (psiClass?.getQualifiedName() == "java.lang.Enum") { - return true - } + fun ignoreSupertype(psiType: PsiClassType): Boolean = + psiType.isClass("java.lang.Enum") || psiType.isClass("java.lang.Object") + + fun PsiClassType.isClass(qName: String): Boolean { + val shortName = qName.substringAfterLast('.') + if (getClassName() == shortName) { + val psiClass = resolve() + return psiClass?.getQualifiedName() == qName } return false } diff --git a/test/data/format/javaLinkTag.html b/test/data/format/javaLinkTag.html index 1a22a719..e5d5b01d 100644 --- a/test/data/format/javaLinkTag.html +++ b/test/data/format/javaLinkTag.html @@ -6,7 +6,7 @@ <a href="test/index">test</a> / <a href="test/test/index">test</a> / <a href="test/test/-foo/index">Foo</a><br/> <br/> <h1>Foo</h1> -<code><span class="keyword">open</span> <span class="keyword">class </span><span class="identifier">Foo</span> <span class="symbol">:</span> <span class="identifier">Any</span></code><br/> +<code><span class="keyword">open</span> <span class="keyword">class </span><span class="identifier">Foo</span></code><br/> <p>Call <a href="test/test/-foo/bar">#bar()</a> to do the job. </p> <br/> diff --git a/test/data/format/javaSeeTag.html b/test/data/format/javaSeeTag.html index 0e4fb9a9..c1ebb740 100644 --- a/test/data/format/javaSeeTag.html +++ b/test/data/format/javaSeeTag.html @@ -6,7 +6,7 @@ <a href="test/index">test</a> / <a href="test/test/index">test</a> / <a href="test/test/-foo/index">Foo</a><br/> <br/> <h1>Foo</h1> -<code><span class="keyword">open</span> <span class="keyword">class </span><span class="identifier">Foo</span> <span class="symbol">:</span> <span class="identifier">Any</span></code><br/> +<code><span class="keyword">open</span> <span class="keyword">class </span><span class="identifier">Foo</span></code><br/> <p></p> <strong>See Also</strong><br/> <a href="test/test/-foo/bar">#bar</a><br/> |