azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Map RETURN_TYPE_MISMATCH_ON_OVERRIDE to ChangeFunctionReturnTypeFix

Browse Source
This commit is contained in:
Wojciech Lopata
2013-03-16 16:31:07 +01:00
committed by Andrey Breslav
parent c281796e64
commit cdd41f0fa1
13 changed files with 35 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/quickfix/override/typeMismatchOnOverride/afterReturnTypeMismatchOnMultipleOverride.kt
+2 -2
View File
@@ -1,4 +1,4 @@
// "Change return type to 'T'" "true"
// "Change 'B.foo' function return type to 'T'" "true"
open class S {}
open class T : S() {}
@@ -11,5 +11,5 @@ trait X {
}
abstract class B : A(), X {
override abstract fun foo() : T;
override abstract fun foo(): T
}
idea/testData/quickfix/override/typeMismatchOnOverride/afterReturnTypeMismatchOnOverrideIntLong.kt
+2 -2
View File
@@ -1,8 +1,8 @@
// "Change return type to 'Int'" "true"
// "Change 'B.foo' function return type to 'Int'" "true"
abstract class A {
abstract fun foo() : Int;
}
abstract class B : A() {
abstract override fun foo() : Int;
abstract override fun foo(): Int
}
idea/testData/quickfix/override/typeMismatchOnOverride/afterReturnTypeMismatchOnOverrideIntUnit.kt
+2 -2
View File
@@ -1,8 +1,8 @@
// "Change return type to 'Int'" "true"
// "Change 'B.foo' function return type to 'Int'" "true"
abstract class A {
abstract fun foo() : Int;
}
abstract class B : A() {
abstract override fun foo(): Int;
abstract override fun foo<caret>(): Int
}
idea/testData/quickfix/override/typeMismatchOnOverride/afterReturnTypeMismatchOnOverrideUnitInt.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// "Remove explicitly specified return type to match overridden method" "true"
// "Remove explicitly specified return type in 'A.remove' function" "true"
abstract class A : java.util.Iterator<Int> {
public abstract override fun remove();
}
idea/testData/quickfix/override/typeMismatchOnOverride/beforeReturnTypeMismatchOnMultipleOverride.kt
+2 -2
View File
@@ -1,4 +1,4 @@
// "Change return type to 'T'" "true"
// "Change 'B.foo' function return type to 'T'" "true"
open class S {}
open class T : S() {}
@@ -11,5 +11,5 @@ trait X {
}
abstract class B : A(), X {
override abstract fun foo() : Int<caret>;
override abstract fun foo(): Int<caret>
}
idea/testData/quickfix/override/typeMismatchOnOverride/beforeReturnTypeMismatchOnMultipleOverrideAmbiguity.kt
+4 -4
View File
@@ -1,6 +1,6 @@
// "Change return type to 'Int'" "false"
// "Change return type to 'Long'" "false"
// "Remove explicitly specified return type to match overridden method" "false"
// "Change 'B.foo' function return type to 'Int'" "false"
// "Change 'B.foo' function return type to 'Long'" "false"
// "Remove explicitly specified return type in 'B.foo' function" "false"
// ERROR: <html>Return type is 'jet.String', which is not a subtype of overridden<br/><b>internal</b> <b>abstract</b> <b>fun</b> foo() : jet.Int <i>defined in</i> A</html>
abstract class A {
abstract fun foo() : Int;
@@ -11,5 +11,5 @@ trait X {
}
abstract class B : A(), X {
abstract override fun foo() : String<caret>;
abstract override fun foo() : String<caret>
}
idea/testData/quickfix/override/typeMismatchOnOverride/beforeReturnTypeMismatchOnOverrideIntLong.kt
+2 -2
View File
@@ -1,8 +1,8 @@
// "Change return type to 'Int'" "true"
// "Change 'B.foo' function return type to 'Int'" "true"
abstract class A {
abstract fun foo() : Int;
}
abstract class B : A() {
abstract override fun foo() : Long<caret>;
abstract override fun foo(): Long<caret>
}
idea/testData/quickfix/override/typeMismatchOnOverride/beforeReturnTypeMismatchOnOverrideIntUnit.kt
+2 -2
View File
@@ -1,8 +1,8 @@
// "Change return type to 'Int'" "true"
// "Change 'B.foo' function return type to 'Int'" "true"
abstract class A {
abstract fun foo() : Int;
}
abstract class B : A() {
abstract override fun foo<caret>();
abstract override fun foo<caret>()
}
idea/testData/quickfix/override/typeMismatchOnOverride/beforeReturnTypeMismatchOnOverrideUnitInt.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// "Remove explicitly specified return type to match overridden method" "true"
// "Remove explicitly specified return type in 'A.remove' function" "true"
abstract class A : java.util.Iterator<Int> {
public abstract override fun remove() : Int<caret>;
}