Show members from supertypes in file structure view (KT-4448)

#KT-4448 Fixed
2014-05-26 16:48:45 +04:00
parent d941deb17c
commit f1f13d1f2a
19 changed files with 234 additions and 8 deletions
@@ -0,0 +1,6 @@
+open class A {
+    class I1
+    inner class I2
+
+    fun foo() {}
+}
@@ -0,0 +1,6 @@
+-InheritedInnerClasses.kt
+ -B : A
+  equals(Any?): Boolean
+  foo(): Unit
+  hashCode(): Int
+  toString(): String
@@ -0,0 +1,5 @@
+class B: A()
+
+// Inner classes are not shown, same to Java
+
+// WITH_INHERITED
@@ -0,0 +1,15 @@
+-InheritedJavaMembers.kt
+ -InheritedJavaMembers : Callable<String>
+  call(): String?
+  clone(): Any
+  equals(Any?): Boolean
+  finalize(): Unit
+  getClass(): Class<out Any?>
+  hashCode(): Int
+  notify(): Unit
+  notifyAll(): Unit
+  test(): Unit
+  toString(): String
+  wait(): Unit
+  wait(Long): Unit
+  wait(Long, Int): Unit
@@ -0,0 +1,8 @@
+import java.util.concurrent.Callable
+
+public abstract class InheritedJavaMembers() : Callable<String> {
+    fun test() {
+    }
+}
+
+// WITH_INHERITED
@@ -0,0 +1,8 @@
+-InheritedLocalKotlin.kt
+ -A : TA
+  equals(Any?): Boolean
+  hashCode(): Int
+  some(): Unit
+  toString(): String
+ -B : TA
+  some(): Unit
@@ -0,0 +1,12 @@
+trait TA {
+    fun some()
+}
+
+class A : TA {
+    override fun some() {
+    }
+}
+
+abstract class B : TA
+
+// WITH_INHERITED
@@ -1,2 +1,6 @@
 -InheritedMembers.kt
- Test
+ -Test
+  equals(Any?): Boolean
+  hashCode(): Int
+  test(): Unit
+  toString(): String
@@ -1,3 +1,7 @@
-class Test {
+class Test: Runable {
+    fun test() {

-}
+    }
+}
+
+// WITH_INHERITED
@@ -0,0 +1,7 @@
+trait First<T> {
+    fun foo(a: T)
+}
+
+trait Second<U> : First<Int> {
+    val a: U
+}
@@ -0,0 +1,7 @@
+-InheritedMembersWithSubstitutedTypes.kt
+ -Third : Second<String>
+  a: U
+  equals(Any?): Boolean
+  foo(T): Unit
+  hashCode(): Int
+  toString(): String
@@ -0,0 +1,5 @@
+trait Third: Second<String>
+
+// Original type names are shown in members, behaviour is same to Java.
+
+// WITH_INHERITED