diff options
| author | Andrea Falcone <asfalcone@google.com> | 2020-02-22 14:00:52 +0000 |
|---|---|---|
| committer | Tiem Song <tiem@google.com> | 2020-05-19 16:09:18 +0000 |
| commit | abe79ca25d44536aad6fa6657d4f610061554c88 (patch) | |
| tree | 460bae59010610b952d5a7f48302bbef2066ac62 | |
| parent | 1dc7f7577ecf9e15a825a3e7c6ba1d1b1df11cab (diff) | |
| download | dokka-abe79ca25d44536aad6fa6657d4f610061554c88.tar.gz | |
Revert "Include inherited methods in asJava documentation"
This reverts commit 9dfafb090560f9033bbddc9d848bec4cf568b2ed.
Reason for revert: Broke all of the downstream builds
Bug: 127327788
Test: N/A (cherry pick from master)
Change-Id: Id0db651313f35a1b476dda4cc786150a553e3255
Merged-In: Id0db651313f35a1b476dda4cc786150a553e3255
| -rw-r--r-- | core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt | 12 | ||||
| -rw-r--r-- | core/testdata/format/dac/inheritedMethods/dac-as-java/Child.html | 37 |
2 files changed, 1 insertions, 48 deletions
diff --git a/core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt b/core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt index 00422c89f..cc9c2c2bf 100644 --- a/core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt +++ b/core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt @@ -209,20 +209,10 @@ class JavaPsiDocumentationBuilder : JavaDocumentationBuilder { superTypes.filter { !ignoreSupertype(it) }.forEach { node.appendType(it, NodeKind.Supertype) val superClass = it.resolve() - // parentNode is the actual DocumentationNode of this class's supertype - // It is necessary to create documentation links back to the superclass from inherited methods - val parentNode = refGraph.lookup(it.typeSignature()) - if (superClass != null && parentNode != null) { + if (superClass != null) { link(superClass, node, RefKind.Inheritor) - // Explicitly add the methods of the superclass as nodes to this class - node.appendChildren(superClass.methods, RefKind.InheritedMember) { - val child = build() - child.addReferenceTo(parentNode, RefKind.Owner) - return@appendChildren child - } } } - var methodsAndConstructors = methods if (constructors.isEmpty()) { diff --git a/core/testdata/format/dac/inheritedMethods/dac-as-java/Child.html b/core/testdata/format/dac/inheritedMethods/dac-as-java/Child.html index 24e570829..a66d0bf6c 100644 --- a/core/testdata/format/dac/inheritedMethods/dac-as-java/Child.html +++ b/core/testdata/format/dac/inheritedMethods/dac-as-java/Child.html @@ -60,43 +60,6 @@ </tr> </tbody> </table> - <table class="responsive" id="inhmethods"> - <tbody> - <tr> - <th colSpan="2"> - <devsite-heading ds-is="heading" text="Inherited functions" id="inherited-functions" level="h3" toc="" class=""> - <h3 is-upgraded="">Inherited functions</h3> - </devsite-heading> - </th> - </tr> - <tr class="api apilevel-"> - <td colSpan="2"> - <div class="expandable jd-inherited-apis"><span class="expand-control exw-expanded">From class <code><a href="Parent.html#">Parent</a></code></span> - <table class="responsive exw-expanded-content"> - <tbody> - <tr class="api apilevel-" data-version-added="ApiLevel:"> - <td><code><span class="identifier">void</span></code></td> - <td width="100%"><code><a href="Parent.html#baz()">baz</a>()</code> - <p> - <p>Do a superclass baz</p> - </p> - </td> - </tr> - <tr class="api apilevel-" data-version-added="ApiLevel:"> - <td><code><span class="identifier">void</span></code></td> - <td width="100%"><code><a href="Parent.html#foo()">foo</a>()</code> - <p> - <p>Do a superclass foo</p> - </p> - </td> - </tr> - </tbody> - </table> - </div> - </td> - </tr> - </tbody> - </table> <h2>Public constructors</h2> <a name="Child()"></a> <div class="api apilevel-" data-version-added=""> |