From 7979663e6c0a9ebdecaf406b77ccbfd8b8c6300e Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Thu, 25 May 2017 10:58:12 +0300 Subject: [PATCH] Update testData for changed diagnostic messages --- compiler/testData/cli/jvm/signatureClash.out | 36 ++++++------ ...ticAccessorForPropertiesSignatureClash.out | 56 +++++++++---------- ...icAccessorPropertyAndFunSignatureClash.out | 32 +++++------ .../jvm/syntheticAccessorSignatureClash.out | 24 ++++---- ...abstractBaseClassMemberNotImplemented1.txt | 2 +- .../function/noDirectOverridesNeeded.kt | 2 +- .../property/noDirectOverridesNeeded.kt | 2 +- .../noDirectOverridesNeeded.kt | 2 +- .../abstract/makeEnumEntryAbstract.kt | 2 +- .../addInitializer/memberExtensionProperty.kt | 2 +- .../topLevelExtensionProperty.kt | 2 +- .../topLevelExtensionPropertySetterOnly.kt | 2 +- .../callInMemberValDelegateRuntime.kt | 2 +- .../callInMemberValDelegateRuntime.kt.after | 2 +- .../modifiers/noAbstractForAnonymousObject.kt | 2 +- .../quickfix/modifiers/noAbstractForObject.kt | 2 +- .../memberExtensionProperty.kt | 2 +- .../implemenAsConstructorParameterFunction.kt | 2 +- .../implemenAsConstructorParameterInObject.kt | 2 +- .../nothingToOverride/addParameterMultiple.kt | 2 +- .../addParameterMultiple.kt.after | 2 +- .../fileOrElement/comments/comments.kt | 2 +- .../overrideImplicit/build.log | 4 +- .../conflictingPlatformDeclarations/build.log | 8 +-- 24 files changed, 98 insertions(+), 98 deletions(-) diff --git a/compiler/testData/cli/jvm/signatureClash.out b/compiler/testData/cli/jvm/signatureClash.out index 2f16dbdf465..b752c606f2d 100644 --- a/compiler/testData/cli/jvm/signatureClash.out +++ b/compiler/testData/cli/jvm/signatureClash.out @@ -1,46 +1,46 @@ compiler/testData/cli/jvm/signatureClash.kt:6:5: error: accidental override: The following declarations have the same JVM signature (getX()I): - fun (): Int - fun getX(): Int + fun (): Int defined in A + fun getX(): Int defined in A fun getX() = 1 ^ compiler/testData/cli/jvm/signatureClash.kt:8:5: error: platform declaration clash: The following declarations have the same JVM signature (getA()I): - fun (): Int - fun getA(): Int + fun (): Int defined in A + fun getA(): Int defined in A fun getA(): Int = 1 ^ compiler/testData/cli/jvm/signatureClash.kt:9:5: error: platform declaration clash: The following declarations have the same JVM signature (getA()I): - fun (): Int - fun getA(): Int + fun (): Int defined in A + fun getA(): Int defined in A val a: Int = 1 ^ compiler/testData/cli/jvm/signatureClash.kt:12:1: error: platform declaration clash: The following declarations have the same JVM signature (getB()I): - fun (): Int - fun getB(): Int + fun (): Int defined in root package + fun getB(): Int defined in root package fun getB(): Int = 1 ^ compiler/testData/cli/jvm/signatureClash.kt:13:1: error: platform declaration clash: The following declarations have the same JVM signature (getB()I): - fun (): Int - fun getB(): Int + fun (): Int defined in root package + fun getB(): Int defined in root package val b: Int = 1 ^ compiler/testData/cli/jvm/signatureClash.kt:19:7: error: platform declaration clash: The following declarations have the same JVM signature (getTr()I): - fun (): Int - fun getTr(): Int + fun (): Int defined in SubTr + fun getTr(): Int defined in Tr class SubTr : Tr { ^ compiler/testData/cli/jvm/signatureClash.kt:20:5: error: platform declaration clash: The following declarations have the same JVM signature (getTr()I): - fun (): Int - fun getTr(): Int + fun (): Int defined in SubTr + fun getTr(): Int defined in Tr val tr = 1 ^ compiler/testData/cli/jvm/signatureClash.kt:24:7: error: platform declaration clash: The following declarations have the same JVM signature (access$f(LC;)V): - fun `access$f`(c: C): Unit - fun f(): Unit + fun `access$f`(c: C): Unit defined in C + fun f(): Unit defined in C class C { ^ compiler/testData/cli/jvm/signatureClash.kt:26:5: error: platform declaration clash: The following declarations have the same JVM signature (access$f(LC;)V): - fun `access$f`(c: C): Unit - fun f(): Unit + fun `access$f`(c: C): Unit defined in C + fun f(): Unit defined in C fun `access$f`(c: C) {} ^ COMPILATION_ERROR \ No newline at end of file diff --git a/compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.out b/compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.out index 39c386c5063..d4aa69815a9 100644 --- a/compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.out +++ b/compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.out @@ -1,71 +1,71 @@ compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA;)I): - fun (): Int - fun `access$getFoo$p`(a: A): Int + fun (): Int defined in A + fun `access$getFoo$p`(a: A): Int defined in A class A { ^ compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA;I)V): - fun (: Int): Unit - fun `access$setFoo$p`(a: A, d: Int): Unit + fun (: Int): Unit defined in A + fun `access$setFoo$p`(a: A, d: Int): Unit defined in A class A { ^ compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$cp()I): - fun (): Int - fun `access$getFoo$cp`(): Int + fun (): Int defined in A.Companion + fun `access$getFoo$cp`(): Int defined in A class A { ^ compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$cp(I)V): - fun (: Int): Unit - fun `access$setFoo$cp`(d: Int): Unit + fun (: Int): Unit defined in A.Companion + fun `access$setFoo$cp`(d: Int): Unit defined in A class A { ^ compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$getBar$lp(LA;)I): - fun (): Int - fun `access$getBar$lp`(a: A): Int + fun (): Int defined in A + fun `access$getBar$lp`(a: A): Int defined in A class A { ^ compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:5:5: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA;)I): - fun (): Int - fun `access$getFoo$p`(a: A): Int + fun (): Int defined in A + fun `access$getFoo$p`(a: A): Int defined in A fun `access$getFoo$p`(a: A): Int = 1 ^ compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:6:5: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA;I)V): - fun (: Int): Unit - fun `access$setFoo$p`(a: A, d: Int): Unit + fun (: Int): Unit defined in A + fun `access$setFoo$p`(a: A, d: Int): Unit defined in A fun `access$setFoo$p`(a: A, d: Int) {} ^ compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:9:5: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$cp()I): - fun (): Int - fun `access$getFoo$cp`(): Int + fun (): Int defined in A.Companion + fun `access$getFoo$cp`(): Int defined in A fun `access$getFoo$cp`(): Int = 1 ^ compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:10:5: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$cp(I)V): - fun (: Int): Unit - fun `access$setFoo$cp`(d: Int): Unit + fun (: Int): Unit defined in A.Companion + fun `access$setFoo$cp`(d: Int): Unit defined in A fun `access$setFoo$cp`(d: Int) {} ^ compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:16:5: error: platform declaration clash: The following declarations have the same JVM signature (access$getBar$lp(LA;)I): - fun (): Int - fun `access$getBar$lp`(a: A): Int + fun (): Int defined in A + fun `access$getBar$lp`(a: A): Int defined in A fun `access$getBar$lp`(a: A): Int = 7 ^ compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:18:15: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA$Companion;)I): - fun (): Int - fun `access$getFoo$p`(p: A.Companion): Int + fun (): Int defined in A.Companion + fun `access$getFoo$p`(p: A.Companion): Int defined in A.Companion companion object { ^ compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:18:15: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA$Companion;I)V): - fun (: Int): Unit - fun `access$setFoo$p`(p: A.Companion, d: Int): Unit + fun (: Int): Unit defined in A.Companion + fun `access$setFoo$p`(p: A.Companion, d: Int): Unit defined in A.Companion companion object { ^ compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:28:9: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA$Companion;)I): - fun (): Int - fun `access$getFoo$p`(p: A.Companion): Int + fun (): Int defined in A.Companion + fun `access$getFoo$p`(p: A.Companion): Int defined in A.Companion fun `access$getFoo$p`(p: A.Companion): Int = 1 ^ compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:29:9: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA$Companion;I)V): - fun (: Int): Unit - fun `access$setFoo$p`(p: A.Companion, d: Int): Unit + fun (: Int): Unit defined in A.Companion + fun `access$setFoo$p`(p: A.Companion, d: Int): Unit defined in A.Companion fun `access$setFoo$p`(p: A.Companion, d: Int) {} ^ COMPILATION_ERROR \ No newline at end of file diff --git a/compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.out b/compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.out index a96828461ef..b482184957d 100644 --- a/compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.out +++ b/compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.out @@ -1,41 +1,41 @@ compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA;)I): - fun (): Int - fun `access$getFoo$p`(a: A): Int + fun (): Int defined in A + fun `access$getFoo$p`(a: A): Int defined in A class A { ^ compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA;I)V): - fun (: Int): Unit - fun `access$setFoo$p`(a: A, d: Int): Unit + fun (: Int): Unit defined in A + fun `access$setFoo$p`(a: A, d: Int): Unit defined in A class A { ^ compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo(LA;)I): - fun `access$getFoo`(a: A): Int - fun getFoo(): Int + fun `access$getFoo`(a: A): Int defined in A + fun getFoo(): Int defined in A class A { ^ compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo(LA;I)V): - fun `access$setFoo`(a: A, d: Int): Unit - fun setFoo(i: Int): Unit + fun `access$setFoo`(a: A, d: Int): Unit defined in A + fun setFoo(i: Int): Unit defined in A class A { ^ compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:5:5: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA;)I): - fun (): Int - fun `access$getFoo$p`(a: A): Int + fun (): Int defined in A + fun `access$getFoo$p`(a: A): Int defined in A fun `access$getFoo$p`(a: A): Int = 1 ^ compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:6:5: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA;I)V): - fun (: Int): Unit - fun `access$setFoo$p`(a: A, d: Int): Unit + fun (: Int): Unit defined in A + fun `access$setFoo$p`(a: A, d: Int): Unit defined in A fun `access$setFoo$p`(a: A, d: Int) {} ^ compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:11:5: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo(LA;)I): - fun `access$getFoo`(a: A): Int - fun getFoo(): Int + fun `access$getFoo`(a: A): Int defined in A + fun getFoo(): Int defined in A fun `access$getFoo`(a: A): Int = 1 ^ compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:12:5: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo(LA;I)V): - fun `access$setFoo`(a: A, d: Int): Unit - fun setFoo(i: Int): Unit + fun `access$setFoo`(a: A, d: Int): Unit defined in A + fun setFoo(i: Int): Unit defined in A fun `access$setFoo`(a: A, d: Int) {} ^ COMPILATION_ERROR \ No newline at end of file diff --git a/compiler/testData/cli/jvm/syntheticAccessorSignatureClash.out b/compiler/testData/cli/jvm/syntheticAccessorSignatureClash.out index 7de74af5b5f..fd5abfa1ea4 100644 --- a/compiler/testData/cli/jvm/syntheticAccessorSignatureClash.out +++ b/compiler/testData/cli/jvm/syntheticAccessorSignatureClash.out @@ -1,31 +1,31 @@ compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:15:5: error: accidental override: The following declarations have the same JVM signature (access$foo(LDerived;)V): - fun `access$foo`(d: Derived): Unit - fun foo(): Unit + fun `access$foo`(d: Derived): Unit defined in Derived + fun foo(): Unit defined in Derived private fun foo() {} ^ compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:18:9: error: accidental override: The following declarations have the same JVM signature (access$getBar$p(LDerived;)I): - fun (): Int - fun `access$getBar$p`(d: Derived): Int + fun (): Int defined in Derived + fun `access$getBar$p`(d: Derived): Int defined in Derived get ^ compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:19:9: error: accidental override: The following declarations have the same JVM signature (access$setBar$p(LDerived;I)V): - fun (: Int): Unit - fun `access$setBar$p`(d: Derived, i: Int): Unit + fun (: Int): Unit defined in Derived + fun `access$setBar$p`(d: Derived, i: Int): Unit defined in Derived set ^ compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:21:5: error: accidental override: The following declarations have the same JVM signature (access$getBaz$p(LDerived;)I): - fun (): Int - fun `access$getBaz$p`(d: Derived): Int + fun (): Int defined in Derived + fun `access$getBaz$p`(d: Derived): Int defined in Derived private var baz = 1 ^ compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:23:5: error: accidental override: The following declarations have the same JVM signature (access$getBoo$p(LDerived;)I): - fun (): Int - fun `access$getBoo$p`(d: Derived): Int + fun (): Int defined in Derived + fun `access$getBoo$p`(d: Derived): Int defined in Derived private val boo = 1 ^ compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:27:9: error: accidental override: The following declarations have the same JVM signature (access$setBar1$p(LDerived;I)V): - fun (: Int): Unit - fun `access$setBar1$p`(d: Derived, i: Int): Unit + fun (: Int): Unit defined in Derived + fun `access$setBar1$p`(d: Derived, i: Int): Unit defined in Derived set ^ COMPILATION_ERROR \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/abstractBaseClassMemberNotImplemented1.txt b/idea/testData/diagnosticMessage/abstractBaseClassMemberNotImplemented1.txt index dc73fbf39d0..5eb4f97391b 100644 --- a/idea/testData/diagnosticMessage/abstractBaseClassMemberNotImplemented1.txt +++ b/idea/testData/diagnosticMessage/abstractBaseClassMemberNotImplemented1.txt @@ -1,2 +1,2 @@ -Class 'E' must be declared abstract or implement abstract base class member public abstract fun f(): T4 defined in D \ No newline at end of file +Class 'E' is not abstract and does not implement abstract base class member public abstract fun f(): T4 defined in D \ No newline at end of file diff --git a/idea/testData/intentions/implementAbstractMember/function/noDirectOverridesNeeded.kt b/idea/testData/intentions/implementAbstractMember/function/noDirectOverridesNeeded.kt index d03e3f255a8..5e8dc49829f 100644 --- a/idea/testData/intentions/implementAbstractMember/function/noDirectOverridesNeeded.kt +++ b/idea/testData/intentions/implementAbstractMember/function/noDirectOverridesNeeded.kt @@ -1,5 +1,5 @@ // IS_APPLICABLE: false -// ERROR: Class 'C' must be declared abstract or implement abstract base class member public abstract fun foo(): Int defined in B +// ERROR: Class 'C' is not abstract and does not implement abstract base class member public abstract fun foo(): Int defined in B interface A { fun foo(): Int } diff --git a/idea/testData/intentions/implementAbstractMember/property/noDirectOverridesNeeded.kt b/idea/testData/intentions/implementAbstractMember/property/noDirectOverridesNeeded.kt index 4edd5ca9a14..0db1aaf81c2 100644 --- a/idea/testData/intentions/implementAbstractMember/property/noDirectOverridesNeeded.kt +++ b/idea/testData/intentions/implementAbstractMember/property/noDirectOverridesNeeded.kt @@ -1,5 +1,5 @@ // IS_APPLICABLE: false -// ERROR: Class 'C' must be declared abstract or implement abstract base class member public abstract val foo: Int defined in B +// ERROR: Class 'C' is not abstract and does not implement abstract base class member public abstract val foo: Int defined in B interface A { val foo: Int } diff --git a/idea/testData/intentions/implementAsConstructorParameter/noDirectOverridesNeeded.kt b/idea/testData/intentions/implementAsConstructorParameter/noDirectOverridesNeeded.kt index 4edd5ca9a14..0db1aaf81c2 100644 --- a/idea/testData/intentions/implementAsConstructorParameter/noDirectOverridesNeeded.kt +++ b/idea/testData/intentions/implementAsConstructorParameter/noDirectOverridesNeeded.kt @@ -1,5 +1,5 @@ // IS_APPLICABLE: false -// ERROR: Class 'C' must be declared abstract or implement abstract base class member public abstract val foo: Int defined in B +// ERROR: Class 'C' is not abstract and does not implement abstract base class member public abstract val foo: Int defined in B interface A { val foo: Int } diff --git a/idea/testData/quickfix/abstract/makeEnumEntryAbstract.kt b/idea/testData/quickfix/abstract/makeEnumEntryAbstract.kt index b3a12edc7df..8d34c8a75b2 100644 --- a/idea/testData/quickfix/abstract/makeEnumEntryAbstract.kt +++ b/idea/testData/quickfix/abstract/makeEnumEntryAbstract.kt @@ -1,6 +1,6 @@ // "Make 'A' abstract" "false" // ACTION: Implement members -// ERROR: Class 'A' must be declared abstract or implement abstract member public abstract fun foo(): Unit defined in E +// ERROR: Class 'A' is not abstract and does not implement abstract member public abstract fun foo(): Unit defined in E enum class E { A; diff --git a/idea/testData/quickfix/addInitializer/memberExtensionProperty.kt b/idea/testData/quickfix/addInitializer/memberExtensionProperty.kt index d53af91b8ee..d50fc235d26 100644 --- a/idea/testData/quickfix/addInitializer/memberExtensionProperty.kt +++ b/idea/testData/quickfix/addInitializer/memberExtensionProperty.kt @@ -3,7 +3,7 @@ // ACTION: Make private // ACTION: Make protected // ACTION: Make 'n' abstract -// ERROR: Property must be initialized or be abstract +// ERROR: Extension property must have accessors or be abstract class A { val Int.n: Int } \ No newline at end of file diff --git a/idea/testData/quickfix/addInitializer/topLevelExtensionProperty.kt b/idea/testData/quickfix/addInitializer/topLevelExtensionProperty.kt index 0a0a69db6b9..42dbf07521d 100644 --- a/idea/testData/quickfix/addInitializer/topLevelExtensionProperty.kt +++ b/idea/testData/quickfix/addInitializer/topLevelExtensionProperty.kt @@ -1,5 +1,5 @@ // "class org.jetbrains.kotlin.idea.quickfix.InitializePropertyQuickFixFactory$AddInitializerFix" "false" // ACTION: Make internal // ACTION: Make private -// ERROR: Property must be initialized +// ERROR: Extension property must have accessors or be abstract val Int.n: Int \ No newline at end of file diff --git a/idea/testData/quickfix/addInitializer/topLevelExtensionPropertySetterOnly.kt b/idea/testData/quickfix/addInitializer/topLevelExtensionPropertySetterOnly.kt index 0a0a69db6b9..42dbf07521d 100644 --- a/idea/testData/quickfix/addInitializer/topLevelExtensionPropertySetterOnly.kt +++ b/idea/testData/quickfix/addInitializer/topLevelExtensionPropertySetterOnly.kt @@ -1,5 +1,5 @@ // "class org.jetbrains.kotlin.idea.quickfix.InitializePropertyQuickFixFactory$AddInitializerFix" "false" // ACTION: Make internal // ACTION: Make private -// ERROR: Property must be initialized +// ERROR: Extension property must have accessors or be abstract val Int.n: Int \ No newline at end of file diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberValDelegateRuntime.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberValDelegateRuntime.kt index 83d6713c9ec..0bb854097c4 100644 --- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberValDelegateRuntime.kt +++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberValDelegateRuntime.kt @@ -1,5 +1,5 @@ // "Create class 'Foo'" "true" -// ERROR: Class 'Foo' must be declared abstract or implement abstract member public abstract operator fun getValue(thisRef: A, property: KProperty<*>): B defined in kotlin.properties.ReadOnlyProperty +// ERROR: Class 'Foo' is not abstract and does not implement abstract member public abstract operator fun getValue(thisRef: A, property: KProperty<*>): B defined in kotlin.properties.ReadOnlyProperty open class B diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberValDelegateRuntime.kt.after b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberValDelegateRuntime.kt.after index 9fdd368955a..9c6c1e23244 100644 --- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberValDelegateRuntime.kt.after +++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberValDelegateRuntime.kt.after @@ -1,7 +1,7 @@ import kotlin.properties.ReadOnlyProperty // "Create class 'Foo'" "true" -// ERROR: Class 'Foo' must be declared abstract or implement abstract member public abstract operator fun getValue(thisRef: A, property: KProperty<*>): B defined in kotlin.properties.ReadOnlyProperty +// ERROR: Class 'Foo' is not abstract and does not implement abstract member public abstract operator fun getValue(thisRef: A, property: KProperty<*>): B defined in kotlin.properties.ReadOnlyProperty open class B diff --git a/idea/testData/quickfix/modifiers/noAbstractForAnonymousObject.kt b/idea/testData/quickfix/modifiers/noAbstractForAnonymousObject.kt index f13947c5cf3..bd36c6b8c39 100644 --- a/idea/testData/quickfix/modifiers/noAbstractForAnonymousObject.kt +++ b/idea/testData/quickfix/modifiers/noAbstractForAnonymousObject.kt @@ -2,7 +2,7 @@ // ACTION: Implement members // ACTION: Split property declaration // ACTION: Convert object literal to class -// ERROR: Object must be declared abstract or implement abstract member public abstract fun foo(): Unit defined in T +// ERROR: Object is not abstract and does not implement abstract member public abstract fun foo(): Unit defined in T interface T { fun foo() } diff --git a/idea/testData/quickfix/modifiers/noAbstractForObject.kt b/idea/testData/quickfix/modifiers/noAbstractForObject.kt index 91e215f10ae..10537eeab9e 100644 --- a/idea/testData/quickfix/modifiers/noAbstractForObject.kt +++ b/idea/testData/quickfix/modifiers/noAbstractForObject.kt @@ -3,7 +3,7 @@ // ACTION: Implement members // ACTION: Move 'Some' to separate file // ACTION: Rename file to Some.kt -// ERROR: Object 'Some' must be declared abstract or implement abstract member public abstract fun foo(): Unit defined in T +// ERROR: Object 'Some' is not abstract and does not implement abstract member public abstract fun foo(): Unit defined in T interface T { fun foo() } diff --git a/idea/testData/quickfix/moveToConstructorParameters/memberExtensionProperty.kt b/idea/testData/quickfix/moveToConstructorParameters/memberExtensionProperty.kt index 8be009cbae8..b047ccb6707 100644 --- a/idea/testData/quickfix/moveToConstructorParameters/memberExtensionProperty.kt +++ b/idea/testData/quickfix/moveToConstructorParameters/memberExtensionProperty.kt @@ -3,7 +3,7 @@ // ACTION: Make internal // ACTION: Make private // ACTION: Make protected -// ERROR: Property must be initialized or be abstract +// ERROR: Extension property must have accessors or be abstract class A { val Int.n: Int } \ No newline at end of file diff --git a/idea/testData/quickfix/override/implemenAsConstructorParameterFunction.kt b/idea/testData/quickfix/override/implemenAsConstructorParameterFunction.kt index f268e3f662b..a2cd0aa01de 100644 --- a/idea/testData/quickfix/override/implemenAsConstructorParameterFunction.kt +++ b/idea/testData/quickfix/override/implemenAsConstructorParameterFunction.kt @@ -5,7 +5,7 @@ // ACTION: Make internal // ACTION: Make private // ACTION: Move 'A' to separate file -// ERROR: Class 'A' must be declared abstract or implement abstract member public abstract fun foo(): Int defined in I +// ERROR: Class 'A' is not abstract and does not implement abstract member public abstract fun foo(): Int defined in I interface I { fun foo(): Int } diff --git a/idea/testData/quickfix/override/implemenAsConstructorParameterInObject.kt b/idea/testData/quickfix/override/implemenAsConstructorParameterInObject.kt index 9f2d1c08335..b69abdc8c86 100644 --- a/idea/testData/quickfix/override/implemenAsConstructorParameterInObject.kt +++ b/idea/testData/quickfix/override/implemenAsConstructorParameterInObject.kt @@ -4,7 +4,7 @@ // ACTION: Make internal // ACTION: Make private // ACTION: Move 'A' to separate file -// ERROR: Object 'A' must be declared abstract or implement abstract member public abstract val foo: Int defined in I +// ERROR: Object 'A' is not abstract and does not implement abstract member public abstract val foo: Int defined in I interface I { val foo: Int } diff --git a/idea/testData/quickfix/override/nothingToOverride/addParameterMultiple.kt b/idea/testData/quickfix/override/nothingToOverride/addParameterMultiple.kt index 143dbcc2cf2..9d81e08818e 100644 --- a/idea/testData/quickfix/override/nothingToOverride/addParameterMultiple.kt +++ b/idea/testData/quickfix/override/nothingToOverride/addParameterMultiple.kt @@ -1,5 +1,5 @@ // "Change function signature..." "true" -// ERROR: Class 'B' must be declared abstract or implement abstract member public abstract fun f(a: String): Unit defined in A +// ERROR: Class 'B' is not abstract and does not implement abstract member public abstract fun f(a: String): Unit defined in A interface A { fun f(a: Int) fun f(a: String) diff --git a/idea/testData/quickfix/override/nothingToOverride/addParameterMultiple.kt.after b/idea/testData/quickfix/override/nothingToOverride/addParameterMultiple.kt.after index 141cdf7cf9c..5f1df06a1d4 100644 --- a/idea/testData/quickfix/override/nothingToOverride/addParameterMultiple.kt.after +++ b/idea/testData/quickfix/override/nothingToOverride/addParameterMultiple.kt.after @@ -1,5 +1,5 @@ // "Change function signature..." "true" -// ERROR: Class 'B' must be declared abstract or implement abstract member public abstract fun f(a: String): Unit defined in A +// ERROR: Class 'B' is not abstract and does not implement abstract member public abstract fun f(a: String): Unit defined in A interface A { fun f(a: Int) fun f(a: String) diff --git a/j2k/testData/fileOrElement/comments/comments.kt b/j2k/testData/fileOrElement/comments/comments.kt index 633f5a3fb8a..4796775a2b7 100644 --- a/j2k/testData/fileOrElement/comments/comments.kt +++ b/j2k/testData/fileOrElement/comments/comments.kt @@ -1,4 +1,4 @@ -// ERROR: Class 'A' must be declared abstract or implement abstract member public abstract fun run(): Unit defined in java.lang.Runnable +// ERROR: Class 'A' is not abstract and does not implement abstract member public abstract fun run(): Unit defined in java.lang.Runnable package foo // we use package 'foo' diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log index 3370de7c993..2533be1703d 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log @@ -19,7 +19,7 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Class 'BA' must be declared abstract or implement abstract member public abstract fun f(c: C): Unit defined in A +Class 'BA' is not abstract and does not implement abstract member public abstract fun f(c: C): Unit defined in A ================ Step #2 ================= @@ -31,4 +31,4 @@ Compiling files: src/BA.kt End of files Exit code: OK ------------------------------------------- +------------------------------------------ \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log b/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log index 6c49ba3e152..47083313579 100644 --- a/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log @@ -12,8 +12,8 @@ Exit code: ABORT ------------------------------------------ COMPILATION FAILED Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V): - fun function(list: List): Unit - fun function(list: List): Unit + fun function(list: List): Unit defined in test + fun function(list: List): Unit defined in test Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V): - fun function(list: List): Unit - fun function(list: List): Unit \ No newline at end of file + fun function(list: List): Unit defined in test + fun function(list: List): Unit defined in test \ No newline at end of file