Fixed tests after adding error checking for intention tests.

idea/testData/intentions/declarations/convertMemberToExtension/functionType.kt

@@ -1,3 +1,5 @@
 class Owner {
-    fun <caret>f(p: () -> Unit): (Int) -> String {}
-}
+    fun <caret>f(p: () -> Unit): (Int) -> String {
+        return { it.toString() }
+    }
+}

idea/testData/intentions/declarations/convertMemberToExtension/functionType.kt.after

@@ -2,4 +2,5 @@ class Owner {
 }
 
 fun Owner.f(p: () -> Unit): (Int) -> String {
-}
+    return { it.toString() }
+}

idea/testData/intentions/declarations/convertMemberToExtension/genericFunInGenericClass.kt

@@ -1,3 +1,3 @@
 abstract class Owner<T> {
-    fun <caret>f<R>(t: T, r: R): R = t
-}
+    fun <caret>f<R>(t: T, r: R): R = r
+}

idea/testData/intentions/declarations/convertMemberToExtension/genericFunInGenericClass.kt.after

@@ -1,4 +1,4 @@
 abstract class Owner<T> {
 }
 
-fun <T, R> Owner<T>.f(t: T, r: R): R = t
+fun <T, R> Owner<T>.f(t: T, r: R): R = r

idea/testData/intentions/declarations/convertMemberToExtension/genericFunInGenericClassWithUpperBounds.kt

@@ -1,3 +1,3 @@
 abstract class Owner<T, X: List<T>> {
-    fun <R: T> <caret>f(t: T, r: R): R = t
-}
+    fun <R: T> <caret>f(t: T, r: R): R = r
+}

idea/testData/intentions/declarations/convertMemberToExtension/genericFunInGenericClassWithUpperBounds.kt.after

@@ -1,4 +1,4 @@
 abstract class Owner<T, X: List<T>> {
 }
 
-fun <T, X : List<T>, R : T> Owner<T, X>.f(t: T, r: R): R = t
+fun <T, X : List<T>, R : T> Owner<T, X>.f(t: T, r: R): R = r

idea/testData/intentions/declarations/convertMemberToExtension/genericProperty.kt

@@ -1,3 +1,5 @@
+// ERROR: Property must be initialized or be abstract
+
 class Owner<T> {
     val <R> <caret>p: R
-}
+}

idea/testData/intentions/declarations/convertMemberToExtension/genericProperty.kt.after

@@ -1,5 +1,7 @@
+// ERROR: Property must be initialized or be abstract
+
 class Owner<T> {
 }
 
 val <T, R> Owner<T>.p: R
-    get() = <caret><selection>throw UnsupportedOperationException()</selection>
+    get() = <caret><selection>throw UnsupportedOperationException()</selection>

idea/testData/intentions/declarations/convertMemberToExtension/protected.kt

@@ -1,3 +1,3 @@
 abstract class Owner {
-    protected fun <caret>f() = 1
-}
+    protected fun <caret>f(): Int = 1
+}

idea/testData/intentions/declarations/convertMemberToExtension/protected.kt.after

@@ -1,4 +1,4 @@
 abstract class Owner {
 }
 
-fun Owner.f() = 1
+fun Owner.f(): Int = 1

idea/testData/intentions/declarations/convertMemberToExtension/public.kt

@@ -1,3 +1,3 @@
 abstract class Owner {
-    public fun <caret>f() = 1
-}
+    public fun <caret>f(): Int = 1
+}

idea/testData/intentions/declarations/convertMemberToExtension/public.kt.after

@@ -1,4 +1,4 @@
 abstract class Owner {
 }
 
-public fun Owner.f() = 1
+public fun Owner.f(): Int = 1

idea/testData/intentions/declarations/convertMemberToExtension/typeFqName.kt

@@ -1,3 +1,5 @@
 class Owner {
-    fun <caret>f(p: kotlin.Int): kotlin.String {}
-}
+    fun <caret>f(p: kotlin.Int): kotlin.String {
+        return p.toString()
+    }
+}

idea/testData/intentions/declarations/convertMemberToExtension/typeFqName.kt.after

@@ -2,4 +2,5 @@ class Owner {
 }
 
 fun Owner.f(p: kotlin.Int): kotlin.String {
-}
+    return p.toString()
+}

