Merge branch master into pr/269

idea/testData/quickfix/addStarProjections/when/beforeUnqualifiedMapOneArg.kt

@@ -1,6 +1,12 @@
 // "Add '<*, *>'" "false"
 // "Add '<*>'" "false"
 // ERROR: 2 type arguments expected
+// ACTION: Disable 'Eliminate Argument of 'when''
+// ACTION: Disable 'Replace 'when' with 'if''
+// ACTION: Edit intention settings
+// ACTION: Edit intention settings
+// ACTION: Eliminate argument of 'when'
+// ACTION: Replace 'when' with 'if'
 public fun foo(a: Any) {
     when (a) {
         is <caret>Map<Int> -> {}

idea/testData/quickfix/checkArguments/afterMixedNamedAndPositionalArguments.kt

@@ -0,0 +1,6 @@
+// "Add name to argument: 'b = "FOO"'" "true"
+fun f(a: Int, b: String) {}
+
+fun g() {
+    f(a = 10, b = "FOO")
+}

idea/testData/quickfix/checkArguments/afterMixedNamedAndPositionalArgumentsConstructor.kt

@@ -0,0 +1,6 @@
+// "Add name to argument: 'b = "FOO"'" "true"
+class A(a: Int, b: String) {}
+
+fun f() {
+     A(a = 1, b = "FOO")
+}

idea/testData/quickfix/checkArguments/afterMixedNamedAndPositionalArgumentsMultiple.kt

@@ -0,0 +1,6 @@
+// "Add name to argument..." "true"
+fun f(a: Int, b: String = "b", c: String = "c") {}
+
+fun g() {
+    f(a = 10, b = "FOO")
+}

idea/testData/quickfix/checkArguments/afterMixedNamedAndPositionalArgumentsSubtype.kt

@@ -0,0 +1,8 @@
+// "Add name to argument: 'b = B()'" "true"
+open class A {}
+open class B : A() {}
+
+fun f(a: Int, b: A) {}
+fun g() {
+     f(a=1, b = B())
+}

idea/testData/quickfix/checkArguments/afterMixedNamedAndPositionalArgumentsUsedNamed.kt

@@ -0,0 +1,6 @@
+// "Add name to argument: 'b = "FOO"'" "true"
+fun f(a: String, b: String) {}
+
+fun g() {
+    f(a = "BAR", b = "FOO")
+}

idea/testData/quickfix/checkArguments/afterMixedNamedAndPositionalArgumentsUsedPositional.kt

@@ -0,0 +1,6 @@
+// "Add name to argument: 'b = "FOO"'" "true"
+fun f(a: String, x: Int, b: String) {}
+
+fun g() {
+    f("BAR", x = 10, b = "FOO")
+}

idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArguments.kt

@@ -0,0 +1,6 @@
+// "Add name to argument: 'b = "FOO"'" "true"
+fun f(a: Int, b: String) {}
+
+fun g() {
+    f(a = 10, <caret>"FOO")
+}

idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArgumentsConstructor.kt

@@ -0,0 +1,6 @@
+// "Add name to argument: 'b = "FOO"'" "true"
+class A(a: Int, b: String) {}
+
+fun f() {
+     A(a = 1, <caret>"FOO")
+}

idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArgumentsMultiple.kt

@@ -0,0 +1,6 @@
+// "Add name to argument..." "true"
+fun f(a: Int, b: String = "b", c: String = "c") {}
+
+fun g() {
+    f(a = 10, <caret>"FOO")
+}

idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArgumentsSubtype.kt

@@ -0,0 +1,8 @@
+// "Add name to argument: 'b = B()'" "true"
+open class A {}
+open class B : A() {}
+
+fun f(a: Int, b: A) {}
+fun g() {
+     f(a=1, <caret>B())
+}

idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArgumentsUsedNamed.kt

@@ -0,0 +1,6 @@
+// "Add name to argument: 'b = "FOO"'" "true"
+fun f(a: String, b: String) {}
+
+fun g() {
+    f(a = "BAR", <caret>"FOO")
+}

idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArgumentsUsedPositional.kt

@@ -0,0 +1,6 @@
+// "Add name to argument: 'b = "FOO"'" "true"
+fun f(a: String, x: Int, b: String) {}
+
+fun g() {
+    f("BAR", x = 10, <caret>"FOO")
+}

idea/testData/quickfix/override/nothingToOverride/afterAddFunction.kt

@@ -0,0 +1,8 @@
+// "Add 'open fun f()' to 'A'" "true"
+open class A {
+    open fun f() {
+    }
+}
+class B : A() {
+    <caret>override fun f() {}
+}

idea/testData/quickfix/override/nothingToOverride/afterAddFunctionAbstractClass.kt

@@ -0,0 +1,7 @@
+// "Add 'abstract fun f()' to 'A'" "true"
+abstract class A {
+    abstract fun f()
+}
+class B : A() {
+    <caret>override fun f() {}
+}

idea/testData/quickfix/override/nothingToOverride/afterAddFunctionNoBody.kt

@@ -0,0 +1,8 @@
+// "Add 'open fun f()' to 'A'" "true"
+trait A
+{
+    open fun f()
+}
+class B : A {
+    <caret>override fun f() {}
+}

idea/testData/quickfix/override/nothingToOverride/afterAddFunctionNonUnitReturnType.kt

@@ -0,0 +1,9 @@
+// "Add 'open fun f(): Int' to 'A'" "true"
+open class A {
+    open fun f(): Int {
+        throw UnsupportedOperationException()
+    }
+}
+class B : A() {
+    <caret>override fun f(): Int = 5
+}

idea/testData/quickfix/override/nothingToOverride/afterAddFunctionTrait.kt

@@ -0,0 +1,7 @@
+// "Add 'open fun f()' to 'A'" "true"
+trait A {
+    open fun f()
+}
+class B : A {
+    <caret>override fun f() {}
+}

idea/testData/quickfix/override/nothingToOverride/afterAddFunctionTwoSuperclasses.kt

@@ -0,0 +1,10 @@
+// "Add function to supertype..." "true"
+open class A {
+}
+open class B : A() {
+    open fun f() {
+    }
+}
+class C : B() {
+    <caret>override fun f() {}
+}

idea/testData/quickfix/override/nothingToOverride/afterAddFunctionTwoTraits.kt

@@ -0,0 +1,8 @@
+// "Add function to supertype..." "true"
+trait A {
+    open fun foo()
+}
+trait B {}
+class C: A, B {
+  <caret>override fun foo() {}
+}

idea/testData/quickfix/override/nothingToOverride/afterAddParameterGenericClass.kt

@@ -0,0 +1,8 @@
+// "Change function signature to 'override fun f(a: Int, x: T)'" "true"
+trait A<R> {
+    fun f(a: Int, b: R)
+}
+
+class B<T> : A<T> {
+    <caret>override fun f(a: Int, x: T) {}
+}

idea/testData/quickfix/override/nothingToOverride/afterAddParameterTwoSupertraits.kt

@@ -0,0 +1,11 @@
+// "Change function signature to 'override fun f(a: Int)'" "true"
+trait A {
+    fun f(a: Int)
+}
+
+trait B : A {
+}
+
+class C : B {
+    override fun f(a: Int) {}
+}

idea/testData/quickfix/override/nothingToOverride/afterAddParameterTwoSupertypes.kt

@@ -0,0 +1,11 @@
+// "Change function signature to 'override fun f(a: Int)'" "true"
+open class A {
+    open fun f(a: Int) {}
+}
+
+open class B : A() {
+}
+
+class C : B() {
+    <caret>override fun f(a: Int) {}
+}

idea/testData/quickfix/override/nothingToOverride/afterNoOpenSuperFunction.kt

@@ -1,11 +0,0 @@
-// "Change function signature to 'override fun f(a: Int)'" "false"
-// ERROR: 'f' overrides nothing
-// ACTION: Remove 'override' modifier
-open class A {
-    open fun foo() {}
-    fun f(a: Int) {}
-}
-
-class B : A(){
-    <caret>override fun f(a: String) {}
-}

idea/testData/quickfix/override/nothingToOverride/afterSwapParametersGenericClass.kt

@@ -0,0 +1,8 @@
+// "Change function signature to 'override fun f(y: S, x: List<Set<R>>)'" "true"
+trait A<P,Q> {
+    fun f(a: Q, b: List<Set<P>>)
+}
+
+class B<R,S> : A<R,S> {
+    <caret>override fun f(y: S, x: List<Set<R>>) {}
+}

idea/testData/quickfix/override/nothingToOverride/beforeAddFunction.kt

@@ -0,0 +1,6 @@
+// "Add 'open fun f()' to 'A'" "true"
+open class A {
+}
+class B : A() {
+    <caret>override fun f() {}
+}

idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionAbstractClass.kt

@@ -0,0 +1,6 @@
+// "Add 'abstract fun f()' to 'A'" "true"
+abstract class A {
+}
+class B : A() {
+    <caret>override fun f() {}
+}

idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionNoBody.kt

@@ -0,0 +1,5 @@
+// "Add 'open fun f()' to 'A'" "true"
+trait A
+class B : A {
+    <caret>override fun f() {}
+}

idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionNonUnitReturnType.kt

@@ -0,0 +1,6 @@
+// "Add 'open fun f(): Int' to 'A'" "true"
+open class A {
+}
+class B : A() {
+    <caret>override fun f(): Int = 5
+}

idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionTrait.kt

@@ -0,0 +1,6 @@
+// "Add 'open fun f()' to 'A'" "true"
+trait A {
+}
+class B : A {
+    <caret>override fun f() {}
+}

idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionTwoSuperclasses.kt

@@ -0,0 +1,8 @@
+// "Add function to supertype..." "true"
+open class A {
+}
+open class B : A() {
+}
+class C : B() {
+    <caret>override fun f() {}
+}

idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionTwoTraits.kt

@@ -0,0 +1,6 @@
+// "Add function to supertype..." "true"
+trait A {}
+trait B {}
+class C: A, B {
+  <caret>override fun foo() {}
+}

idea/testData/quickfix/override/nothingToOverride/beforeAddParameterGenericClass.kt

@@ -0,0 +1,8 @@
+// "Change function signature to 'override fun f(a: Int, x: T)'" "true"
+trait A<R> {
+    fun f(a: Int, b: R)
+}
+
+class B<T> : A<T> {
+    <caret>override fun f(x: T) {}
+}

idea/testData/quickfix/override/nothingToOverride/beforeAddParameterTwoSupertraits.kt

@@ -0,0 +1,11 @@
+// "Change function signature to 'override fun f(a: Int)'" "true"
+trait A {
+    fun f(a: Int)
+}
+
+trait B : A {
+}
+
+class C : B {
+    <caret>override fun f() {}
+}

idea/testData/quickfix/override/nothingToOverride/beforeAddParameterTwoSupertypes.kt

@@ -0,0 +1,11 @@
+// "Change function signature to 'override fun f(a: Int)'" "true"
+open class A {
+    open fun f(a: Int) {}
+}
+
+open class B : A() {
+}
+
+class C : B() {
+    <caret>override fun f() {}
+}

idea/testData/quickfix/override/nothingToOverride/beforeNoOpenSuperFunction.kt

@@ -1,5 +1,6 @@
 // "Change function signature to 'override fun f(a: Int)'" "false"
 // ERROR: 'f' overrides nothing
+// ACTION: Add 'open fun f(a: String)' to 'A'
 // ACTION: Remove 'override' modifier
 open class A {
     open fun foo() {}

idea/testData/quickfix/override/nothingToOverride/beforeSwapParametersGenericClass.kt

@@ -0,0 +1,8 @@
+// "Change function signature to 'override fun f(y: S, x: List<Set<R>>)'" "true"
+trait A<P,Q> {
+    fun f(a: Q, b: List<Set<P>>)
+}
+
+class B<R,S> : A<R,S> {
+    <caret>override fun f(x: List<Set<R>>, y: S) {}
+}

idea/testData/quickfix/override/typeMismatchOnOverride/afterChangeOverriddenPropertyType1.kt

@@ -0,0 +1,12 @@
+// "Change 'B.x' type to '(Int) -> Int'" "true"
+trait A {
+    val x: (Int) -> Int
+}
+
+trait B {
+    val x: (Int) -> Int
+}
+
+trait C : A, B {
+    override val x: (Int) -> Int<caret>
+}

idea/testData/quickfix/override/typeMismatchOnOverride/afterChangeOverriddenPropertyType2.kt

@@ -0,0 +1,12 @@
+// "Change 'A.x' type to 'String'" "true"
+trait A {
+    var x: String
+}
+
+trait B {
+    var x: String
+}
+
+trait C : A, B {
+    override var x: String<caret>
+}

idea/testData/quickfix/override/typeMismatchOnOverride/afterChangeOverridingPropertyTypeToFunctionType.kt

@@ -0,0 +1,7 @@
+// "Change 'B.x' type to '(String) -> Int'" "true"
+trait A {
+    var x: (String) -> Int
+}
+trait B : A {
+    override var x: (String) -> Int
+}

idea/testData/quickfix/override/typeMismatchOnOverride/afterChangeReturnTypeOfOverriddenFunction.kt

@@ -0,0 +1,12 @@
+// "Change 'A.foo' function return type to 'Long'" "true"
+trait A {
+    fun foo(): Long
+}
+
+trait B {
+    fun foo(): Number
+}
+
+trait C : A, B {
+    override fun foo(): Long<caret>
+}

idea/testData/quickfix/override/typeMismatchOnOverride/afterPropertyReturnTypeMismatchOnOverride.kt

@@ -1,4 +1,4 @@
-// "Change 'x' type to 'Int'" "true"
+// "Change 'A.x' type to 'Int'" "true"
 trait X {
     val x: Int
 }

idea/testData/quickfix/override/typeMismatchOnOverride/afterPropertyTypeMismatchOnOverrideIntLong.kt

@@ -1,4 +1,4 @@
-// "Change 'x' type to 'Int'" "true"
+// "Change 'B.x' type to 'Int'" "true"
 abstract class A {
     abstract var x : Int
 }

idea/testData/quickfix/override/typeMismatchOnOverride/afterPropertyTypeMismatchOnOverrideIntUnit.kt

@@ -1,4 +1,4 @@
-// "Change 'x' type to 'Int'" "true"
+// "Change 'B.x' type to 'Int'" "true"
 abstract class A {
     abstract var x : Int
 }

idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeMultipleOverriddenPropertiesTypes.kt

@@ -0,0 +1,14 @@
+// "Change 'A.x' type to '(Int) -> Int'" "false"
+// ACTION: Change 'C.x' type to '(String) -> Int'
+// ERROR: <html>Return type is '(jet.Int) &rarr; jet.Int', which is not a subtype of overridden<br/><b>internal</b> <b>abstract</b> <b>val</b> x: (jet.String) &rarr; jet.Int <i>defined in</i> A</html>
+trait A {
+    val x: (String) -> Int
+}
+
+trait B {
+    val x: (String) -> Any
+}
+
+trait C : A, B {
+    override val x: (Int) -> Int<caret>
+}

idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt

@@ -0,0 +1,13 @@
+// "Change 'A.x' type to 'String'" "false"
+// ERROR: <html>Var-property type is 'jet.String', which is not a type of overridden<br/><b>internal</b> <b>abstract</b> <b>var</b> x: jet.Int <i>defined in</i> A</html>
+trait A {
+    var x: Int
+}
+
+trait B {
+    var x: Any
+}
+
+trait C : A, B {
+    override var x: String<caret>
+}

idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangePropertyTypeToMatchOverridenProperties.kt

@@ -0,0 +1,13 @@
+// "Change 'C.x' type to 'String'" "false"
+// ERROR: <html>Var-property type is 'jet.Int', which is not a type of overridden<br/><b>internal</b> <b>abstract</b> <b>var</b> x: jet.String <i>defined in</i> A</html>
+trait A {
+    var x: String
+}
+
+trait B {
+    var x: Any
+}
+
+trait C : A, B {
+    override var x: Int<caret>
+}

idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeReturnTypeOfOverriddenFunction.kt

@@ -0,0 +1,13 @@
+// "Change 'A.foo' function return type to 'Long'" "false"
+// ERROR: <html>Return type is 'jet.Long', 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>
+trait A {
+    fun foo(): Int
+}
+
+trait B {
+    fun foo(): String
+}
+
+trait C : A, B {
+    override fun foo(): Long
+}

idea/testData/quickfix/override/typeMismatchOnOverride/beforeChangeOverriddenPropertyType1.kt

@@ -0,0 +1,12 @@
+// "Change 'B.x' type to '(Int) -> Int'" "true"
+trait A {
+    val x: (Int) -> Int
+}
+
+trait B {
+    val x: (String) -> Any
+}
+
+trait C : A, B {
+    override val x: (Int) -> Int<caret>
+}

idea/testData/quickfix/override/typeMismatchOnOverride/beforeChangeOverriddenPropertyType2.kt

@@ -0,0 +1,12 @@
+// "Change 'A.x' type to 'String'" "true"
+trait A {
+    var x: Int
+}
+
+trait B {
+    var x: String
+}
+
+trait C : A, B {
+    override var x: String<caret>
+}

idea/testData/quickfix/override/typeMismatchOnOverride/beforeChangeOverridingPropertyTypeToFunctionType.kt

@@ -0,0 +1,7 @@
+// "Change 'B.x' type to '(String) -> Int'" "true"
+trait A {
+    var x: (String) -> Int
+}
+trait B : A {
+    override var x: (Int) -> String<caret>
+}

idea/testData/quickfix/override/typeMismatchOnOverride/beforeChangeReturnTypeOfOverriddenFunction.kt

@@ -0,0 +1,12 @@
+// "Change 'A.foo' function return type to 'Long'" "true"
+trait A {
+    fun foo(): Int
+}
+
+trait B {
+    fun foo(): Number
+}
+
+trait C : A, B {
+    override fun foo(): Long<caret>
+}

idea/testData/quickfix/override/typeMismatchOnOverride/beforePropertyReturnTypeMismatchOnOverride.kt

@@ -1,4 +1,4 @@
-// "Change 'x' type to 'Int'" "true"
+// "Change 'A.x' type to 'Int'" "true"
 trait X {
     val x: Int
 }

idea/testData/quickfix/override/typeMismatchOnOverride/beforePropertyTypeMismatchOnOverrideIntLong.kt

@@ -1,4 +1,4 @@
-// "Change 'x' type to 'Int'" "true"
+// "Change 'B.x' type to 'Int'" "true"
 abstract class A {
     abstract var x : Int
 }

idea/testData/quickfix/override/typeMismatchOnOverride/beforePropertyTypeMismatchOnOverrideIntUnit.kt

@@ -1,4 +1,4 @@
-// "Change 'x' type to 'Int'" "true"
+// "Change 'B.x' type to 'Int'" "true"
 abstract class A {
     abstract var x : Int
 }

idea/testData/quickfix/typeAddition/afterChangeAccessorTypeToFunctionType.kt

@@ -0,0 +1,5 @@
+// "Change getter type to (String) -> Int" "true"
+class A {
+    val x: (String) -> Int
+        get(): (String) -> Int<caret> = {42}
+}

idea/testData/quickfix/typeAddition/beforeChangeAccessorTypeToFunctionType.kt

@@ -0,0 +1,5 @@
+// "Change getter type to (String) -> Int" "true"
+class A {
+    val x: (String) -> Int
+        get(): Int<caret> = {42}
+}

idea/testData/quickfix/typeMismatch/afterChangeFunctionLiteralParameterTypeToFunctionType.kt

@@ -0,0 +1,6 @@
+// "Change type from 'String' to '(Int) -> String'" "true"
+fun foo(f: ((Int) -> String) -> String) {
+    foo {
+        (f: (Int) -> String<caret>) -> f(42)
+    }
+}

idea/testData/quickfix/typeMismatch/afterChangeFunctionReturnTypeToMatchExpectedTypeOfCall.kt

@@ -0,0 +1,3 @@
+// "Change 'bar' function return type to 'String'" "true"
+fun bar(): String = ""
+fun foo(): String = bar(<caret>)

idea/testData/quickfix/typeMismatch/afterPropertyTypeMismatch.kt

@@ -0,0 +1,4 @@
+// "Change 'f' type to '(Long) -> Unit'" "true"
+fun foo() {
+    var f: (Long) -> Unit = if (true) { (x: Long) ->  }<caret> else { (x: Long) ->  }
+}

idea/testData/quickfix/typeMismatch/beforeChangeFunctionLiteralParameterTypeToFunctionType.kt

@@ -0,0 +1,6 @@
+// "Change type from 'String' to '(Int) -> String'" "true"
+fun foo(f: ((Int) -> String) -> String) {
+    foo {
+        (f: String<caret>) -> f(42)
+    }
+}

idea/testData/quickfix/typeMismatch/beforeChangeFunctionReturnTypeToMatchExpectedTypeOfCall.kt

@@ -0,0 +1,3 @@
+// "Change 'bar' function return type to 'String'" "true"
+fun bar(): Any = ""
+fun foo(): String = bar(<caret>)

idea/testData/quickfix/typeMismatch/beforeDontChangeOverriddenPropertyTypeToErrorType.kt

@@ -0,0 +1,10 @@
+// "Change 'B.x' type to '(String) -> [ERROR : Ay]'" "false"
+// ACTION: Change 'A.x' type to '(Int) -> Int'
+// ERROR: <html>Return type is '(jet.Int) &rarr; jet.Int', which is not a subtype of overridden<br/><b>internal</b> <b>abstract</b> <b>val</b> x: (jet.String) &rarr; [ERROR : Ay] <i>defined in</i> A</html>
+// ERROR: Unresolved reference: Ay
+trait A {
+    val x: (String) -> Ay
+}
+trait B : A {
+    override val x: (Int) -> Int<caret>
+}

idea/testData/quickfix/typeMismatch/beforePropertyTypeMismatch.kt

@@ -0,0 +1,4 @@
+// "Change 'f' type to '(Long) -> Unit'" "true"
+fun foo() {
+    var f: Int = if (true) { (x: Long) ->  }<caret> else { (x: Long) ->  }
+}

idea/testData/quickfix/typeMismatch/casts/afterCastToFunctionType.kt

@@ -0,0 +1,4 @@
+// "Cast expression 'x' to '() -> Int'" "true"
+fun foo(x: Any): () -> Int {
+    return x as () -> Int<caret>
+}

idea/testData/quickfix/typeMismatch/casts/beforeCastToFunctionType.kt

@@ -0,0 +1,4 @@
+// "Cast expression 'x' to '() -> Int'" "true"
+fun foo(x: Any): () -> Int {
+    return x<caret>
+}

idea/testData/quickfix/typeMismatch/fixOverloadedOperator/afterChangeNotFunctionReturnType.kt

@@ -0,0 +1,7 @@
+// "Change 'A.not' function return type to 'A'" "true"
+trait A {
+    fun not(): A
+    fun times(a: A): A
+}
+
+fun foo(a: A): A = a * <caret>!(if (true) a else a)

idea/testData/quickfix/typeMismatch/fixOverloadedOperator/afterChangePlusFunctionReturnType.kt

@@ -0,0 +1,8 @@
+// "Change 'A.plus' function return type to '() -> Int'" "true"
+trait A {
+    fun plus(a: A): () -> Int
+}
+
+fun foo(a: A): () -> Int {
+    return a + a<caret>
+}

idea/testData/quickfix/typeMismatch/fixOverloadedOperator/afterChangeTimesFunctionParameterType.kt

@@ -0,0 +1,6 @@
+// "Change parameter 'a' type of function 'A.times' to 'String'" "true"
+trait A {
+    fun times(a: String): A
+}
+
+fun foo(a: A): A = a * <caret>""

idea/testData/quickfix/typeMismatch/fixOverloadedOperator/beforeChangeNotFunctionReturnType.kt

@@ -0,0 +1,7 @@
+// "Change 'A.not' function return type to 'A'" "true"
+trait A {
+    fun not(): String
+    fun times(a: A): A
+}
+
+fun foo(a: A): A = a * <caret>!(if (true) a else a)

idea/testData/quickfix/typeMismatch/fixOverloadedOperator/beforeChangePlusFunctionReturnType.kt

@@ -0,0 +1,8 @@
+// "Change 'A.plus' function return type to '() -> Int'" "true"
+trait A {
+    fun plus(a: A): String
+}
+
+fun foo(a: A): () -> Int {
+    return a + a<caret>
+}

idea/testData/quickfix/typeMismatch/fixOverloadedOperator/beforeChangeTimesFunctionParameterType.kt

@@ -0,0 +1,6 @@
+// "Change parameter 'a' type of function 'A.times' to 'String'" "true"
+trait A {
+    fun times(a: A): A
+}
+
+fun foo(a: A): A = a * <caret>""

idea/testData/quickfix/typeMismatch/parameterTypeMismatch/afterChangeFunctionParameterType1.kt

@@ -0,0 +1,5 @@
+// "Change parameter 'x' type of function 'bar.foo' to '(String) -> Int'" "true"
+package bar
+fun foo(w: Int = 0, x: (String) -> Int, y: Int = 0, z: (Int) -> Int = {42}) {
+    foo(1, {(a: String) -> 42}<caret>, 1)
+}

idea/testData/quickfix/typeMismatch/parameterTypeMismatch/afterChangeFunctionParameterType2.kt

@@ -0,0 +1,4 @@
+// "Change parameter 'y' type of function 'foo' to 'String'" "true"
+fun foo(v: Int, w: Int = 0, x: Int = 0, y: String, z: (Int) -> Int = {42}) {
+    foo(0, 1, y = ""<caret>)
+}

idea/testData/quickfix/typeMismatch/parameterTypeMismatch/afterChangeFunctionParameterType3.kt

@@ -0,0 +1,4 @@
+// "Change parameter 'z' type of function 'foo' to '(Int) -> Unit'" "true"
+fun foo(w: Int = 0, x: Int, y: Int = 0, z: (Int) -> Unit) {
+    foo(0, 1) {<caret>}
+}

idea/testData/quickfix/typeMismatch/parameterTypeMismatch/afterChangePrimaryConstructorParameterType.kt

@@ -0,0 +1,5 @@
+// "Change parameter 'a' type of primary constructor of class 'B' to 'String'" "true"
+class B(val a: String)
+fun foo() {
+    B(if (true) ""<caret> else "")
+}

idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType1.kt

@@ -0,0 +1,5 @@
+// "Change parameter 'x' type of function 'bar.foo' to '(String) -> Int'" "true"
+package bar
+fun foo(w: Int = 0, x: Int, y: Int = 0, z: (Int) -> Int = {42}) {
+    foo(1, {(a: String) -> 42}<caret>, 1)
+}

idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType2.kt

@@ -0,0 +1,4 @@
+// "Change parameter 'y' type of function 'foo' to 'String'" "true"
+fun foo(v: Int, w: Int = 0, x: Int = 0, y: Int, z: (Int) -> Int = {42}) {
+    foo(0, 1, y = ""<caret>)
+}

idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType3.kt

@@ -0,0 +1,4 @@
+// "Change parameter 'z' type of function 'foo' to '(Int) -> Unit'" "true"
+fun foo(w: Int = 0, x: Int, y: Int = 0, z: (Int) -> String) {
+    foo(0, 1) {<caret>}
+}

idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType4.kt

@@ -0,0 +1,8 @@
+// "Change parameter 'z' type of function 'foo' to '(Int) -> String'" "false"
+// ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>jet.Int</td></tr><tr><td>Found:</td><td>jet.String</td></tr></table></html>
+fun foo(y: Int = 0, z: (Int) -> String = {""}) {
+    foo {
+        ""<caret>: Int
+        ""
+    }
+}

idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType5.kt

@@ -0,0 +1,5 @@
+// "Change parameter 'y' type of function 'foo' to 'Int'" "false"
+// ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>jet.Int</td></tr><tr><td>Found:</td><td>jet.String</td></tr></table></html>
+fun foo(y: Int = 0, z: (Int) -> String = {""}) {
+    foo(""<caret>: Int)
+}

idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangePrimaryConstructorParameterType.kt

@@ -0,0 +1,5 @@
+// "Change parameter 'a' type of primary constructor of class 'B' to 'String'" "true"
+class B(val a: Int)
+fun foo() {
+    B(if (true) ""<caret> else "")
+}

idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterAssignmentTypeMismatch.kt

@@ -0,0 +1,7 @@
+// "Change 'f' type to '() -> Unit'" "true"
+fun foo() {
+    val f: () -> Unit = {
+        var x = 1
+        x += 21<caret>
+    }
+}

idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterChangeFunctionLiteralTypeWithoutChangingFunctionParameterType.kt

@@ -0,0 +1,7 @@
+// "Change function literal return type to 'String'" "true"
+fun foo(f: (String) -> Any) {
+    foo {
+        (s: String): String ->
+        s<caret>
+    }
+}

idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterChangeFunctionLiteralTypeWithoutChangingPropertyType.kt

@@ -0,0 +1,7 @@
+// "Change function literal return type to 'String'" "true"
+fun foo() {
+    val f: (String) -> String = {
+        (s: Any): String ->
+        ""<caret>
+    }
+}

idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterChangeFunctionReturnTypeToFunctionType.kt

@@ -0,0 +1,4 @@
+// "Change 'foo' function return type to '(Long) -> Int'" "true"
+fun foo(x: Any): (Long) -> Int {
+    return {(x: Long) -> 42}<caret>
+}

idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterChangeFunctionReturnTypeToMatchReturnTypeOfReturnedLiteral.kt

@@ -0,0 +1,4 @@
+// "Change 'foo' function return type to '() -> Any'" "true"
+fun foo(x: Any): () -> Any {
+    return {x<caret>}
+}

idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterExpectedTypeMismatch.kt

@@ -0,0 +1,7 @@
+// "Change 'bar' type to '(() -> Long) -> Unit'" "true"
+fun foo() {
+    val bar: (() -> Long) -> Unit = {
+        (f: () -> Long): Unit ->
+        var x = 5<caret>
+    }
+}

idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterPropertyGetterInitializerTypeMismatch.kt

@@ -0,0 +1,6 @@
+// "Change 'A.x' type to '() -> Int'" "true"
+class A {
+    var x: () -> Int
+        get(): () -> Int = if (true) { {42}<caret> } else { {24} }
+        set(i: () -> Int) {}
+}

idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterReturnedExpressionTypeMismatchFunctionParameterType.kt

@@ -0,0 +1,6 @@
+// "Change parameter 'f' type of function 'foo' to '() -> String'" "true"
+fun foo(f: () -> String) {
+    foo {
+        ""<caret>
+    }
+}