IDE testdata: s/trait/interface

idea/testData/refactoring/extractFunction/basic/delegatingFunction.kt

@@ -1,6 +1,6 @@
 // PARAM_DESCRIPTOR: val t: <no name provided> defined in foo
 // PARAM_TYPES: T
-trait T {
+interface T {
     fun test() {}
 }
 

idea/testData/refactoring/extractFunction/basic/delegatingFunction.kt.after

@@ -1,6 +1,6 @@
 // PARAM_DESCRIPTOR: val t: <no name provided> defined in foo
 // PARAM_TYPES: T
-trait T {
+interface T {
     fun test() {}
 }
 

idea/testData/refactoring/extractFunction/basic/fakeOverride.kt

@@ -1,4 +1,4 @@
-trait T {
+interface T {
     fun test() {}
 }
 

idea/testData/refactoring/extractFunction/basic/fakeOverride.kt.after

@@ -1,4 +1,4 @@
-trait T {
+interface T {
     fun test() {}
 }
 

idea/testData/refactoring/extractFunction/basic/traitFunction.kt

@@ -1,4 +1,4 @@
-trait T{
+interface T{
     fun foo(): Int {
         return <selection>1</selection>
     }

idea/testData/refactoring/extractFunction/basic/traitFunction.kt.after

@@ -1,4 +1,4 @@
-trait T{
+interface T{
     fun foo(): Int {
         return i()
     }

idea/testData/refactoring/extractFunction/controlFlow/initializer/valueUsedInAnonymousObject.kt

@@ -6,6 +6,6 @@ fun main(args: Array<String>) {
     }
 }
 
-trait T {
+interface T {
     fun foo(n: Int): Int
 }

idea/testData/refactoring/extractFunction/controlFlow/initializer/valueUsedInAnonymousObject.kt.after

@@ -11,6 +11,6 @@ private fun i(): Int {
     return a
 }
 
-trait T {
+interface T {
     fun foo(n: Int): Int
 }

idea/testData/refactoring/extractFunction/controlFlow/unextractable/anonymousObject.kt

@@ -1,4 +1,4 @@
-trait Callable<T> {
+interface Callable<T> {
     fun call(): T
 }
 

idea/testData/refactoring/extractFunction/delegation/delegationByExpression.kt

@@ -2,7 +2,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in B.<init>
 // PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in B.<init>
-trait T
+interface T
 
 class A(a: Int, b: Int): T
 

idea/testData/refactoring/extractFunction/delegation/delegationByExpression.kt.after

@@ -2,7 +2,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in B.<init>
 // PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in B.<init>
-trait T
+interface T
 
 class A(a: Int, b: Int): T
 

idea/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt

@@ -1,6 +1,6 @@
 // PARAM_TYPES: T
 // PARAM_DESCRIPTOR: value-parameter val t: T defined in B.<init>
-trait T
+interface T
 
 class A(a: Int, b: Int): T
 

idea/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt.after

@@ -1,6 +1,6 @@
 // PARAM_TYPES: T
 // PARAM_DESCRIPTOR: value-parameter val t: T defined in B.<init>
-trait T
+interface T
 
 class A(a: Int, b: Int): T
 

idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy1.kt

@@ -1,6 +1,6 @@
 //PARAM_TYPES: C, AImpl, A
 //PARAM_DESCRIPTOR: value-parameter val c: C defined in foo
-trait A {
+interface A {
     fun doA()
 }
 
@@ -10,7 +10,7 @@ open class AImpl: A {
     }
 }
 
-trait B {
+interface B {
     fun doB()
 }
 

idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy1.kt.after

@@ -1,6 +1,6 @@
 //PARAM_TYPES: C, AImpl, A
 //PARAM_DESCRIPTOR: value-parameter val c: C defined in foo
-trait A {
+interface A {
     fun doA()
 }
 
@@ -10,7 +10,7 @@ open class AImpl: A {
     }
 }
 
-trait B {
+interface B {
     fun doB()
 }
 

idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy2.kt

@@ -1,6 +1,6 @@
 //PARAM_TYPES: C, B
 //PARAM_DESCRIPTOR: value-parameter val c: C defined in foo
-trait A {
+interface A {
     fun doA()
 }
 
@@ -10,7 +10,7 @@ open class AImpl: A {
     }
 }
 
-trait B {
+interface B {
     fun doB()
 }
 

idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy2.kt.after

@@ -1,6 +1,6 @@
 //PARAM_TYPES: C, B
 //PARAM_DESCRIPTOR: value-parameter val c: C defined in foo
-trait A {
+interface A {
     fun doA()
 }
 
@@ -10,7 +10,7 @@ open class AImpl: A {
     }
 }
 
-trait B {
+interface B {
     fun doB()
 }
 

idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy3.kt

@@ -1,6 +1,6 @@
 //PARAM_TYPES: C
 //PARAM_DESCRIPTOR: value-parameter val c: C defined in foo
-trait A {
+interface A {
     fun doA()
 }
 
@@ -10,7 +10,7 @@ open class AImpl: A {
     }
 }
 
-trait B {
+interface B {
     fun doB()
 }
 

idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy3.kt.after

@@ -1,6 +1,6 @@
 //PARAM_TYPES: C
 //PARAM_DESCRIPTOR: value-parameter val c: C defined in foo
-trait A {
+interface A {
     fun doA()
 }
 
@@ -10,7 +10,7 @@ open class AImpl: A {
     }
 }
 
-trait B {
+interface B {
     fun doB()
 }
 

idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy4.kt

@@ -1,6 +1,6 @@
 //PARAM_TYPES: C
 //PARAM_DESCRIPTOR: value-parameter val c: C defined in foo
-trait A {
+interface A {
     fun doA()
 }
 
@@ -10,7 +10,7 @@ open class AImpl: A {
     }
 }
 
-trait B {
+interface B {
     fun doB()
 }
 

idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy4.kt.after

@@ -1,6 +1,6 @@
 //PARAM_TYPES: C
 //PARAM_DESCRIPTOR: value-parameter val c: C defined in foo
-trait A {
+interface A {
     fun doA()
 }
 
@@ -10,7 +10,7 @@ open class AImpl: A {
     }
 }
 
-trait B {
+interface B {
     fun doB()
 }
 

idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/anonymousObject.kt

@@ -1,4 +1,4 @@
-trait T
+interface T
 
 fun foo(): T {
     return <selection>object: T() {}</selection>

idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/anonymousObject.kt.after

@@ -1,4 +1,4 @@
-trait T
+interface T
 
 fun foo(): T {
     return t()

idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/anonymousObjectWithCall.kt

@@ -1,4 +1,4 @@
-trait Callable<T> {
+interface Callable<T> {
     fun call(): T
 }
 

idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclass.kt

@@ -1,4 +1,4 @@
-trait T
+interface T
 
 fun foo(): T {
     class A: T

idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclass.kt.after

@@ -1,4 +1,4 @@
-trait T
+interface T
 
 fun foo(): T {
     class A: T

idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclassParameter.kt

@@ -1,6 +1,6 @@
 // PARAM_DESCRIPTOR: val a: foo.A defined in foo.bar
 // PARAM_TYPES: T
-trait T
+interface T
 
 // SIBLING:
 fun foo(): T {

idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclassParameter.kt.after

@@ -1,6 +1,6 @@
 // PARAM_DESCRIPTOR: val a: foo.A defined in foo.bar
 // PARAM_TYPES: T
-trait T
+interface T
 
 // SIBLING:
 fun foo(): T {

idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclassParameterInLocalFun.kt

@@ -1,6 +1,6 @@
 // PARAM_DESCRIPTOR: val a: foo.A defined in foo.bar
 // PARAM_TYPES: foo.A, T
-trait T
+interface T
 
 fun foo(): T {
     class A: T

idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclassParameterInLocalFun.kt.after

@@ -1,6 +1,6 @@
 // PARAM_DESCRIPTOR: val a: foo.A defined in foo.bar
 // PARAM_TYPES: foo.A, T
-trait T
+interface T
 
 fun foo(): T {
     class A: T

idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclassParameterNoApproximation.kt

@@ -1,4 +1,4 @@
-trait T
+interface T
 
 // SIBLING:
 fun foo(): T {

idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt

@@ -1,7 +1,7 @@
 // PARAM_TYPES: V
 // PARAM_DESCRIPTOR: value-parameter val v: V defined in foo
 open class Data(val x: Int)
-trait DataEx
+interface DataEx
 
 class Pair<A, B>(val a: A, val b: B)
 

idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt.after

@@ -1,7 +1,7 @@
 // PARAM_TYPES: V
 // PARAM_DESCRIPTOR: value-parameter val v: V defined in foo
 open class Data(val x: Int)
-trait DataEx
+interface DataEx
 
 class Pair<A, B>(val a: A, val b: B)
 

idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt

@@ -5,8 +5,8 @@
 // PARAM_DESCRIPTOR: internal final inner class B<U : Data> where U : DataExEx defined in A
 // PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo
 open class Data(val x: Int)
-trait DataEx
-trait DataExEx
+interface DataEx
+interface DataExEx
 
 // SIBLING:
 class A<T: Data>(val t: T) where T: DataEx {

idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after

@@ -5,8 +5,8 @@
 // PARAM_DESCRIPTOR: internal final inner class B<U : Data> where U : DataExEx defined in A
 // PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo
 open class Data(val x: Int)
-trait DataEx
-trait DataExEx
+interface DataEx
+interface DataExEx
 
 // SIBLING:
 class A<T: Data>(val t: T) where T: DataEx {

idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt

@@ -3,8 +3,8 @@
 // PARAM_DESCRIPTOR: internal final inner class B<U : Data> where U : DataExEx defined in A
 // PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo
 open class Data(val x: Int)
-trait DataEx
-trait DataExEx
+interface DataEx
+interface DataExEx
 
 class A<T: Data>(val t: T) where T: DataEx {
     // SIBLING:

idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt.after

@@ -3,8 +3,8 @@
 // PARAM_DESCRIPTOR: internal final inner class B<U : Data> where U : DataExEx defined in A
 // PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo
 open class Data(val x: Int)
-trait DataEx
-trait DataExEx
+interface DataEx
+interface DataExEx
 
 class A<T: Data>(val t: T) where T: DataEx {
     // SIBLING:

idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt

@@ -1,8 +1,8 @@
 // PARAM_TYPES: V, Data
 // PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo
 open class Data(val x: Int)
-trait DataEx
-trait DataExEx
+interface DataEx
+interface DataExEx
 
 class A<T: Data>(val t: T) where T: DataEx {
     inner class B<U: Data>(val u: U) where U: DataExEx {

idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt.after

@@ -1,8 +1,8 @@
 // PARAM_TYPES: V, Data
 // PARAM_DESCRIPTOR: value-parameter val v: V defined in A.B.foo
 open class Data(val x: Int)
-trait DataEx
-trait DataExEx
+interface DataEx
+interface DataExEx
 
 class A<T: Data>(val t: T) where T: DataEx {
     inner class B<U: Data>(val u: U) where U: DataExEx {

idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt

@@ -3,7 +3,7 @@
 // PARAM_DESCRIPTOR: internal final class A<T : Data> where T : DataEx defined in root package
 // PARAM_DESCRIPTOR: value-parameter val v: V defined in A.foo
 open class Data(val x: Int)
-trait DataEx
+interface DataEx
 
 // SIBLING:
 class A<T: Data>(val t: T) where T: DataEx {

idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after

@@ -3,7 +3,7 @@
 // PARAM_DESCRIPTOR: internal final class A<T : Data> where T : DataEx defined in root package
 // PARAM_DESCRIPTOR: value-parameter val v: V defined in A.foo
 open class Data(val x: Int)
-trait DataEx
+interface DataEx
 
 // SIBLING:
 class A<T: Data>(val t: T) where T: DataEx {