idea/testData/intentions/declarations/convertMemberToExtension/unknownType.kt

@@ -1,3 +1,8 @@
+// ERROR: A 'return' expression required in a function with a block body ('{...}')
+// ERROR: Unresolved reference: Foo
+// ERROR: Unresolved reference: bar
+
 class Owner {
-    fun <caret>f(p: Foo): bar.Baz {}
-}
+    fun <caret>f(p: Foo): bar.Baz {
+    }
+}

idea/testData/intentions/declarations/convertMemberToExtension/unknownType.kt.after

@@ -1,5 +1,9 @@
+// ERROR: A 'return' expression required in a function with a block body ('{...}')
+// ERROR: Unresolved reference: Foo
+// ERROR: Unresolved reference: bar
+
 class Owner {
 }
 
 fun Owner.f(p: Foo): bar.Baz {
-}
+}

idea/testData/intentions/declarations/convertMemberToExtension/valWithDefaultGetter.kt

@@ -1,4 +1,5 @@
+// ERROR: Property must be initialized or be abstract
 class Owner {
     val <caret>p: Int
       get
-}
+}

idea/testData/intentions/declarations/convertMemberToExtension/valWithDefaultGetter.kt.after

@@ -1,5 +1,6 @@
+// ERROR: Property must be initialized or be abstract
 class Owner {
 }
 
 val Owner.p: Int
-    get() = <caret><selection>throw UnsupportedOperationException()</selection>
+    get() = <caret><selection>throw UnsupportedOperationException()</selection>

idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultGetterAndSetter.kt

@@ -1,5 +1,6 @@
+// ERROR: Property must be initialized or be abstract
 class Owner {
     var <caret>p: Int
       get
       set
-}
+}

idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultGetterAndSetter.kt.after

@@ -1,3 +1,4 @@
+// ERROR: Property must be initialized or be abstract
 class Owner {
 }
 
@@ -5,4 +6,4 @@ var Owner.p: Int
     get() = <caret><selection>throw UnsupportedOperationException()</selection>
     set(value) {
         throw UnsupportedOperationException()
-    }
+    }

idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultSetter.kt

@@ -1,5 +1,6 @@
+// ERROR: Property must be initialized
 class Owner {
     var <caret>p: Int
       get() = 1
       set
-}
+}

idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultSetter.kt.after

@@ -1,3 +1,4 @@
+// ERROR: Property must be initialized
 class Owner {
 }
 
@@ -5,4 +6,4 @@ var Owner.p: Int
     get() = 1
     set(value) {
         <caret><selection>throw UnsupportedOperationException()</selection>
-    }
+    }

idea/testData/intentions/declarations/convertMemberToExtension/varWithGetter.kt

@@ -1,4 +1,5 @@
+// ERROR: Property must be initialized
 class Owner {
     var <caret>p: Int
-      get {return 1}
-}
+      get() { return 1 }
+}

idea/testData/intentions/declarations/convertMemberToExtension/varWithGetter.kt.after

@@ -1,10 +1,11 @@
+// ERROR: Property must be initialized
 class Owner {
 }
 
 var Owner.p: Int
-    get {
+    get() {
         return 1
     }
     set(value) {
         <caret><selection>throw UnsupportedOperationException()</selection>
-    }
+    }

idea/testData/intentions/declarations/convertMemberToExtension/varWithSetter.kt

@@ -1,4 +1,5 @@
+// ERROR: Property must be initialized
 class Owner {
     var <caret>p: Int
       set(v) {}
-}
+}

idea/testData/intentions/declarations/convertMemberToExtension/varWithSetter.kt.after

@@ -1,7 +1,8 @@
+// ERROR: Property must be initialized
 class Owner {
 }
 
 var Owner.p: Int
     get() = <caret><selection>throw UnsupportedOperationException()</selection>
     set(v) {
-    }
+    }

idea/testData/intentions/declarations/convertMemberToExtension/withType.kt

@@ -1,3 +1,3 @@
 class Owner {
-    fun <caret>f(): Int {}
-}
+    fun <caret>f(): Int { return 1 }
+}

idea/testData/intentions/declarations/convertMemberToExtension/withType.kt.after

@@ -2,4 +2,5 @@ class Owner {
 }
 
 fun Owner.f(): Int {
-}
+    return 1
+}