IDE testdata: s/trait/interface

2015-05-12 20:39:44 +02:00
parent 99cad4b43f
commit 625096466e
698 changed files with 1049 additions and 1049 deletions
@@ -1,4 +1,4 @@
-trait Hi {
+interface Hi {
    fun foo(): Int
 }

@@ -1,4 +1,4 @@
-trait <lineMarker></lineMarker>TestTrait {
+interface <lineMarker></lineMarker>TestTrait {
    fun <lineMarker></lineMarker>test()
 }

@@ -1,9 +1,9 @@
-trait <lineMarker></lineMarker>A {
+interface <lineMarker></lineMarker>A {
    fun <lineMarker></lineMarker>f() {
    }
 }

-trait <lineMarker></lineMarker>B : A
+interface <lineMarker></lineMarker>B : A

 open class <lineMarker></lineMarker>C(b : B) : B by b, A {
 }
@@ -1,9 +1,9 @@
-trait <lineMarker></lineMarker>A {
+interface <lineMarker></lineMarker>A {
    val <lineMarker></lineMarker>f: Int
        get() = 3
 }

-trait <lineMarker></lineMarker>B : A
+interface <lineMarker></lineMarker>B : A

 open class <lineMarker></lineMarker>C(b : B) : B by b, A {
 }
@@ -1,6 +1,6 @@
 package sample

-trait <lineMarker descr="*"></lineMarker>S<T> {
+interface <lineMarker descr="*"></lineMarker>S<T> {
    fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;sample.S2</body></html>"></lineMarker>foo(t: T): T

    val <lineMarker descr="<html><body>Is implemented in <br/>&nbsp;&nbsp;&nbsp;&nbsp;sample.S2</body></html>"></lineMarker>some: T? get
@@ -1,10 +1,10 @@
-trait <lineMarker></lineMarker>A {
+interface <lineMarker></lineMarker>A {
  fun <lineMarker></lineMarker>f() {}
 }

-trait <lineMarker></lineMarker>B : A
+interface <lineMarker></lineMarker>B : A

-trait <lineMarker></lineMarker>C : B, A
+interface <lineMarker></lineMarker>C : B, A

 class SomeClass() : C {
  override fun <lineMarker descr="Overrides function in 'A'"></lineMarker>f() {}
@@ -1,12 +1,12 @@
-trait <lineMarker></lineMarker>A {
+interface <lineMarker></lineMarker>A {
    fun <lineMarker></lineMarker><lineMarker></lineMarker>f() {}
 }

-trait <lineMarker></lineMarker>B : A {
+interface <lineMarker></lineMarker>B : A {
    override fun <lineMarker></lineMarker>f() {}
 }

-trait <lineMarker></lineMarker>C : B, A
+interface <lineMarker></lineMarker>C : B, A

 class SomeClass() : C {
    override fun <lineMarker descr="Overrides function in 'B'"></lineMarker>f() {}
@@ -1,11 +1,11 @@
-trait <lineMarker></lineMarker>A {
+interface <lineMarker></lineMarker>A {
    val <lineMarker></lineMarker>f: Int
        get() = 2
 }

-trait <lineMarker></lineMarker>B : A
+interface <lineMarker></lineMarker>B : A

-trait <lineMarker></lineMarker>C : B, A
+interface <lineMarker></lineMarker>C : B, A

 class SomeClass() : C {
    override val <lineMarker descr="Overrides property in 'A'"></lineMarker>f: Int = 4
@@ -1,4 +1,4 @@
-trait <lineMarker descr="*"></lineMarker>A {
+interface <lineMarker descr="*"></lineMarker>A {
    override fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;C</body></html>"><lineMarker descr="*"></lineMarker></lineMarker>toString() = "A"
 }

@@ -1,4 +1,4 @@
-trait <lineMarker descr="*"></lineMarker>A {
+interface <lineMarker descr="*"></lineMarker>A {
    fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;C</body></html>"></lineMarker>foo(): String = "A"

    // TODO: B shoudn't be mentioned
@@ -1,8 +1,8 @@
-trait <lineMarker></lineMarker>A1 {
+interface <lineMarker></lineMarker>A1 {
    fun <lineMarker></lineMarker>foo()
 }

-trait <lineMarker></lineMarker>B1 {
+interface <lineMarker></lineMarker>B1 {
    fun <lineMarker></lineMarker>foo()
 }

@@ -17,6 +17,6 @@ NavigateToSeveralSuperElements.kt
    fun <1>foo()
 }

-trait B1 {
+interface B1 {
    fun <2>foo()
 */
@@ -1,8 +1,8 @@
-trait <lineMarker descr="*"></lineMarker>SkipSupport {
+interface <lineMarker descr="*"></lineMarker>SkipSupport {
    fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportWithDefaults</body></html>"></lineMarker>skip()
 }

-public trait <lineMarker descr="*"></lineMarker>SkipSupportWithDefaults : SkipSupport {
+public interface <lineMarker descr="*"></lineMarker>SkipSupportWithDefaults : SkipSupport {
    override fun <lineMarker descr="Implements function in 'SkipSupport'"></lineMarker>skip() {}
 }

@@ -1,4 +1,4 @@
-trait <lineMarker descr="*"></lineMarker>A {
+interface <lineMarker descr="*"></lineMarker>A {
    fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;B</body></html>"></lineMarker>foo(str: String)
    fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;B</body></html>"></lineMarker>foo()
 }
@@ -1,9 +1,9 @@
-trait <lineMarker descr="*"></lineMarker>SkipSupport {
+interface <lineMarker descr="*"></lineMarker>SkipSupport {
    fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportImpl<br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportWithDefaults</body></html>"></lineMarker>skip(why: String)
    fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportWithDefaults</body></html>"></lineMarker>skip()
 }

-public trait <lineMarker descr="*"></lineMarker>SkipSupportWithDefaults : SkipSupport {
+public interface <lineMarker descr="*"></lineMarker>SkipSupportWithDefaults : SkipSupport {
    // TODO: should be "Is overriden in SkipSupportImpl"
    override fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportImpl</body></html>"><lineMarker descr="Implements function in 'SkipSupport'"></lineMarker></lineMarker>skip(why: String) {}

@@ -1,5 +1,5 @@
 // TODO: Declarations have no implementation and should be considered as "overloaded"
-trait <lineMarker descr="*"></lineMarker>First {
+interface <lineMarker descr="*"></lineMarker>First {
    val <lineMarker descr="<html><body>Is implemented in <br/>&nbsp;&nbsp;&nbsp;&nbsp;Second</body></html>"></lineMarker>some: Int
    var <lineMarker descr="<html><body>Is implemented in <br/>&nbsp;&nbsp;&nbsp;&nbsp;Second</body></html>"></lineMarker>other: String
        get
@@ -8,7 +8,7 @@ trait <lineMarker descr="*"></lineMarker>First {
    fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;Second</body></html>"></lineMarker>foo()
 }

-trait Second : First {
+interface Second : First {
    override val <lineMarker descr="Overrides property in 'First'"></lineMarker>some: Int
    override var <lineMarker descr="Overrides property in 'First'"></lineMarker>other: String
    override fun <lineMarker descr="Overrides function in 'First'"></lineMarker>foo()
@@ -1,12 +1,12 @@
-trait <lineMarker descr="*"></lineMarker>SkipSupport {
+interface <lineMarker descr="*"></lineMarker>SkipSupport {
    fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportImpl1<br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportWithDefaults</body></html>"></lineMarker>skip()
 }

-public trait <lineMarker descr="*"></lineMarker>SkipSupportWithDefaults : SkipSupport {
+public interface <lineMarker descr="*"></lineMarker>SkipSupportWithDefaults : SkipSupport {
    override fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportImpl1</body></html>"><lineMarker descr="Implements function in 'SkipSupport'"></lineMarker></lineMarker>skip() {}
 }

-public trait SkipSupportImpl1 : SkipSupportWithDefaults {
+public interface SkipSupportImpl1 : SkipSupportWithDefaults {
    override fun <lineMarker descr="Overrides function in 'SkipSupportWithDefaults'"></lineMarker>skip() {}
 }

@@ -1,4 +1,4 @@
-public trait Foo {
+public interface Foo {
    override fun <lineMarker descr="Overrides function in 'Any'"></lineMarker>toString() = "str"
 }

@@ -1,4 +1,4 @@
-trait <lineMarker></lineMarker>A {
+interface <lineMarker></lineMarker>A {
  fun <lineMarker></lineMarker>a(){
  }
 }