aboutsummaryrefslogtreecommitdiff
path: root/core/testdata
diff options
context:
space:
mode:
authorDmitry Jemerov <yole@jetbrains.com>2016-01-05 18:58:24 +0100
committerDmitry Jemerov <yole@jetbrains.com>2016-01-05 18:58:24 +0100
commitb3ce9a8eed32523c3ef2ee1ce186434bd14a6e64 (patch)
tree3981b083a92695b4c841808ce4c31e2aa491661a /core/testdata
parentc59a3d8455ad45d679c47a387f854bdd81a01952 (diff)
downloaddokka-b3ce9a8eed32523c3ef2ee1ce186434bd14a6e64.tar.gz
dokka-b3ce9a8eed32523c3ef2ee1ce186434bd14a6e64.tar.bz2
dokka-b3ce9a8eed32523c3ef2ee1ce186434bd14a6e64.zip
distinguish inherited companion object members
Diffstat (limited to 'core/testdata')
-rw-r--r--core/testdata/format/inheritedCompanionObjectProperties.kt18
-rw-r--r--core/testdata/format/inheritedCompanionObjectProperties.md38
2 files changed, 56 insertions, 0 deletions
diff --git a/core/testdata/format/inheritedCompanionObjectProperties.kt b/core/testdata/format/inheritedCompanionObjectProperties.kt
new file mode 100644
index 00000000..74a3749c
--- /dev/null
+++ b/core/testdata/format/inheritedCompanionObjectProperties.kt
@@ -0,0 +1,18 @@
+open class A {
+ fun foo() {
+ }
+}
+
+open class B {
+ fun bar() {
+ }
+}
+
+class C : A {
+ fun xyzzy() {
+ }
+
+ companion object : B () {
+ fun shazam()
+ }
+}
diff --git a/core/testdata/format/inheritedCompanionObjectProperties.md b/core/testdata/format/inheritedCompanionObjectProperties.md
new file mode 100644
index 00000000..9ec24edb
--- /dev/null
+++ b/core/testdata/format/inheritedCompanionObjectProperties.md
@@ -0,0 +1,38 @@
+[test](test/index) / [C](test/-c/index)
+
+
+# C
+
+`class C&nbsp;:&nbsp;[A](test/-a/index)`
+
+
+
+### Constructors
+
+
+| [&lt;init&gt;](test/-c/-init-) | `C()` |
+
+
+### Functions
+
+
+| [xyzzy](test/-c/xyzzy) | `fun xyzzy(): Unit` |
+
+
+### Inherited Functions
+
+
+| [foo](test/-a/foo) | `fun foo(): Unit` |
+
+
+### Companion Object Functions
+
+
+| [shazam](test/-c/shazam) | `fun shazam(): Unit` |
+
+
+### Inherited Companion Object Functions
+
+
+| [bar](test/-b/bar) | `fun bar(): Unit` |
+