IDE testdata: s/trait/interface

idea/resources/liveTemplates/Kotlin.xml

@@ -114,7 +114,7 @@
     </template>
 
     <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.interface"
-              name="interface" toReformat="true" toShortenFQNames="true" value="trait $NAME$ {&#10;$END$&#10;}">
+              name="interface" toReformat="true" toShortenFQNames="true" value="interface $NAME$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
         <context>
             <option name="KOTLIN_STATEMENT" value="true"/>

idea/testData/addImport/StdlibImportsLast.dependency.kt

@@ -1,3 +1,3 @@
 package xxx
 
-trait Dependency
+interface Dependency

idea/testData/checker/Abstract.kt

@@ -62,7 +62,7 @@ abstract class MyAbstractClass() {
     <error>abstract</error> fun j() {}
 }
 
-trait MyTrait {
+interface MyTrait {
     //properties
 
     val a: Int

idea/testData/checker/AnonymousInitializers.kt

@@ -1,4 +1,4 @@
-trait NoC {
+interface NoC {
   <error>init {
 
   }</error>

idea/testData/checker/Builders.kt

@@ -2,11 +2,11 @@ package html
 
 import java.util.*
 
-  trait Factory<T> {
+  interface Factory<T> {
     fun create() : T
   }
 
-  trait Element
+  interface Element
 
   class TextElement(val text : String) : Element
 

idea/testData/checker/CyclicHierarchy.kt

@@ -1,13 +1,13 @@
-trait A {
+interface A {
     fun foo() {}
 }
-trait B : A, <error>E</error> {}
+interface B : A, <error>E</error> {}
-trait C : <error>B</error> {}
+interface C : <error>B</error> {}
-trait D : <error>B</error> {}
+interface D : <error>B</error> {}
-trait E : <error>F</error> {}
+interface E : <error>F</error> {}
-trait F : <error>D</error>, <error>C</error> {}
+interface F : <error>D</error>, <error>C</error> {}
-trait G : F {}
+interface G : F {}
-trait H : F {}
+interface H : F {}
 
 val a : A? = null
 val b : B? = null

idea/testData/checker/GenericArgumentConsistency.kt

@@ -1,42 +1,42 @@
-trait A<in T> {}
+interface A<in T> {}
-trait B<T> : A<Int> {}
+interface B<T> : A<Int> {}
-trait C<T> : <error>B<T>, A<T></error> {}
+interface C<T> : <error>B<T>, A<T></error> {}
-trait C1<T> : <error>B<T>, A<Any></error> {}
+interface C1<T> : <error>B<T>, A<Any></error> {}
-trait D : <error><error>C<Boolean>, B<Double></error></error>{}
+interface D : <error><error>C<Boolean>, B<Double></error></error>{}
 
-trait A1<out T> {}
+interface A1<out T> {}
-trait B1 : A1<Int> {}
+interface B1 : A1<Int> {}
-trait B2 : <error>A1<Any>, B1</error> {}
+interface B2 : <error>A1<Any>, B1</error> {}
 
-trait BA1<T> {}
+interface BA1<T> {}
-trait BB1 : BA1<Int> {}
+interface BB1 : BA1<Int> {}
-trait BB2 : <error>BA1<Any>, BB1</error> {}
+interface BB2 : <error>BA1<Any>, BB1</error> {}
 
 
 //package x {
-    trait xAA1<out T> {}
+    interface xAA1<out T> {}
-    trait xAB1 : xAA1<Int> {}
+    interface xAB1 : xAA1<Int> {}
-    trait xAB3 : xAA1<Comparable<Int>> {}
+    interface xAB3 : xAA1<Comparable<Int>> {}
-    trait xAB2 : <error>xAA1<Number>, xAB1, xAB3</error> {}
+    interface xAB2 : <error>xAA1<Number>, xAB1, xAB3</error> {}
 //}
 
 //package x2 {
-    trait x2AA1<out T> {}
+    interface x2AA1<out T> {}
-    trait x2AB1 : x2AA1<Any> {}
+    interface x2AB1 : x2AA1<Any> {}
-    trait x2AB3 : x2AA1<Comparable<Int>> {}
+    interface x2AB3 : x2AA1<Comparable<Int>> {}
-    trait x2AB2 : <error>x2AA1<Number>, x2AB1, x2AB3</error> {}
+    interface x2AB2 : <error>x2AA1<Number>, x2AB1, x2AB3</error> {}
 //}
 
 //package x3 {
-    trait x3AA1<in T> {}
+    interface x3AA1<in T> {}
-    trait x3AB1 : x3AA1<Any> {}
+    interface x3AB1 : x3AA1<Any> {}
-    trait x3AB3 : x3AA1<Comparable<Int>> {}
+    interface x3AB3 : x3AA1<Comparable<Int>> {}
-    trait x3AB2 : <error>x3AA1<Number>, x3AB1, x3AB3</error> {}
+    interface x3AB2 : <error>x3AA1<Number>, x3AB1, x3AB3</error> {}
 //}
 
 //package sx2 {
-    trait sx2AA1<in T> {}
+    interface sx2AA1<in T> {}
-    trait sx2AB1 : sx2AA1<Int> {}
+    interface sx2AB1 : sx2AA1<Int> {}
-    trait sx2AB3 : sx2AA1<Comparable<Int>> {}
+    interface sx2AB3 : sx2AA1<Comparable<Int>> {}
-    trait sx2AB2 : <error>sx2AA1<Number>, sx2AB1, sx2AB3</error> {}
+    interface sx2AB2 : <error>sx2AA1<Number>, sx2AB1, sx2AB3</error> {}
 //}

idea/testData/checker/MultipleBounds.kt

@@ -4,7 +4,7 @@ open class A() {
   fun foo() : Int = 1
 }
 
-trait B {
+interface B {
   fun bar() : Double = 1.0;
 }
 

idea/testData/checker/Override.kt

@@ -1,6 +1,6 @@
 package override
 
-    trait MyTrait {
+    interface MyTrait {
         fun foo()
     }
 

idea/testData/checker/OverridesAndGenerics.kt

@@ -1,4 +1,4 @@
-    trait MyTrait<T> {
+    interface MyTrait<T> {
         fun foo(t: T) : T
     }
 

idea/testData/checker/PlatformStaticUsagesRuntime.kt

@@ -30,7 +30,7 @@ class <error descr="[PLATFORM_STATIC_ILLEGAL_USAGE] This declaration does not su
 }
 
 platformStatic
-trait <error descr="[PLATFORM_STATIC_ILLEGAL_USAGE] This declaration does not support 'platformStatic'">B</error> {
+interface <error descr="[PLATFORM_STATIC_ILLEGAL_USAGE] This declaration does not support 'platformStatic'">B</error> {
     companion object {
         <error descr="[PLATFORM_STATIC_NOT_IN_OBJECT] Only functions in named objects and companion objects of classes can be annotated with 'platformStatic'">platformStatic fun a1()</error> {
 

idea/testData/checker/ProjectionsInSupertypes.kt

@@ -1,6 +1,6 @@
-trait A<T> {}
+interface A<T> {}
-trait B<T> {}
+interface B<T> {}
-trait C<T> {}
+interface C<T> {}
-trait D<T> {}
+interface D<T> {}
 
-trait Test : A<<error>in</error> Int>, B<<error>out</error> Int>, C<<error>*</error>><error>?</error><warning>?</warning><warning>?</warning>, D<Int> {}
+interface Test : A<<error>in</error> Int>, B<<error>out</error> Int>, C<<error>*</error>><error>?</error><warning>?</warning><warning>?</warning>, D<Int> {}

idea/testData/checker/SupertypeListChecks.kt

@@ -4,7 +4,7 @@
 In a supertype list:
  Same type should not be mentioned twice
  Same type should not be indirectly mentioned with incoherent type arguments
- Every trait's required dependencies should be satisfied
+ Every interface's required dependencies should be satisfied
  No final types should appear
  Only one class is allowed
 */
@@ -17,24 +17,24 @@ open class C2 {}
 
 open class C3 {}
 
-trait T1 {}
+interface T1 {}
 
-trait T2<T> {}
+interface T2<T> {}
 
-trait Test<error>()</error> {
+interface Test<error>()</error> {
 }
 
-trait Test1 : <warning>C2</warning><error>()</error> {}
+interface Test1 : <warning>C2</warning><error>()</error> {}
 
-trait Test2 : <warning>C2</warning> {}
+interface Test2 : <warning>C2</warning> {}
 
-trait Test3 : <warning>C2</warning>, <error>C3</error> {}
+interface Test3 : <warning>C2</warning>, <error>C3</error> {}
 
-trait Test4 : T1 {}
+interface Test4 : T1 {}
 
-trait Test5 : T1, <error>T1</error> {}
+interface Test5 : T1, <error>T1</error> {}
 
-trait Test6 : <error>C1</error> {}
+interface Test6 : <error>C1</error> {}
 
 class CTest1() : OC1() {}
 

idea/testData/checker/TraitSupertypeList.kt

@@ -1,9 +1,9 @@
 open class bar()
 
-trait Foo<error>()</error> : <warning>bar</warning><error>()</error>, <error><error>bar</error></error>, <error><error>bar</error></error> {
+interface Foo<error>()</error> : <warning>bar</warning><error>()</error>, <error><error>bar</error></error>, <error><error>bar</error></error> {
 }
 
-trait Foo2 : <warning>bar</warning>, Foo {
+interface Foo2 : <warning>bar</warning>, Foo {
 }
 
 open class Foo1() : bar(), <error>bar</error>, Foo, <error>Foo</error><error>()</error> {}

idea/testData/checker/duplicateJvmSignature/functionAndProperty/trait.kt

@@ -1,4 +1,4 @@
-trait T {
+interface T {
     <error descr="[CONFLICTING_JVM_DECLARATIONS] Platform declaration clash: The following declarations have the same JVM signature (foo(Ljava/util/List;)V):
     fun foo(l: kotlin.List<kotlin.String>): kotlin.Unit
     fun foo(l: kotlin.List<kotlin.Int>): kotlin.Unit">fun foo(l: List<String>)</error> {}

idea/testData/checker/duplicateJvmSignature/traitImpl/twoTraits.kt

@@ -1,8 +1,8 @@
-trait T1 {
+interface T1 {
     fun getX() = 1
 }
 
-trait T2 {
+interface T2 {
     val x: Int
         get() = 1
 }

idea/testData/checker/infos/CapturedConstructorParameter.kt

@@ -1,4 +1,4 @@
-trait T
+interface T
 class T1(<warning>t</warning>: Int): T
 
 inline fun <T> run(f: () -> T) = f()

idea/testData/checker/infos/SmartCastsWithSafeAccess.kt

@@ -1,14 +1,14 @@
-trait A {
+interface A {
     fun foo()
 }
 
-trait B : A {
+interface B : A {
     fun bar()
 }
 
-trait C
+interface C
 
-trait D : A
+interface D : A
 
 fun test(a: A?) {
     if (a != null && a is B?) {

idea/testData/checker/recovery/namelessToplevelDeclarations.kt

@@ -11,7 +11,7 @@ class<error> </error>{
 
 }
 
-trait<error> </error>{
+interface<error> </error>{
 
 }
 

idea/testData/checker/regression/extensionMemberInClassObject.kt

@@ -1,4 +1,4 @@
-trait Bar {
+interface Bar {
     fun <T> T.bar() {}
 }
 

idea/testData/checker/unmetTraitRequirements.kt

@@ -1,7 +1,7 @@
 open class Base {
 }
 
-trait Derived: <warning>Base</warning> {
+interface Derived: <warning>Base</warning> {
     fun foo() {
         f1(this@Derived)
     }

idea/testData/codeInsight/lineMarker/overrideImplement/BadCodeNoExceptions.kt

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

idea/testData/codeInsight/lineMarker/overrideImplement/ClassObjectInStaticNestedClass.kt

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

idea/testData/codeInsight/lineMarker/overrideImplement/DelegatedFun.kt

@@ -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 {
 }

idea/testData/codeInsight/lineMarker/overrideImplement/DelegatedProperty.kt

@@ -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 {
 }

idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideForClasses.kt

@@ -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

idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideFun.kt

@@ -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() {}

idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideFunWithMostRelevantImplementation.kt

@@ -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() {}

idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideProperty.kt

@@ -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

idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideToStringInTrait.kt

@@ -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"
 }
 

idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverridesForTraitFunWithImpl.kt

@@ -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

idea/testData/codeInsight/lineMarker/overrideImplement/NavigateToSeveralSuperElements.kt

@@ -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()
 */

idea/testData/codeInsight/lineMarker/overrideImplement/NoOverridingMarkerOnDefaultTraitImpl.kt

@@ -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() {}
 }
 

idea/testData/codeInsight/lineMarker/overrideImplement/Overloads.kt

@@ -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()
 }

idea/testData/codeInsight/lineMarker/overrideImplement/OverrideIconForOverloadMethodBug.kt

@@ -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) {}
 

idea/testData/codeInsight/lineMarker/overrideImplement/OverridenTraitDeclarations.kt

@@ -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()

idea/testData/codeInsight/lineMarker/overrideImplement/OverridingTooltipOnDefaultTraitImpl.kt

@@ -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() {}
 }
 

idea/testData/codeInsight/lineMarker/overrideImplement/ToStringInTrait.kt

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

idea/testData/codeInsight/lineMarker/overrideImplement/Trait.kt

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

idea/testData/codeInsight/outOfBlock/InFunInPropertyInObjectLiteral.kt

@@ -1,5 +1,5 @@
 // FALSE
-trait Some
+interface Some
 
 fun test() {
     val foo = object: Some {

idea/testData/codeInsight/outOfBlock/InFunObjectLiteral.kt

@@ -1,5 +1,5 @@
 // FALSE
-trait Some
+interface Some
 
 fun test() {
     object : Some {

idea/testData/codeInsight/outOfBlock/PropNotNullType_Initializer_ObjectLiteral_Fun.kt

@@ -1,7 +1,7 @@
 // TRUE
 
 // Problem with lazy initialization of nullable properties
-trait Some
+interface Some
 
 val test: Some = object: Some {
     fun test() {

idea/testData/codeInsight/outOfBlock/PropNullType_Initializer_ObjectLiteral_Fun.kt

@@ -1,7 +1,7 @@
 // TRUE
 
 // Problem with lazy initialization of nullable properties
-trait Some
+interface Some
 
 val test: Some? = object: Some {
     fun test() {

idea/testData/codeInsight/overrideImplement/defaultValues.kt

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

idea/testData/codeInsight/overrideImplement/defaultValues.kt.after

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

idea/testData/codeInsight/overrideImplement/delegatedMembers.kt

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

idea/testData/codeInsight/overrideImplement/delegatedMembers.kt.after

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

idea/testData/codeInsight/overrideImplement/emptyClassBodyFunctionMethod.kt

@@ -1,5 +1,5 @@
 // From KT-1254
-trait T {
+interface T {
     fun Foo() : (String) -> Unit
 }
 

idea/testData/codeInsight/overrideImplement/emptyClassBodyFunctionMethod.kt.after

@@ -1,5 +1,5 @@
 // From KT-1254
-trait T {
+interface T {
     fun Foo() : (String) -> Unit
 }
 

idea/testData/codeInsight/overrideImplement/functionFromTraitInJava/foo/KotlinTrait.kt

@@ -1,6 +1,6 @@
 package foo
 
-trait KotlinTrait {
+interface KotlinTrait {
     fun bar(price : String?)
 }
 

idea/testData/codeInsight/overrideImplement/functionMethod.kt

@@ -1,5 +1,5 @@
 // From KT-1254
-trait T {
+interface T {
     fun Foo() : (String) -> Unit
 }
 

idea/testData/codeInsight/overrideImplement/functionMethod.kt.after

@@ -1,5 +1,5 @@
 // From KT-1254
-trait T {
+interface T {
     fun Foo() : (String) -> Unit
 }
 

idea/testData/codeInsight/overrideImplement/functionProperty.kt

@@ -1,5 +1,5 @@
 // From KT-1648
-trait A {
+interface A {
     val method:() -> Unit?
 }
 

idea/testData/codeInsight/overrideImplement/functionProperty.kt.after

@@ -1,5 +1,5 @@
 // From KT-1648
-trait A {
+interface A {
     val method:() -> Unit?
 }
 

idea/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt

@@ -1,4 +1,4 @@
-trait Trait {
+interface Trait {
     fun <A, B : Runnable, E : Map.Entry<A, B>> foo() where B : Cloneable, B : Comparable<B>;
 }
 

idea/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt.after

@@ -1,4 +1,4 @@
-trait Trait {
+interface Trait {
     fun <A, B : Runnable, E : Map.Entry<A, B>> foo() where B : Cloneable, B : Comparable<B>;
 }
 

idea/testData/codeInsight/overrideImplement/generateMulti.kt

@@ -1,6 +1,6 @@
 package something
 
-trait Some<T> {
+interface Some<T> {
     fun someFoo()
     fun someOtherFoo() : Int
     fun someGenericFoo() : T

idea/testData/codeInsight/overrideImplement/generateMulti.kt.after

@@ -1,6 +1,6 @@
 package something
 
-trait Some<T> {
+interface Some<T> {
     fun someFoo()
     fun someOtherFoo() : Int
     fun someGenericFoo() : T

idea/testData/codeInsight/overrideImplement/genericMethod.kt

@@ -1,4 +1,4 @@
-trait G<T> {
+interface G<T> {
     fun foo(t : T) : T
 }
 

idea/testData/codeInsight/overrideImplement/genericMethod.kt.after

@@ -1,4 +1,4 @@
-trait G<T> {
+interface G<T> {
     fun foo(t : T) : T
 }
 

idea/testData/codeInsight/overrideImplement/inheritVisibilities.kt

@@ -4,7 +4,7 @@ open class A() {
     public open fun publicFun() {}
 }
 
-trait B {
+interface B {
    protected open val protectedProperty : Int
    internal open val internalProperty : Int
    public open val publicProperty : Int

idea/testData/codeInsight/overrideImplement/inheritVisibilities.kt.after

@@ -4,7 +4,7 @@ open class A() {
     public open fun publicFun() {}
 }
 
-trait B {
+interface B {
    protected open val protectedProperty : Int
    internal open val internalProperty : Int
    public open val publicProperty : Int

idea/testData/codeInsight/overrideImplement/multiOverride.kt

@@ -1,4 +1,4 @@
-trait A {
+interface A {
     fun foo(value : String) : Int = 0
     fun bar() : String = "hello"
 }

idea/testData/codeInsight/overrideImplement/multiOverride.kt.after

@@ -1,4 +1,4 @@
-trait A {
+interface A {
     fun foo(value : String) : Int = 0
     fun bar() : String = "hello"
 }

idea/testData/codeInsight/overrideImplement/multipleSupers.kt

@@ -2,7 +2,7 @@ open class A {
     open fun foo() {}
 }
 
-trait B {
+interface B {
     fun bar()
 }
 

idea/testData/codeInsight/overrideImplement/multipleSupers.kt.after

@@ -2,7 +2,7 @@ open class A {
     open fun foo() {}
 }
 
-trait B {
+interface B {
     fun bar()
 }
 

idea/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt

@@ -1,4 +1,4 @@
-trait A {
+interface A {
     fun String.foo()
 }
 

idea/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt.after

@@ -1,4 +1,4 @@
-trait A {
+interface A {
     fun String.foo()
 }
 

idea/testData/codeInsight/overrideImplement/overrideExtensionProperty.kt

@@ -1,4 +1,4 @@
-trait A {
+interface A {
     val String.prop : Int
 }
 

idea/testData/codeInsight/overrideImplement/overrideExtensionProperty.kt.after

@@ -1,4 +1,4 @@
-trait A {
+interface A {
     val String.prop : Int
 }
 

idea/testData/codeInsight/overrideImplement/overrideFromClassName.kt

@@ -1,4 +1,4 @@
-trait Some {
+interface Some {
     fun foo()
 }
 

idea/testData/codeInsight/overrideImplement/overrideFromClassName.kt.after

@@ -1,4 +1,4 @@
-trait Some {
+interface Some {
     fun foo()
 }
 

idea/testData/codeInsight/overrideImplement/overrideFromFunctionPosition.kt

@@ -1,4 +1,4 @@
-trait Some {
+interface Some {
     fun foo()
 }
 

idea/testData/codeInsight/overrideImplement/overrideFromFunctionPosition.kt.after

@@ -1,4 +1,4 @@
-trait Some {
+interface Some {
     fun foo()
 }
 

idea/testData/codeInsight/overrideImplement/overrideFromLBrace.kt

@@ -1,4 +1,4 @@
-trait Some {
+interface Some {
     fun foo()
 }
 

idea/testData/codeInsight/overrideImplement/overrideFromLBrace.kt.after

@@ -1,4 +1,4 @@
-trait Some {
+interface Some {
     fun foo()
 }
 

idea/testData/codeInsight/overrideImplement/overrideGenericFunction.kt

@@ -1,4 +1,4 @@
-trait A<T> {
+interface A<T> {
     fun foo(value : T) : Unit = println(value)
 }
 

idea/testData/codeInsight/overrideImplement/overrideGenericFunction.kt.after

@@ -1,4 +1,4 @@
-trait A<T> {
+interface A<T> {
     fun foo(value : T) : Unit = println(value)
 }
 

idea/testData/codeInsight/overrideImplement/overrideMutableExtensionProperty.kt

@@ -1,4 +1,4 @@
-trait A {
+interface A {
     var Int.foo : Double
 }
 

idea/testData/codeInsight/overrideImplement/overrideMutableExtensionProperty.kt.after

@@ -1,4 +1,4 @@
-trait A {
+interface A {
     var Int.foo : Double
 }
 

idea/testData/codeInsight/overrideImplement/overrideNonUnitFunction.kt

@@ -1,4 +1,4 @@
-trait A {
+interface A {
     fun foo(value : String) : Int = 0
 }
 

idea/testData/codeInsight/overrideImplement/overrideNonUnitFunction.kt.after

@@ -1,4 +1,4 @@
-trait A {
+interface A {
     fun foo(value : String) : Int = 0
 }
 

idea/testData/codeInsight/overrideImplement/overridePrimitiveProperty.kt

@@ -1,4 +1,4 @@
-trait T {
+interface T {
     val a1: Byte
     val a2: Short
     val a3: Int

idea/testData/codeInsight/overrideImplement/overridePrimitiveProperty.kt.after

@@ -1,4 +1,4 @@
-trait T {
+interface T {
     val a1: Byte
     val a2: Short
     val a3: Int

idea/testData/codeInsight/overrideImplement/overrideUnitFunction.kt

@@ -1,4 +1,4 @@
-trait A {
+interface A {
     fun foo(value : String) : Unit = 0
 }
 

idea/testData/codeInsight/overrideImplement/overrideUnitFunction.kt.after

@@ -1,4 +1,4 @@
-trait A {
+interface A {
     fun foo(value : String) : Unit = 0
 }
 

idea/testData/codeInsight/overrideImplement/propagationKJK/foo/Foo.kt

@@ -1,5 +1,5 @@
 package foo
 
-public trait Foo {
+public interface Foo {
     fun f(): Any
 }

idea/testData/codeInsight/overrideImplement/property.kt

@@ -1,4 +1,4 @@
-trait T {
+interface T {
     val v : Int
 }
 

idea/testData/codeInsight/overrideImplement/property.kt.after

@@ -1,4 +1,4 @@
-trait T {
+interface T {
     val v : Int
 }
 

idea/testData/codeInsight/overrideImplement/respectCaretPosition.kt

@@ -1,4 +1,4 @@
-trait Test {
+interface Test {
     public open fun test()
     protected open val testProp : Int
 }

idea/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after

@@ -1,4 +1,4 @@
-trait Test {
+interface Test {
     public open fun test()
     protected open val testProp : Int
 }

idea/testData/codeInsight/overrideImplement/sameTypeName/foo/Array.kt

@@ -4,6 +4,6 @@ package lib
 public class Array {
 }
 
-public trait ArrayFactory {
+public interface ArrayFactory {
     fun create() : Array
 }

idea/testData/codeInsight/overrideImplement/starProjections.kt

@@ -1,6 +1,6 @@
 class C<T : C<T>>
 
-trait Base {
+interface Base {
     fun foo(c: C<*>)
 }
 

idea/testData/codeInsight/overrideImplement/starProjections.kt.after

@@ -1,6 +1,6 @@
 class C<T : C<T>>
 
-trait Base {
+interface Base {
     fun foo(c: C<*>)
 }
 

idea/testData/codeInsight/overrideImplement/traitGenericImplement.kt

@@ -1,4 +1,4 @@
-trait G<T> {
+interface G<T> {
     fun foo(t : T) : T
 }
 

idea/testData/codeInsight/overrideImplement/traitGenericImplement.kt.after

@@ -1,4 +1,4 @@
-trait G<T> {
+interface G<T> {
     fun foo(t : T) : T
 }
 

idea/testData/codeInsight/overrideImplement/traitNullableFunction.kt

@@ -1,4 +1,4 @@
-trait Some {
+interface Some {
     fun foo(some : Int?) : Int
 }
 

idea/testData/codeInsight/overrideImplement/traitNullableFunction.kt.after

@@ -1,4 +1,4 @@
-trait Some {
+interface Some {
     fun foo(some : Int?) : Int
 }
 

idea/testData/compilerMessages/k2jvm/visibilityError/src/test.kt

@@ -1,4 +1,4 @@
-public trait TestTrait {
+public interface TestTrait {
     public fun f()
 }
 

idea/testData/copyPaste/imports/AlreadyImportedViaStar.kt

@@ -3,7 +3,7 @@ package a
 import a.E.ENTRY
 import a.Outer.*
 
-trait T
+interface T
 
 class A(i: Int) {}
 
@@ -34,7 +34,7 @@ class Outer {
     }
     object NestedObj {
     }
-    trait NestedTrait {
+    interface NestedTrait {
     }
     annotation class NestedAnnotation
 }