Add an object defined inside a companion object to tests I believed this case was handled incorrectly, but it is actually handled correctly. Fixes: 394318786 Test: expands a test Change-Id: I48da6b7b610b678343e252b6393d176143a29526
diff --git a/testData/innerClasses/docs/reference/dokkatest/_toc.yaml b/testData/innerClasses/docs/reference/dokkatest/_toc.yaml index 2b64369..4e7ca32 100644 --- a/testData/innerClasses/docs/reference/dokkatest/_toc.yaml +++ b/testData/innerClasses/docs/reference/dokkatest/_toc.yaml
@@ -20,6 +20,10 @@ section: - title: "OuterClass" path: "/reference/dokkatest/inner/OuterClass.html" + - title: "OuterClass.Companion" + path: "/reference/dokkatest/inner/OuterClass.Companion.html" + - title: "OuterClass.Companion.InsideCompanionObject" + path: "/reference/dokkatest/inner/OuterClass.Companion.InsideCompanionObject.html" - title: "OuterClass.InnerClass" path: "/reference/dokkatest/inner/OuterClass.InnerClass.html" - title: "OuterClass.Leaf"
diff --git a/testData/innerClasses/docs/reference/dokkatest/classes.html b/testData/innerClasses/docs/reference/dokkatest/classes.html index 8e9ebec..871bcbd 100644 --- a/testData/innerClasses/docs/reference/dokkatest/classes.html +++ b/testData/innerClasses/docs/reference/dokkatest/classes.html
@@ -31,6 +31,14 @@ </td> </tr> <tr> + <td><code><a href="/reference/dokkatest/inner/OuterClass.Companion.html">OuterClass.Companion</a></code></td> + <td></td> + </tr> + <tr> + <td><code><a href="/reference/dokkatest/inner/OuterClass.Companion.InsideCompanionObject.html">OuterClass.Companion.InsideCompanionObject</a></code></td> + <td></td> + </tr> + <tr> <td><code><a href="/reference/dokkatest/inner/OuterClass.InnerClass.html">OuterClass.InnerClass</a></code></td> <td> <p>I collect the stones.</p>
diff --git a/testData/innerClasses/docs/reference/dokkatest/inner/OuterClass.Companion.InsideCompanionObject.html b/testData/innerClasses/docs/reference/dokkatest/inner/OuterClass.Companion.InsideCompanionObject.html new file mode 100644 index 0000000..381aa31 --- /dev/null +++ b/testData/innerClasses/docs/reference/dokkatest/inner/OuterClass.Companion.InsideCompanionObject.html
@@ -0,0 +1,59 @@ +<html devsite="true"> + <head> + <title>OuterClass.Companion.InsideCompanionObject</title> +{% setvar book_path %}/reference/dokkatest/_book.yaml{% endsetvar %} +{% include "_shared/_reference-head-tags.html" %} + </head> + <body> + <div itemscope="" itemtype="http://developers.google.com/ReferenceObject"> + <meta itemprop="name" content="OuterClass.Companion.InsideCompanionObject"> + <meta itemprop="path" content="dokkatest.inner"> + <meta itemprop="language" content="JAVA"> + </div> + <div id="header-block"> + <div> + <h1>OuterClass.Companion.InsideCompanionObject</h1> + </div> + </div> + +{% setvar page_path %}dokkatest/inner/OuterClass.Companion.InsideCompanionObject.html{% endsetvar %} +{% setvar can_switch %}1{% endsetvar %} +{% include "reference/_java_switcher2.md" %} + <p> + <pre>public final class <a href="/reference/dokkatest/inner/OuterClass.Companion.InsideCompanionObject.html">OuterClass.Companion.InsideCompanionObject</a></pre> + </p> + <hr> + <h2>Summary</h2> + <div class="devsite-table-wrapper"> + <table class="responsive"> + <colgroup> + <col width="40%"> + <col> + </colgroup> + <thead> + <tr> + <th colspan="100%"><h3>Public constructors</h3></th> + </tr> + </thead> + <tbody class="list"> + <tr> + <td> + <div><code><a href="/reference/dokkatest/inner/OuterClass.Companion.InsideCompanionObject.html#InsideCompanionObject()">InsideCompanionObject</a>()</code></div> + </td> + </tr> + </tbody> + </table> + </div> + <div class="list"> + <h2>Public constructors</h2> + <div class="api-item"><a name="InsideCompanionObject--"></a><a name="insidecompanionobject"></a> + <div class="api-name-block"> + <div> + <h3 id="InsideCompanionObject()">InsideCompanionObject</h3> + </div> + </div> + <pre class="api-signature no-pretty-print">public <a href="/reference/dokkatest/inner/OuterClass.Companion.InsideCompanionObject.html#InsideCompanionObject()">InsideCompanionObject</a>()</pre> + </div> + </div> + </body> +</html>
diff --git a/testData/innerClasses/docs/reference/dokkatest/inner/OuterClass.Companion.html b/testData/innerClasses/docs/reference/dokkatest/inner/OuterClass.Companion.html new file mode 100644 index 0000000..8068657 --- /dev/null +++ b/testData/innerClasses/docs/reference/dokkatest/inner/OuterClass.Companion.html
@@ -0,0 +1,48 @@ +<html devsite="true"> + <head> + <title>OuterClass.Companion</title> +{% setvar book_path %}/reference/dokkatest/_book.yaml{% endsetvar %} +{% include "_shared/_reference-head-tags.html" %} + </head> + <body> + <div itemscope="" itemtype="http://developers.google.com/ReferenceObject"> + <meta itemprop="name" content="OuterClass.Companion"> + <meta itemprop="path" content="dokkatest.inner"> + <meta itemprop="language" content="JAVA"> + </div> + <div id="header-block"> + <div> + <h1>OuterClass.Companion</h1> + </div> + </div> + +{% setvar page_path %}dokkatest/inner/OuterClass.Companion.html{% endsetvar %} +{% setvar can_switch %}1{% endsetvar %} +{% include "reference/_java_switcher2.md" %} + <p> + <pre>public static class <a href="/reference/dokkatest/inner/OuterClass.Companion.html">OuterClass.Companion</a></pre> + </p> + <hr> + <h2>Summary</h2> + <div class="devsite-table-wrapper"> + <table class="responsive"> + <colgroup> + <col width="40%"> + <col> + </colgroup> + <thead> + <tr> + <th colspan="100%"><h3>Nested types</h3></th> + </tr> + </thead> + <tbody class="list"> + <tr> + <td> + <div><code>public final class <a href="/reference/dokkatest/inner/OuterClass.Companion.InsideCompanionObject.html">OuterClass.Companion.InsideCompanionObject</a></code></div> + </td> + </tr> + </tbody> + </table> + </div> + </body> +</html>
diff --git a/testData/innerClasses/docs/reference/dokkatest/inner/OuterClass.html b/testData/innerClasses/docs/reference/dokkatest/inner/OuterClass.html index c0af859..ba19030 100644 --- a/testData/innerClasses/docs/reference/dokkatest/inner/OuterClass.html +++ b/testData/innerClasses/docs/reference/dokkatest/inner/OuterClass.html
@@ -84,6 +84,16 @@ <tbody class="list"> <tr> <td> + <div><code>public static class <a href="/reference/dokkatest/inner/OuterClass.Companion.html">OuterClass.Companion</a></code></div> + </td> + </tr> + <tr> + <td> + <div><code>public final class <a href="/reference/dokkatest/inner/OuterClass.Companion.InsideCompanionObject.html">OuterClass.Companion.InsideCompanionObject</a></code></div> + </td> + </tr> + <tr> + <td> <div><code>public class <a href="/reference/dokkatest/inner/OuterClass.InnerClass.html">OuterClass.InnerClass</a> extends <a href="/reference/dokkatest/inner/OuterClass.html">OuterClass</a> implements <a href="/reference/dokkatest/inner/OuterClass.InnerInterface.html">OuterClass.InnerInterface</a></code></div> <p>I collect the stones.</p> </td>
diff --git a/testData/innerClasses/docs/reference/dokkatest/inner/package-summary.html b/testData/innerClasses/docs/reference/dokkatest/inner/package-summary.html index aa8a50a..5d8c347 100644 --- a/testData/innerClasses/docs/reference/dokkatest/inner/package-summary.html +++ b/testData/innerClasses/docs/reference/dokkatest/inner/package-summary.html
@@ -9,10 +9,12 @@ <meta itemprop="name" content="dokkatest.inner"> <meta itemprop="property" content="InnerInterface"> <meta itemprop="property" content="OuterClass"> + <meta itemprop="property" content="InsideCompanionObject"> <meta itemprop="property" content="InnerClass"> <meta itemprop="property" content="Leaf"> <meta itemprop="property" content="InnerEnum"> <meta itemprop="property" content="Companion"> + <meta itemprop="property" content="Companion"> <meta itemprop="language" content="JAVA"> </div> <div id="header-block"> @@ -56,6 +58,10 @@ </td> </tr> <tr> + <td><code><a href="/reference/dokkatest/inner/OuterClass.Companion.InsideCompanionObject.html">OuterClass.Companion.InsideCompanionObject</a></code></td> + <td></td> + </tr> + <tr> <td><code><a href="/reference/dokkatest/inner/OuterClass.InnerClass.html">OuterClass.InnerClass</a></code></td> <td> <p>I collect the stones.</p> @@ -68,6 +74,10 @@ </td> </tr> <tr> + <td><code><a href="/reference/dokkatest/inner/OuterClass.Companion.html">OuterClass.Companion</a></code></td> + <td></td> + </tr> + <tr> <td><code><a href="/reference/dokkatest/inner/OuterClass.Leaf.Companion.html">OuterClass.Leaf.Companion</a></code></td> <td></td> </tr>
diff --git a/testData/innerClasses/docs/reference/kotlin/dokkatest/_toc.yaml b/testData/innerClasses/docs/reference/kotlin/dokkatest/_toc.yaml index 4eccb3a..4696d07 100644 --- a/testData/innerClasses/docs/reference/kotlin/dokkatest/_toc.yaml +++ b/testData/innerClasses/docs/reference/kotlin/dokkatest/_toc.yaml
@@ -20,6 +20,8 @@ section: - title: "OuterClass" path: "/reference/kotlin/dokkatest/inner/OuterClass.html" + - title: "OuterClass.Companion.InsideCompanionObject" + path: "/reference/kotlin/dokkatest/inner/OuterClass.Companion.InsideCompanionObject.html" - title: "OuterClass.InnerClass" path: "/reference/kotlin/dokkatest/inner/OuterClass.InnerClass.html" - title: "OuterClass.Leaf" @@ -30,3 +32,9 @@ section: - title: "OuterClass.InnerEnum" path: "/reference/kotlin/dokkatest/inner/OuterClass.InnerEnum.html" + + - title: "Objects" + + section: + - title: "OuterClass.Companion" + path: "/reference/kotlin/dokkatest/inner/OuterClass.Companion.html"
diff --git a/testData/innerClasses/docs/reference/kotlin/dokkatest/classes.html b/testData/innerClasses/docs/reference/kotlin/dokkatest/classes.html index e1fa794..16265ab 100644 --- a/testData/innerClasses/docs/reference/kotlin/dokkatest/classes.html +++ b/testData/innerClasses/docs/reference/kotlin/dokkatest/classes.html
@@ -31,6 +31,14 @@ </td> </tr> <tr> + <td><code><a href="/reference/kotlin/dokkatest/inner/OuterClass.Companion.html">OuterClass.Companion</a></code></td> + <td></td> + </tr> + <tr> + <td><code><a href="/reference/kotlin/dokkatest/inner/OuterClass.Companion.InsideCompanionObject.html">OuterClass.Companion.InsideCompanionObject</a></code></td> + <td></td> + </tr> + <tr> <td><code><a href="/reference/kotlin/dokkatest/inner/OuterClass.InnerClass.html">OuterClass.InnerClass</a></code></td> <td> <p>I collect the stones.</p>
diff --git a/testData/innerClasses/docs/reference/kotlin/dokkatest/inner/OuterClass.Companion.InsideCompanionObject.html b/testData/innerClasses/docs/reference/kotlin/dokkatest/inner/OuterClass.Companion.InsideCompanionObject.html new file mode 100644 index 0000000..9ea7d53 --- /dev/null +++ b/testData/innerClasses/docs/reference/kotlin/dokkatest/inner/OuterClass.Companion.InsideCompanionObject.html
@@ -0,0 +1,59 @@ +<html devsite="true"> + <head> + <title>OuterClass.Companion.InsideCompanionObject</title> +{% setvar book_path %}/reference/kotlin/dokkatest/_book.yaml{% endsetvar %} +{% include "_shared/_reference-head-tags.html" %} + </head> + <body> + <div itemscope="" itemtype="http://developers.google.com/ReferenceObject"> + <meta itemprop="name" content="OuterClass.Companion.InsideCompanionObject"> + <meta itemprop="path" content="dokkatest.inner"> + <meta itemprop="language" content="KOTLIN"> + </div> + <div id="header-block"> + <div> + <h1>OuterClass.Companion.InsideCompanionObject</h1> + </div> + </div> + +{% setvar page_path %}dokkatest/inner/OuterClass.Companion.InsideCompanionObject.html{% endsetvar %} +{% setvar can_switch %}1{% endsetvar %} +{% include "reference/_kotlin_switcher2.md" %} + <p> + <pre>class <a href="/reference/kotlin/dokkatest/inner/OuterClass.Companion.InsideCompanionObject.html">OuterClass.Companion.InsideCompanionObject</a></pre> + </p> + <hr> + <h2>Summary</h2> + <div class="devsite-table-wrapper"> + <table class="responsive"> + <colgroup> + <col width="40%"> + <col> + </colgroup> + <thead> + <tr> + <th colspan="100%"><h3>Public constructors</h3></th> + </tr> + </thead> + <tbody class="list"> + <tr> + <td> + <div><code><a href="/reference/kotlin/dokkatest/inner/OuterClass.Companion.InsideCompanionObject.html#InsideCompanionObject()">InsideCompanionObject</a>()</code></div> + </td> + </tr> + </tbody> + </table> + </div> + <div class="list"> + <h2>Public constructors</h2> + <div class="api-item"><a name="InsideCompanionObject--"></a><a name="insidecompanionobject"></a> + <div class="api-name-block"> + <div> + <h3 id="InsideCompanionObject()">InsideCompanionObject</h3> + </div> + </div> + <pre class="api-signature no-pretty-print"><a href="/reference/kotlin/dokkatest/inner/OuterClass.Companion.InsideCompanionObject.html#InsideCompanionObject()">InsideCompanionObject</a>()</pre> + </div> + </div> + </body> +</html>
diff --git a/testData/innerClasses/docs/reference/kotlin/dokkatest/inner/OuterClass.Companion.html b/testData/innerClasses/docs/reference/kotlin/dokkatest/inner/OuterClass.Companion.html new file mode 100644 index 0000000..262e3db --- /dev/null +++ b/testData/innerClasses/docs/reference/kotlin/dokkatest/inner/OuterClass.Companion.html
@@ -0,0 +1,48 @@ +<html devsite="true"> + <head> + <title>OuterClass.Companion</title> +{% setvar book_path %}/reference/kotlin/dokkatest/_book.yaml{% endsetvar %} +{% include "_shared/_reference-head-tags.html" %} + </head> + <body> + <div itemscope="" itemtype="http://developers.google.com/ReferenceObject"> + <meta itemprop="name" content="OuterClass.Companion"> + <meta itemprop="path" content="dokkatest.inner"> + <meta itemprop="language" content="KOTLIN"> + </div> + <div id="header-block"> + <div> + <h1>OuterClass.Companion</h1> + </div> + </div> + +{% setvar page_path %}dokkatest/inner/OuterClass.Companion.html{% endsetvar %} +{% setvar can_switch %}1{% endsetvar %} +{% include "reference/_kotlin_switcher2.md" %} + <p> + <pre>object <a href="/reference/kotlin/dokkatest/inner/OuterClass.Companion.html">OuterClass.Companion</a></pre> + </p> + <hr> + <h2>Summary</h2> + <div class="devsite-table-wrapper"> + <table class="responsive"> + <colgroup> + <col width="40%"> + <col> + </colgroup> + <thead> + <tr> + <th colspan="100%"><h3>Nested types</h3></th> + </tr> + </thead> + <tbody class="list"> + <tr> + <td> + <div><code>class <a href="/reference/kotlin/dokkatest/inner/OuterClass.Companion.InsideCompanionObject.html">OuterClass.Companion.InsideCompanionObject</a></code></div> + </td> + </tr> + </tbody> + </table> + </div> + </body> +</html>
diff --git a/testData/innerClasses/docs/reference/kotlin/dokkatest/inner/OuterClass.html b/testData/innerClasses/docs/reference/kotlin/dokkatest/inner/OuterClass.html index 5d2c6ab..c93b224 100644 --- a/testData/innerClasses/docs/reference/kotlin/dokkatest/inner/OuterClass.html +++ b/testData/innerClasses/docs/reference/kotlin/dokkatest/inner/OuterClass.html
@@ -84,6 +84,16 @@ <tbody class="list"> <tr> <td> + <div><code>object <a href="/reference/kotlin/dokkatest/inner/OuterClass.Companion.html">OuterClass.Companion</a></code></div> + </td> + </tr> + <tr> + <td> + <div><code>class <a href="/reference/kotlin/dokkatest/inner/OuterClass.Companion.InsideCompanionObject.html">OuterClass.Companion.InsideCompanionObject</a></code></div> + </td> + </tr> + <tr> + <td> <div><code>open class <a href="/reference/kotlin/dokkatest/inner/OuterClass.InnerClass.html">OuterClass.InnerClass</a> : <a href="/reference/kotlin/dokkatest/inner/OuterClass.html">OuterClass</a>, <a href="/reference/kotlin/dokkatest/inner/OuterClass.InnerInterface.html">OuterClass.InnerInterface</a></code></div> <p>I collect the stones.</p> </td>
diff --git a/testData/innerClasses/docs/reference/kotlin/dokkatest/inner/package-summary.html b/testData/innerClasses/docs/reference/kotlin/dokkatest/inner/package-summary.html index 4b6d402..4c0ce27 100644 --- a/testData/innerClasses/docs/reference/kotlin/dokkatest/inner/package-summary.html +++ b/testData/innerClasses/docs/reference/kotlin/dokkatest/inner/package-summary.html
@@ -9,9 +9,11 @@ <meta itemprop="name" content="dokkatest.inner"> <meta itemprop="property" content="InnerInterface"> <meta itemprop="property" content="OuterClass"> + <meta itemprop="property" content="InsideCompanionObject"> <meta itemprop="property" content="InnerClass"> <meta itemprop="property" content="Leaf"> <meta itemprop="property" content="InnerEnum"> + <meta itemprop="property" content="Companion"> <meta itemprop="language" content="KOTLIN"> </div> <div id="header-block"> @@ -55,6 +57,10 @@ </td> </tr> <tr> + <td><code><a href="/reference/kotlin/dokkatest/inner/OuterClass.Companion.InsideCompanionObject.html">OuterClass.Companion.InsideCompanionObject</a></code></td> + <td></td> + </tr> + <tr> <td><code><a href="/reference/kotlin/dokkatest/inner/OuterClass.InnerClass.html">OuterClass.InnerClass</a></code></td> <td> <p>I collect the stones.</p> @@ -69,6 +75,21 @@ </tbody> </table> </div> + <h2>Objects</h2> + <div class="devsite-table-wrapper"> + <table class="responsive"> + <colgroup> + <col width="40%"> + <col> + </colgroup> + <tbody class="list"> + <tr> + <td><code><a href="/reference/kotlin/dokkatest/inner/OuterClass.Companion.html">OuterClass.Companion</a></code></td> + <td></td> + </tr> + </tbody> + </table> + </div> <h2>Enums</h2> <div class="devsite-table-wrapper"> <table class="responsive">
diff --git a/testData/innerClasses/source/OuterClass.kt b/testData/innerClasses/source/OuterClass.kt index 02f8f55..8cfb148 100644 --- a/testData/innerClasses/source/OuterClass.kt +++ b/testData/innerClasses/source/OuterClass.kt
@@ -54,4 +54,7 @@ /** Third */ C } + companion object { + class InsideCompanionObject {} + } }