diff --git a/idea/resources/fileTemplates/code/New Kotlin Function Body.kt.ft b/idea/resources/fileTemplates/code/New Kotlin Function Body.kt.ft
index 4b3a72fd123..db91f59e605 100644
--- a/idea/resources/fileTemplates/code/New Kotlin Function Body.kt.ft	
+++ b/idea/resources/fileTemplates/code/New Kotlin Function Body.kt.ft	
@@ -1 +1 @@
-TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
\ No newline at end of file
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/dataMethod.kt.after b/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/dataMethod.kt.after
index 9e98c39f744..a3cea12dfd7 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/dataMethod.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/dataMethod.kt.after
@@ -5,6 +5,6 @@ import org.junit.runners.Parameterized
 class A {
     @Parameterized.Parameters
     fun data(): Collection<Array<Any>> {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUp.kt.after b/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUp.kt.after
index 60535967ca5..663bc141a3f 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUp.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUp.kt.after
@@ -5,6 +5,6 @@ import org.junit.Before
 class A {
     @Before
     fun setUp() {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUpExists.kt.after b/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUpExists.kt.after
index ff4c414f1da..a30032869ee 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUpExists.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUpExists.kt.after
@@ -5,7 +5,7 @@ import org.junit.Before
 class A {
     @org.testng.annotations.BeforeMethod
     fun setUp() {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
     @Before
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDown.kt.after b/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDown.kt.after
index 2dac3329f77..b3d7f5a84bd 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDown.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDown.kt.after
@@ -5,6 +5,6 @@ import org.junit.After
 class A {
     @After
     fun tearDown() {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDownExists.kt.after b/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDownExists.kt.after
index 4580ba1ffa7..da36100a7d2 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDownExists.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDownExists.kt.after
@@ -5,7 +5,7 @@ import org.junit.After
 class A {
     @org.testng.annotations.AfterMethod
     fun tearDown() {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
     @After
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt.after b/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt.after
index a5ba54d6a35..3c08dfe45a0 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt.after
@@ -5,6 +5,6 @@ import org.junit.Test
 class A {
     @Test
     fun name() {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/junit3/testMethod.kt.after b/idea/testData/codeInsight/generate/testFrameworkSupport/junit3/testMethod.kt.after
index e4a3ec40d2a..f9356b26708 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/junit3/testMethod.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/junit3/testMethod.kt.after
@@ -4,6 +4,6 @@ import junit.framework.TestCase
 
 class A : TestCase() {
     fun testName() {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt.after b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt.after
index c6065bae128..859ca021d07 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt.after
@@ -6,6 +6,6 @@ import org.testng.annotations.Test
 @Test class A {
     @DataProvider(name = "name")
     fun name(): Array<Array<Any>> {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUp.kt.after b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUp.kt.after
index 2b1160f5dfe..5ae952f029e 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUp.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUp.kt.after
@@ -6,6 +6,6 @@ import org.testng.annotations.Test
 @Test class A {
     @BeforeMethod
     fun setUp() {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDown.kt.after b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDown.kt.after
index 2ed9609fd48..a601b061672 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDown.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDown.kt.after
@@ -6,6 +6,6 @@ import org.testng.annotations.Test
 @Test class A {
     @AfterMethod
     fun tearDown() {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/testMethod.kt.after b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/testMethod.kt.after
index 62e5819e386..56f84e11198 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/testMethod.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/testMethod.kt.after
@@ -5,6 +5,6 @@ import org.testng.annotations.Test
 @Test class A {
     @Test
     fun testName() {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/copyKDoc.kt.after b/idea/testData/codeInsight/overrideImplement/copyKDoc.kt.after
index c051dd27ed4..d1ce01dd0ea 100644
--- a/idea/testData/codeInsight/overrideImplement/copyKDoc.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/copyKDoc.kt.after
@@ -11,6 +11,6 @@ class B : A() {
      * @see TEST
      */
     override fun foo() {
-        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/defaultValues.kt.after b/idea/testData/codeInsight/overrideImplement/defaultValues.kt.after
index ab32064e6b5..482c3aba0e2 100644
--- a/idea/testData/codeInsight/overrideImplement/defaultValues.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/defaultValues.kt.after
@@ -4,6 +4,6 @@ interface T {
 
 class C : T {
     override fun foo(a: Int) {
-        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/delegatedMembers.kt.after b/idea/testData/codeInsight/overrideImplement/delegatedMembers.kt.after
index cda099f81c0..cc15d1330cc 100644
--- a/idea/testData/codeInsight/overrideImplement/delegatedMembers.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/delegatedMembers.kt.after
@@ -5,7 +5,7 @@ interface T {
 
 class C(t :T) : T by t {
     override fun bar() {
-        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 
     override fun equals(other: Any?): Boolean {
@@ -13,7 +13,7 @@ class C(t :T) : T by t {
     }
 
     override fun foo() {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
     override fun hashCode(): Int {
diff --git a/idea/testData/codeInsight/overrideImplement/doNotOverrideFinal.kt.after b/idea/testData/codeInsight/overrideImplement/doNotOverrideFinal.kt.after
index 74f935b4b1e..4287dc0ee7e 100644
--- a/idea/testData/codeInsight/overrideImplement/doNotOverrideFinal.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/doNotOverrideFinal.kt.after
@@ -23,7 +23,7 @@ class C : B(), I {
     }
 
     override fun g() {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
     override fun hashCode(): Int {
diff --git a/idea/testData/codeInsight/overrideImplement/emptyClassBodyFunctionMethod.kt.after b/idea/testData/codeInsight/overrideImplement/emptyClassBodyFunctionMethod.kt.after
index ccd6336f5fa..6aa7f228cb0 100644
--- a/idea/testData/codeInsight/overrideImplement/emptyClassBodyFunctionMethod.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/emptyClassBodyFunctionMethod.kt.after
@@ -5,6 +5,6 @@ interface T {
 
 class C : T {
     override fun Foo(): (String) -> Unit {
-        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/functionMethod.kt.after b/idea/testData/codeInsight/overrideImplement/functionMethod.kt.after
index ccd6336f5fa..6aa7f228cb0 100644
--- a/idea/testData/codeInsight/overrideImplement/functionMethod.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/functionMethod.kt.after
@@ -5,6 +5,6 @@ interface T {
 
 class C : T {
     override fun Foo(): (String) -> Unit {
-        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt.after b/idea/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt.after
index e0f2e1cce39..3e645f23f55 100644
--- a/idea/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt.after
@@ -4,6 +4,6 @@ interface Trait {
 
 class TraitImpl : Trait {
     override fun <A, B : Runnable, E : Map.Entry<A, B>> foo() where B : Cloneable, B : Comparable<B> {
-        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/generateMulti.kt.after b/idea/testData/codeInsight/overrideImplement/generateMulti.kt.after
index 3be9ff771df..bc85cea0b6f 100644
--- a/idea/testData/codeInsight/overrideImplement/generateMulti.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/generateMulti.kt.after
@@ -8,14 +8,14 @@ interface Some<T> {
 
 class SomeOther<S> : Some<S> {
     override fun someFoo() {
-        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 
     override fun someGenericFoo(): S {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
     override fun someOtherFoo(): Int {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/genericMethod.kt.after b/idea/testData/codeInsight/overrideImplement/genericMethod.kt.after
index 3173a01cbd9..d217b342bfc 100644
--- a/idea/testData/codeInsight/overrideImplement/genericMethod.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/genericMethod.kt.after
@@ -4,6 +4,6 @@ interface G<T> {
 
 class GC() : G<Int> {
     override fun foo(t: Int): Int {
-        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
diff --git a/idea/testData/codeInsight/overrideImplement/genericTypesSeveralMethods.kt.after b/idea/testData/codeInsight/overrideImplement/genericTypesSeveralMethods.kt.after
index 58aa8eb3e07..a1c05cd4ba0 100644
--- a/idea/testData/codeInsight/overrideImplement/genericTypesSeveralMethods.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/genericTypesSeveralMethods.kt.after
@@ -2,6 +2,6 @@
 
 class MyClass<A: Comparable<A>> : Iterable<A> {
     override fun iterator(): Iterator<A> {
-        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/implementFunctionType.kt.after b/idea/testData/codeInsight/overrideImplement/implementFunctionType.kt.after
index 8c4c6f88a8e..bd25ba5cc6f 100644
--- a/idea/testData/codeInsight/overrideImplement/implementFunctionType.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/implementFunctionType.kt.after
@@ -1,5 +1,5 @@
 class C : (String) -> Boolean {
     override fun invoke(p1: String): Boolean {
-        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/implementJavaRawSubclass/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/implementJavaRawSubclass/foo/Impl.kt.after
index 03c1f03707e..7752567aadd 100644
--- a/idea/testData/codeInsight/overrideImplement/implementJavaRawSubclass/foo/Impl.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/implementJavaRawSubclass/foo/Impl.kt.after
@@ -3,6 +3,6 @@ import foo.B
 
 class C : A() {
     override fun foo(x: MutableList<Any?>?, y: String?): B<*> {
-        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
diff --git a/idea/testData/codeInsight/overrideImplement/implementSamAdapters/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/implementSamAdapters/foo/Impl.kt.after
index 30bf03f0c6b..b7f113fa332 100644
--- a/idea/testData/codeInsight/overrideImplement/implementSamAdapters/foo/Impl.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/implementSamAdapters/foo/Impl.kt.after
@@ -2,6 +2,6 @@ package foo
 
 class Impl: B {
     override fun foo(r: Runnable?) {
-        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
diff --git a/idea/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.after
index 7ad9f73f122..738daafa914 100644
--- a/idea/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.after
@@ -2,6 +2,6 @@ import foo.Intf
 
 class Impl(): Intf {
     override fun getFooBar(): String {
-        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
diff --git a/idea/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.after
index c1d693e8494..5e6799fee6c 100644
--- a/idea/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.after
@@ -2,6 +2,6 @@ import foo.Intf
 
 class Impl(): Intf {
     override fun fooBar(i: Int, s: Array<out String>?, foo: Any?) {
-        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
diff --git a/idea/testData/codeInsight/overrideImplement/localClass.kt.after b/idea/testData/codeInsight/overrideImplement/localClass.kt.after
index bf5784c95af..5822c9a3546 100644
--- a/idea/testData/codeInsight/overrideImplement/localClass.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/localClass.kt.after
@@ -7,7 +7,7 @@ fun f() {
 
     object : C<R>() {
         override fun f(a: R) {
-            <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+            <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
         }
     }
 }
diff --git a/idea/testData/codeInsight/overrideImplement/multipleSupers.kt.after b/idea/testData/codeInsight/overrideImplement/multipleSupers.kt.after
index a9fef6855e7..e1ef045a435 100644
--- a/idea/testData/codeInsight/overrideImplement/multipleSupers.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/multipleSupers.kt.after
@@ -8,7 +8,7 @@ interface B {
 
 class C : A(), B {
     override fun bar() {
-        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 
     override fun equals(other: Any?): Boolean {
diff --git a/idea/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt.after b/idea/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt.after
index a9a29877bd4..2da1da10ee8 100644
--- a/idea/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt.after
@@ -4,6 +4,6 @@ interface A {
 
 class B : A {
     override fun String.foo() {
-        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/overrideFunctionProperty.kt.after b/idea/testData/codeInsight/overrideImplement/overrideFunctionProperty.kt.after
index 93d07fcb0ea..0d439333af0 100644
--- a/idea/testData/codeInsight/overrideImplement/overrideFunctionProperty.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/overrideFunctionProperty.kt.after
@@ -1,4 +1,3 @@
-// ERROR: Unresolved reference: println
 open class A() {
     open val method : () -> Unit? = {println("hello")}
 }
diff --git a/idea/testData/codeInsight/overrideImplement/overrideGenericFunction.kt.after b/idea/testData/codeInsight/overrideImplement/overrideGenericFunction.kt.after
index 8fe7ef7df91..faaaf25d70c 100644
--- a/idea/testData/codeInsight/overrideImplement/overrideGenericFunction.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/overrideGenericFunction.kt.after
@@ -1,4 +1,3 @@
-// ERROR: Unresolved reference: println
 interface A<T> {
     fun foo(value : T) : Unit = println(value)
 }
diff --git a/idea/testData/codeInsight/overrideImplement/overrideRespectCaretPosition.kt.after b/idea/testData/codeInsight/overrideImplement/overrideRespectCaretPosition.kt.after
index 240b4493fe4..62d5cbf3cd7 100644
--- a/idea/testData/codeInsight/overrideImplement/overrideRespectCaretPosition.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/overrideRespectCaretPosition.kt.after
@@ -1,4 +1,3 @@
-// ERROR: Unresolved reference: println
 open class A() {
     open fun foo(value : Int) : Unit = println(value)
     open val bar : Int = 0
diff --git a/idea/testData/codeInsight/overrideImplement/privateJavaMethod/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/privateJavaMethod/foo/Impl.kt.after
index 4f85ea76bdf..8b88b83b6a2 100644
--- a/idea/testData/codeInsight/overrideImplement/privateJavaMethod/foo/Impl.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/privateJavaMethod/foo/Impl.kt.after
@@ -20,6 +20,6 @@ class C : A(), I {
     }
 
     override fun z() {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after b/idea/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after
index 8819a883a49..be5a975d16b 100644
--- a/idea/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after
@@ -6,7 +6,7 @@ interface Test {
 class SomeTest : Test {
     val hello = 12
     override fun test() {
-        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 
     override val testProp: Int
diff --git a/idea/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt.after
index cd7fde4e142..6f5308b7b29 100644
--- a/idea/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt.after
@@ -3,7 +3,7 @@ import lib.ArrayFactory
 
 public class Impl : ArrayFactory {
     override fun create(): lib.Array {
-        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
 
diff --git a/idea/testData/codeInsight/overrideImplement/starProjections.kt.after b/idea/testData/codeInsight/overrideImplement/starProjections.kt.after
index d37578c4cb4..6e96802793f 100644
--- a/idea/testData/codeInsight/overrideImplement/starProjections.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/starProjections.kt.after
@@ -6,6 +6,6 @@ interface Base {
 
 class Derived : Base {
     override fun foo(c: C<*>) {
-        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/superPreference.kt.after b/idea/testData/codeInsight/overrideImplement/superPreference.kt.after
index bf88498eefd..788374516cb 100644
--- a/idea/testData/codeInsight/overrideImplement/superPreference.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/superPreference.kt.after
@@ -30,15 +30,15 @@ abstract class B : I2, A(), I3 {
     }
 
     override fun i() {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
     override fun i1() {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
     override fun i2() {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
     override fun toString(): String {
diff --git a/idea/testData/codeInsight/overrideImplement/traitGenericImplement.kt.after b/idea/testData/codeInsight/overrideImplement/traitGenericImplement.kt.after
index f869a89549a..b0e8abc8239 100644
--- a/idea/testData/codeInsight/overrideImplement/traitGenericImplement.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/traitGenericImplement.kt.after
@@ -4,6 +4,6 @@ interface G<T> {
 
 class GC<T>() : G<T> {
     override fun foo(t: T): T {
-        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/traitNullableFunction.kt.after b/idea/testData/codeInsight/overrideImplement/traitNullableFunction.kt.after
index 6e9a8733613..f431468fd45 100644
--- a/idea/testData/codeInsight/overrideImplement/traitNullableFunction.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/traitNullableFunction.kt.after
@@ -4,6 +4,6 @@ interface Some {
 
 class SomeOther : Some {
     override fun foo(some: Int?): Int {
-        <selection><caret>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/intentions/implementAbstractMember/function/enumClass.kt.after b/idea/testData/intentions/implementAbstractMember/function/enumClass.kt.after
index 139b1eba9ce..8db5cb1cec8 100644
--- a/idea/testData/intentions/implementAbstractMember/function/enumClass.kt.after
+++ b/idea/testData/intentions/implementAbstractMember/function/enumClass.kt.after
@@ -8,6 +8,6 @@ enum class E : T<Int> {
     A, B, C;
 
     override fun foo(x: Int): Int {
-        <caret><selection>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <caret><selection>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/intentions/implementAbstractMember/function/enumClassWithSemicolon.kt.after b/idea/testData/intentions/implementAbstractMember/function/enumClassWithSemicolon.kt.after
index 139b1eba9ce..8db5cb1cec8 100644
--- a/idea/testData/intentions/implementAbstractMember/function/enumClassWithSemicolon.kt.after
+++ b/idea/testData/intentions/implementAbstractMember/function/enumClassWithSemicolon.kt.after
@@ -8,6 +8,6 @@ enum class E : T<Int> {
     A, B, C;
 
     override fun foo(x: Int): Int {
-        <caret><selection>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <caret><selection>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/intentions/implementAbstractMember/function/enumClassWithSemicolonAndMembers.kt.after b/idea/testData/intentions/implementAbstractMember/function/enumClassWithSemicolonAndMembers.kt.after
index 22c122847e7..0bd527783f4 100644
--- a/idea/testData/intentions/implementAbstractMember/function/enumClassWithSemicolonAndMembers.kt.after
+++ b/idea/testData/intentions/implementAbstractMember/function/enumClassWithSemicolonAndMembers.kt.after
@@ -8,7 +8,7 @@ enum class E : T<Int> {
     A, B, C;
 
     override fun foo(x: Int): Int {
-        <caret><selection>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <caret><selection>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 
     val bar = 1
diff --git a/idea/testData/intentions/implementAbstractMember/function/enumEntries.kt.after b/idea/testData/intentions/implementAbstractMember/function/enumEntries.kt.after
index 0e8efeb9c24..7be65e50319 100644
--- a/idea/testData/intentions/implementAbstractMember/function/enumEntries.kt.after
+++ b/idea/testData/intentions/implementAbstractMember/function/enumEntries.kt.after
@@ -3,15 +3,15 @@
 enum class E {
     A {
         override fun foo(x: Int): Int {
-            throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
         }
     }, B {
         override fun foo(x: Int): Int {
-            throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
         }
     }, C {
         override fun foo(x: Int): Int {
-            <caret><selection>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+            <caret><selection>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
         }
     };
 
diff --git a/idea/testData/intentions/implementAbstractMember/function/enumEntriesWithArgs.kt.after b/idea/testData/intentions/implementAbstractMember/function/enumEntriesWithArgs.kt.after
index efbf2719420..374f903f578 100644
--- a/idea/testData/intentions/implementAbstractMember/function/enumEntriesWithArgs.kt.after
+++ b/idea/testData/intentions/implementAbstractMember/function/enumEntriesWithArgs.kt.after
@@ -3,15 +3,15 @@
 enum class E(n: Int) {
     A(1) {
         override fun foo(x: Int): Int {
-            throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
         }
     }, B(2) {
         override fun foo(x: Int): Int {
-            throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
         }
     }, C(3) {
         override fun foo(x: Int): Int {
-            <caret><selection>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+            <caret><selection>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
         }
     };
 
diff --git a/idea/testData/intentions/implementAbstractMember/function/implementAll.kt.after b/idea/testData/intentions/implementAbstractMember/function/implementAll.kt.after
index be51b47b826..a09e66d5278 100644
--- a/idea/testData/intentions/implementAbstractMember/function/implementAll.kt.after
+++ b/idea/testData/intentions/implementAbstractMember/function/implementAll.kt.after
@@ -6,14 +6,14 @@ interface T<X> {
 
 class U : T<String> {
     override fun foo(x: String): String {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
 }
 
 class V : T<Int> {
     override fun foo(x: Int): Int {
-        <caret><selection>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <caret><selection>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
 
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt.after
index dc372ba6573..8f98e44d615 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     infix fun foo(t: T): A<T> {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt.after
index b41076df9f4..e42d3a802e5 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     infix operator fun compareTo(t: T): Int {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt.after
index a1bf1065bcd..a2c5877b71a 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     infix operator fun contains(t: T): Boolean {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt.after
index b2e396aa10f..1e743d76bcb 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     infix operator fun compareTo(t: T): Int {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt.after
index 7105cac3dfe..ca3d31fd6da 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     infix operator fun contains(t: T): Boolean {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt.after
index ce83ac5a910..56ba072c9d2 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     infix operator fun plusAssign(t: T) {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt.after
index 632014c66d1..85a53102474 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt.after
@@ -4,7 +4,7 @@ class A<T>(val n: T) {
     operator fun unaryPlus(): A<T> = throw Exception()
 
     infix operator fun plus(t: T): A<T> {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt.after
index a44675acfb6..db1c9d74ca2 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     infix operator fun plus(t: T): A<T> {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt.after
index fa1aa908b34..9d329d92dd3 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt.after
@@ -4,7 +4,7 @@ class A<T>(val n: T) {
     fun plus(i: Int, s: String): A<T> = throw Exception()
 
     infix operator fun plus(t: T): A<T> {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt.after
index ea002cdcc59..952fb76920c 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt.after
@@ -8,5 +8,5 @@ fun test() {
 }
 
 infix operator fun Int.plus(a: A<Int>): A<Int> {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt.after
index 1cc7258a9eb..130081a8cb1 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     infix operator fun plus(t: T): A<T> {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt.after
index e70ecc18b13..938ac1f7031 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     infix operator fun plus(i: Int): A<T> {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/quotedName.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/quotedName.kt.after
index cd77d0f297c..daabd3cca89 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/quotedName.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/quotedName.kt.after
@@ -6,5 +6,5 @@ fun test() {
 }
 
 infix fun Int.`!u00A0`(i: Int): Int {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt.after
index e4946707d39..498451a1863 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     infix operator fun contains(t: T): Boolean {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt.after
index 0ec49c1ccfe..c04ccdb644b 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     infix operator fun contains(t: T): Boolean {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/argumentTypeMismatch.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/argumentTypeMismatch.kt.after
index 395a40ff192..4225a8b12b1 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/argumentTypeMismatch.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/argumentTypeMismatch.kt.after
@@ -6,5 +6,5 @@ fun test() {
 }
 
 fun foo(n: String) {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/callInStringTemplateRuntime.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/callInStringTemplateRuntime.kt.after
index 6eb12097eda..51276324288 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/callInStringTemplateRuntime.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/callInStringTemplateRuntime.kt.after
@@ -5,5 +5,5 @@ fun test() {
 }
 
 fun foo(): String {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt.after
index 2239bfa74ae..302743fcb04 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     fun foo(t: T, s: String, function: (T) -> T): A<T> {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt.after
index 553c9a35f21..bc1713a254c 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     fun foo(function: (T) -> T): A<T> {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt.after
index ff79af014c8..47ce30377e5 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt.after
@@ -5,6 +5,6 @@ fun isModified(settings: Settings, c: C) = c.foo(settings)
 
 class C {
     fun foo(settings: Settings): Any {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnGroovyType.after.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnGroovyType.after.kt
index 647e5a7298b..6c5933b05b7 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnGroovyType.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnGroovyType.after.kt
@@ -6,5 +6,5 @@ fun test(): Int {
 }
 
 fun A.foo(): Int {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnJavaType.after.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnJavaType.after.kt
index 6dc384f5e87..c5131745453 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnJavaType.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnJavaType.after.kt
@@ -6,5 +6,5 @@ fun test(): Int? {
 }
 
 fun A.foo(i: Int, s: String): Int? {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt.after
index b92f694df3f..69670d94aaa 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt.after
@@ -7,5 +7,5 @@ fun test(t: T) {
 }
 
 fun T.foo(s: String, i: Int): Boolean {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTypeFromAnotherPackage.after.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTypeFromAnotherPackage.after.kt
index d3805eb895b..40e0474bda4 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTypeFromAnotherPackage.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTypeFromAnotherPackage.after.kt
@@ -11,5 +11,5 @@ class X {
 }
 
 fun package2.A.foo() {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt.after
index f5ab2455eae..d61a8a0388c 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt.after
@@ -4,7 +4,7 @@ class A<T>(val n: T) {
     fun foo(a: Int): A<T> = throw Exception()
 
     fun foo(a: T, s: String): A<T> {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt.after
index 2193368c40d..020eb7ee917 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt.after
@@ -4,7 +4,7 @@ class A<T>(val n: T) {
     fun foo(i: Int, s: String): A<T> = throw Exception()
 
     fun foo(i: T): A<T> {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt.after
index ce179af6794..cfe62ceb228 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt.after
@@ -3,7 +3,7 @@
 class A<T>(val n: T) {
     companion object {
         fun foo(i: Int): Int {
-            throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
         }
 
     }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibObject.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibObject.kt.after
index 42f2dc239c8..df4afee592d 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibObject.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibObject.kt.after
@@ -6,5 +6,5 @@ fun test() {
 }
 
 fun Unit.foo(i: Int): Int {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt.after
index bf3390db23c..ac13ee82873 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt.after
@@ -8,5 +8,5 @@ fun test() {
 }
 
 fun Int.foo(a: A<Int>): A<Int> {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt.after
index 2bc2784f9bb..13258dfcd34 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt.after
@@ -2,7 +2,7 @@
 
 object A {
     fun foo(i: Int): Int {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt.after
index 6ff907323fa..fff27a05b76 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     fun foo(t: T): A<T> {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt.after
index 8981c34bdb2..ad49e54aa5c 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt.after
@@ -5,7 +5,7 @@ class F {
     }
 
     fun foo(i: Int, s: String): Int {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt.after
index a377ae1309c..ef50047dcd3 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     fun foo(u: T): A<T> {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funPlacement.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funPlacement.kt.after
index 0596e7a1c13..f6fda652afd 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/funPlacement.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funPlacement.kt.after
@@ -8,7 +8,7 @@ class A {
     }
 
     private fun foo(): A {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
     fun bar() {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt.after
index 97dbc955aa7..e7e832ab760 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     fun foo(abc: T, ghi: A<T>, def: String): A<T> {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt.after
index c7cbc57fa52..61acf2f0abd 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     fun foo(t: T?): A<Int> {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt.after
index 1b7beacd05f..4b33d8f486b 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     fun foo(t: T): A<T>? {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt.after
index a84997924fb..076fd0eceb0 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     fun foo(t: T): A<String> {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithPackageName.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithPackageName.kt.after
index 3e79f962f09..e7f4bf13f02 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithPackageName.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithPackageName.kt.after
@@ -7,5 +7,5 @@ fun test() {
 }
 
 fun foo(i: Int, s: String) {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/functionalType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/functionalType.kt.after
index 6511dbd18f6..2e9e9484e86 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/functionalType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/functionalType.kt.after
@@ -5,5 +5,5 @@ fun foo(block: (Int) -> String) {
 }
 
 fun bar(block: (Int) -> String) {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/functionalTypeInReceiver.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/functionalTypeInReceiver.kt.after
index b693899465c..05919f50bef 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/functionalTypeInReceiver.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/functionalTypeInReceiver.kt.after
@@ -5,5 +5,5 @@ fun foo(block: (Int) -> String) {
 }
 
 fun <P1, R> ((P1) -> R).bar() {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/inLambda.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/inLambda.kt.after
index 885f9043da0..d743f4bac24 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/inLambda.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/inLambda.kt.after
@@ -7,5 +7,5 @@ fun test() {
 }
 
 fun foo(): Any {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt.after
index 25c47ebd57e..d06ed7734a5 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt.after
@@ -3,7 +3,7 @@
 
 class A<T>(val n: T) {
     fun foo(s: String, t: T): Any {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/kt10983.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/kt10983.kt
index 454ee8a96a1..ce36696205d 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/kt10983.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/kt10983.kt
@@ -1,10 +1,8 @@
 // "Create function" "false"
 // ERROR: A 'return' expression required in a function with a block body ('{...}')
-// ERROR: Cannot infer a type for this parameter. Please specify it explicitly.
-// ERROR: Cannot infer a type for this parameter. Please specify it explicitly.
 // ERROR: Expression 'return groupsByLength.values.firstOrNull { group -> {group.size == maximumSizeOfGroup} }' cannot be a selector (occur after a dot)
-// ERROR: Unresolved reference: groupBy
-// ERROR: Unresolved reference: it
+// ERROR: Type inference failed: inline fun <T> Iterable<T>.firstOrNull(predicate: (T) -> Boolean): T?<br>cannot be applied to<br>receiver: Collection<List<String>>  arguments: ((List<String>) -> () -> Boolean)<br>
+// ERROR: Type mismatch: inferred type is (List<String>) -> () -> Boolean but (List<String>) -> Boolean was expected
 // ERROR: Unresolved reference: maximumSizeOfGroup
 
 fun doSomethingStrangeWithCollection(collection: Collection<String>): Collection<String>? {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/localFunNoReceiver.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/localFunNoReceiver.kt.after
index b2ef699600c..3e05bc43eb0 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/localFunNoReceiver.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/localFunNoReceiver.kt.after
@@ -2,7 +2,7 @@
 
 fun test() {
     fun foo(i: Int, s: String): Int {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
     fun nestedTest(): Int {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/memberFunNoReceiver.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/memberFunNoReceiver.kt.after
index a0c87743d65..16f5b8ad58b 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/memberFunNoReceiver.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/memberFunNoReceiver.kt.after
@@ -7,7 +7,7 @@ class A {
         }
 
         private fun foo(i: Int, s: String): Int {
-            throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
         }
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/memberValDelegateRuntime.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/memberValDelegateRuntime.kt.after
index ef6af47d014..21ba4306320 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/memberValDelegateRuntime.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/memberValDelegateRuntime.kt.after
@@ -6,6 +6,6 @@ class A<T>(val t: T) {
     val x: A<Int> by foo(t, "")
 
     private fun foo(t: T, s: String): ReadOnlyProperty<A<T>, A<Int>> {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/memberVarDelegateRuntime.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/memberVarDelegateRuntime.kt.after
index ab8b64c791a..928fdad58cc 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/memberVarDelegateRuntime.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/memberVarDelegateRuntime.kt.after
@@ -6,6 +6,6 @@ class A<T>(val t: T) {
     var x: A<Int> by foo(t, "")
 
     private fun foo(t: T, s: String): ReadWriteProperty<A<T>, A<Int>> {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/objectMemberFunNoReceiver.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/objectMemberFunNoReceiver.kt.after
index ff3e9b09417..c7e71553b85 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/objectMemberFunNoReceiver.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/objectMemberFunNoReceiver.kt.after
@@ -7,7 +7,7 @@ class A {
         }
 
         private fun foo(i: Int, s: String): Int {
-            throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
         }
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/privateForMembers.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/privateForMembers.kt.after
index 24a0e1fafdf..13bc0da3702 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/privateForMembers.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/privateForMembers.kt.after
@@ -5,6 +5,6 @@ class A {
     }
 
     private fun foo() {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt.after
index 4807aeb497e..8330c78d308 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt.after
@@ -2,7 +2,7 @@
 
 class A {
     fun foo(): String {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/smartCastWithIs.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/smartCastWithIs.kt.after
index d5e7e25aa5b..f303d54fbc7 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/smartCastWithIs.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/smartCastWithIs.kt.after
@@ -5,5 +5,5 @@ fun test(o: Any) {
 }
 
 fun foo(o: String) {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/smartCastWithNullCheck.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/smartCastWithNullCheck.kt.after
index 1c16dad0e87..656dff6fb34 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/smartCastWithNullCheck.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/smartCastWithNullCheck.kt.after
@@ -6,5 +6,5 @@ fun test(s: String?) {
 }
 
 fun foo(s: String) {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt.after
index b0e1a0dabf0..d9f351011a7 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt.after
@@ -5,6 +5,6 @@ fun isModified(setOptions: SetOptions, c: C) = c.foo(setOptions)
 
 class C {
     fun foo(options: SetOptions): Any {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt.after
index 80e02a10c54..9cc728a5e5e 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt.after
@@ -6,6 +6,6 @@ class A<T>(val n: T) {
     }
 
     private fun foo(i: Int, s: String): A<Int> {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt.after
index 5f5acac185c..d8f6bec55e8 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     fun foo(i: Int, s: String): A<Int> {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt.after
index 748b419904d..2aaf326e9e0 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt.after
@@ -7,7 +7,7 @@ class A<T>(val n: T) {
         }
 
         private fun foo(i: Int, s: String): A<Int> {
-            throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
         }
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt.after
index 8d2aaf7154d..c488f2353a5 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt.after
@@ -8,6 +8,6 @@ class A<T>(val n: T) {
     }
 
     private fun foo(i: Int, s: String): A<Int> {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/topLevelFunNoReceiver.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/topLevelFunNoReceiver.kt.after
index e2ec624995e..96a94cac9ac 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/topLevelFunNoReceiver.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/topLevelFunNoReceiver.kt.after
@@ -5,5 +5,5 @@ fun test(): Int {
 }
 
 fun foo(i: Int, s: String): Int {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/topLevelFunPlacement.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/topLevelFunPlacement.kt.after
index cdd74c4c564..135e17671be 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/topLevelFunPlacement.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/topLevelFunPlacement.kt.after
@@ -7,7 +7,7 @@ fun test() {
 }
 
 fun foo(): Int {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
 
 fun bar() {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/callWithStarProjection.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/callWithStarProjection.kt.after
index a2166043dd5..6e24ed17482 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/callWithStarProjection.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/callWithStarProjection.kt.after
@@ -5,5 +5,5 @@ fun test(): Int {
 }
 
 fun <T> foo(i: Int, t: T): Int {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt.after
index 7bdf6431cc8..4d11570753c 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt.after
@@ -2,7 +2,7 @@
 
 class B<T>(val t: T) {
     fun <U, V> foo(u: U, v: V): U {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt.after
index 3dceadaa981..9ec75c6c776 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt.after
@@ -2,7 +2,7 @@
 
 class B<T>(val t: T) {
     fun <U> foo(i: Int, u: U): Int {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt.after
index 7bdf6431cc8..4d11570753c 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt.after
@@ -2,7 +2,7 @@
 
 class B<T>(val t: T) {
     fun <U, V> foo(u: U, v: V): U {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extension.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extension.kt.after
index f27fb8a5b0b..8d7ac9be215 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extension.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extension.kt.after
@@ -8,5 +8,5 @@ class A<T>(val items: List<T>) {
 }
 
 fun <E, T, U> List<E>.foo(t: T, u: U): T {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionPartialSubstitution.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionPartialSubstitution.kt.after
index 7cd7196a86c..175647c3c95 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionPartialSubstitution.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionPartialSubstitution.kt.after
@@ -8,5 +8,5 @@ class A<T>(val items: List<T>) {
 }
 
 fun <E, T> List<E>.foo(t: T, s: String): T {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithReceiverArg.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithReceiverArg.kt.after
index f27fb8a5b0b..8d7ac9be215 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithReceiverArg.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithReceiverArg.kt.after
@@ -8,5 +8,5 @@ class A<T>(val items: List<T>) {
 }
 
 fun <E, T, U> List<E>.foo(t: T, u: U): T {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithTypeParameterAsReceiver.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithTypeParameterAsReceiver.kt.after
index c32294b75f4..41444a9e5c2 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithTypeParameterAsReceiver.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithTypeParameterAsReceiver.kt.after
@@ -4,5 +4,5 @@ fun <T> foo(t: T) {
 }
 
 fun <T> T.bar() {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiver.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiver.kt.after
index cba0f090454..777c5a8e839 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiver.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiver.kt.after
@@ -5,5 +5,5 @@ fun test(): Int {
 }
 
 fun <T, U> foo(u: U, t: T): U {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverExtraArgs.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverExtraArgs.kt.after
index 372b2cd161c..6711ba917d5 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverExtraArgs.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverExtraArgs.kt.after
@@ -5,5 +5,5 @@ fun test(): Int {
 }
 
 fun <T, U, V> foo(u: U, t: T): U {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverLongName.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverLongName.kt.after
index cba0f090454..777c5a8e839 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverLongName.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverLongName.kt.after
@@ -5,5 +5,5 @@ fun test(): Int {
 }
 
 fun <T, U> foo(u: U, t: T): U {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverPartialSubstitution.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverPartialSubstitution.kt.after
index 41d7c2c3a74..486f2c110bd 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverPartialSubstitution.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverPartialSubstitution.kt.after
@@ -5,5 +5,5 @@ fun test(): Int {
 }
 
 fun <T> foo(t: T, s: String): T {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/unitFun.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/unitFun.kt.after
index d3dbca10e0b..0baf8e7f28e 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/unitFun.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/unitFun.kt.after
@@ -5,5 +5,5 @@ fun test() {
 }
 
 fun foo(i: Int, s: String) {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt.after
index dd76ea3f879..37b4f57ab86 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt.after
@@ -3,7 +3,7 @@
 
 class A<T>(val n: T) {
     fun foo(s: Any, t: T): T {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt.after
index 756616f8c43..2f3859c3515 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt.after
@@ -3,7 +3,7 @@
 
 class A: B {
     fun foo() {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/extensionNoReceiverInCallableRef.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/extensionNoReceiverInCallableRef.kt.after
index 83f1eb667cd..0fdc6a1c701 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/extensionNoReceiverInCallableRef.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/extensionNoReceiverInCallableRef.kt.after
@@ -5,7 +5,7 @@ fun consume(s: String) {}
 
 fun test() {
     fun foo(i: Int): String {
-        <selection>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
     consume(1.map(::foo))
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/extensionWithReceiverInCallableRef.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/extensionWithReceiverInCallableRef.kt.after
index 58922ba709c..39d08d986a5 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/extensionWithReceiverInCallableRef.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/extensionWithReceiverInCallableRef.kt.after
@@ -9,5 +9,5 @@ fun test() {
 }
 
 fun Int.foo(): String {
-    <selection>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+    <selection>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/noExpectedReturnType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/noExpectedReturnType.kt.after
index 3dcb8260146..b01beaca77c 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/noExpectedReturnType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/noExpectedReturnType.kt.after
@@ -3,7 +3,7 @@ fun <T, U> T.map(f: (T) -> U) = f(this)
 
 fun test() {
     fun foo(i: Int): Any {
-        <selection>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
     1.map(::foo)
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/nonExtensionWithReceiverInCallableRef.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/nonExtensionWithReceiverInCallableRef.kt.after
index c0ce4f55868..817be3b5b6b 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/nonExtensionWithReceiverInCallableRef.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/nonExtensionWithReceiverInCallableRef.kt.after
@@ -9,5 +9,5 @@ fun test() {
 }
 
 fun Int.foo(): String {
-    <selection>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+    <selection>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/withExpectedReturnType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/withExpectedReturnType.kt.after
index cb02d803ede..30dbe9eea15 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/withExpectedReturnType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/withExpectedReturnType.kt.after
@@ -5,7 +5,7 @@ fun consume(s: String) {}
 
 fun test() {
     fun foo(i: Int): String {
-        <selection>throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
     }
     consume(1.map(::foo))
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt.after
index 7f2bea15609..c5938bbb300 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt.after
@@ -4,7 +4,7 @@ class Foo<T> {
     operator fun component2(): Int { return 0 }
 
     operator fun component3(): Any {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 fun foo() {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt.after
index de8ae858edd..aa8036dbda6 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt.after
@@ -4,7 +4,7 @@ class Foo<T> {
     operator fun component2(): Int { return 0 }
 
     operator fun component3(): String {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 fun foo() {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage3.kt b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage3.kt
index 2044476e3ff..7ba63aca15e 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage3.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage3.kt
@@ -3,12 +3,12 @@
 class FooIterator<T> {
     operator fun hasNext(): Boolean { return false }
     operator fun next(): Any {
-        throw UnsupportedOperationException("not implemented")
+        TODO("not implemented")
     }
 }
 class Foo<T> {
     operator fun iterator(): FooIterator<String> {
-        throw UnsupportedOperationException("not implemented")
+        TODO("not implemented")
     }
 }
 operator fun Any.component1(): Int {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage3.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage3.kt.after
index d6cdfdce231..33596bf7a38 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage3.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage3.kt.after
@@ -3,12 +3,12 @@
 class FooIterator<T> {
     operator fun hasNext(): Boolean { return false }
     operator fun next(): Any {
-        throw UnsupportedOperationException("not implemented")
+        TODO("not implemented")
     }
 }
 class Foo<T> {
     operator fun iterator(): FooIterator<String> {
-        throw UnsupportedOperationException("not implemented")
+        TODO("not implemented")
     }
 }
 operator fun Any.component1(): Int {
@@ -19,5 +19,5 @@ fun foo() {
 }
 
 operator fun Any.component2(): Int {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt.after
index f9e33ef0ae1..6b9274bb3f2 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt.after
@@ -3,7 +3,7 @@ import kotlin.reflect.KProperty
 // "Create member function 'getValue'" "true"
 class F {
     operator fun getValue(x: X, property: KProperty<*>): Int {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt.after
index f84762cb756..138a8244204 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt.after
@@ -3,11 +3,11 @@ import kotlin.reflect.KProperty
 // "Create member function 'getValue', function 'setValue'" "true"
 class F {
     operator fun getValue(x: X, property: KProperty<*>): Int {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
     operator fun setValue(x: X, property: KProperty<*>, i: Int) {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt.after
index 7bfccf79cd4..bc72de1fec4 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt.after
@@ -5,7 +5,7 @@ class F {
     operator fun setValue(x: X, property: KProperty<*>, i: Int) { }
 
     operator fun getValue(x: X, property: KProperty<*>): Int {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt.after
index fb23af9afad..b0f9be1c679 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt.after
@@ -5,7 +5,7 @@ class F {
     operator fun getValue(x: X, property: KProperty<*>): Int = 1
 
     operator fun setValue(x: X, property: KProperty<*>, i: Int) {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt.after
index 7a45cbc0daa..013d3348106 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt.after
@@ -6,6 +6,6 @@ class Foo<T> {
     }
 
     private operator fun get(s: String): T {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt.after
index 6604a5b05ca..3e6cd272f95 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt.after
@@ -6,6 +6,6 @@ class Foo<T> {
     }
 
     private operator fun get(s: String, w: T): T {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt.after
index 8a04114aa2b..33703f57483 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt.after
@@ -2,7 +2,7 @@
 
 class Foo<T> {
     operator fun get(s: String, w: T): T {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt.after
index 9a391b60e1f..f15fba44794 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt.after
@@ -2,7 +2,7 @@
 
 class Foo<T> {
     operator fun get(s: String, w: T): Any {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt.after
index 9a353ac8681..b1a892c2e3a 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt.after
@@ -10,6 +10,6 @@ class Foo<T> {
     }
 
     private operator fun <V> get(s: String, w: ArrayList<V>): String {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage2.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage2.kt.after
index 2806733b1e8..70945c1ea3c 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage2.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage2.kt.after
@@ -6,5 +6,5 @@ fun x (y: Any) {
 }
 
 operator fun Any.get(s: String): Any {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt.after
index ba41fba8f25..d67a00cbdc4 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt.after
@@ -6,6 +6,6 @@ class Foo<T> {
     }
 
     private operator fun get(s: String): T {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt.after
index d92e03c2cea..7f2a573f726 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt.after
@@ -6,6 +6,6 @@ class Foo<T, S: Iterable<T>> {
     }
 
     private operator fun get(s: String): T {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt.after
index 636d944c8a2..41c8c998f4e 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt.after
@@ -6,6 +6,6 @@ class Foo<T> {
     }
 
     private operator fun <V> get(s: String, w: Iterable<V>): T {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt.after
index b5d99f0851b..899f706e012 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt.after
@@ -8,6 +8,6 @@ class Foo<T> {
     }
 
     private operator fun <V, T1> get(s: String, w: ArrayList<V>, v: T1): T {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt.after
index 3a67b5434ba..748cd41c746 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt.after
@@ -8,6 +8,6 @@ class Foo<T> {
     }
 
     private operator fun get(s: String, w: T): T {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt.after
index 8b3a37ed0da..a7e402d7c2e 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt.after
@@ -8,6 +8,6 @@ class Foo<S> {
     }
 
     private operator fun get(s: String, w: S): S {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt.after
index 558a379be21..5b95242ac01 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt.after
@@ -5,7 +5,7 @@ class FooIterator<T> {
     }
 
     operator fun hasNext(): Boolean {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 class Foo<T> {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt.after
index 7afe5dd8249..0ccf3a2f861 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt.after
@@ -5,7 +5,7 @@ class FooIterator<T> {
     }
 
     operator fun hasNext(): Boolean {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 class Foo<T> {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnLibType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnLibType.kt.after
index b1c40b968c6..69540a9f16c 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnLibType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnLibType.kt.after
@@ -8,5 +8,5 @@ fun test(): A<String> {
 }
 
 operator fun Int.invoke(i: Int, s: String): A<String> {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt.after
index d5035c23ea2..8d4b042102c 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     operator fun invoke(t: T, s: String): B<String> {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt.after
index fc56c710115..bbf15f19dd3 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     operator fun <V> invoke(u: T, s: String): B<V> {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt.after
index 51dc478854d..6dbb7480bd1 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     operator fun invoke(abc: T, ghi: A<T>, def: String): A<T> {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt.after
index 428bac8173f..a5dc06a211d 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt.after
@@ -1,7 +1,7 @@
 // "Create member function 'iterator'" "true"
 class Foo<T> {
     operator fun iterator(): Iterator<T> {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt.after
index 8a2d4be62ec..d071dafa27c 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt.after
@@ -1,7 +1,7 @@
 // "Create member function 'iterator'" "true"
 class Foo<T> {
     operator fun iterator(): Iterator<String> {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt
index 1b2c310d9d2..0f0cf4d7d3d 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt
@@ -4,7 +4,7 @@ class FooIterator<T> {
 }
 class Foo<T> {
     operator fun iterator(): FooIterator<String> {
-        throw UnsupportedOperationException("not implemented")
+        TODO("not implemented")
     }
 }
 operator fun Any.component1(): Int {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt.after
index 467be063edb..25bfe3fc02d 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt.after
@@ -3,12 +3,12 @@ class FooIterator<T> {
     operator fun hasNext(): Boolean { return false }
 
     operator fun next(): Any {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 class Foo<T> {
     operator fun iterator(): FooIterator<String> {
-        throw UnsupportedOperationException("not implemented")
+        TODO("not implemented")
     }
 }
 operator fun Any.component1(): Int {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt.after
index db247c27456..463652920a1 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt.after
@@ -3,7 +3,7 @@ class FooIterator<T> {
     operator fun hasNext(): Boolean { return false }
 
     operator fun next(): Int {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 class Foo<T> {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt.after
index 38cdae353cc..04199a313ab 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt.after
@@ -3,7 +3,7 @@ class FooIterator<T> {
     operator fun hasNext(): Boolean { return false }
 
     operator fun next(): T {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 class Foo<T> {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt.after
index 6e54a208f27..5564b879af4 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt.after
@@ -6,6 +6,6 @@ class Foo<T> {
     }
 
     private operator fun set(s: String, w: T, value: T) {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt.after
index 2f4f589cca8..99101bccdf4 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt.after
@@ -10,5 +10,5 @@ class Foo<T> {
 }
 
 operator fun <T> Any.set(s: String, w: ArrayList<T>, value: ArrayList<T>) {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt.after
index 8189d0c7195..9784659a0ee 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt.after
@@ -3,7 +3,7 @@ class A {
     operator fun get(s: String): Int = 1
 
     operator fun set(s: String, value: Int) {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt.after
index e42c3cc1bab..1baed4325ce 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     operator fun inc(): A<T> {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt.after
index 835a899f8e7..2a3a0c49107 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt.after
@@ -4,7 +4,7 @@ class A<T>(val n: T) {
     operator fun minus(n: Int): A<T> = throw Exception()
 
     operator fun unaryMinus(): A<T> {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnLibType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnLibType.kt.after
index cd26a3da5d6..a8545c17c77 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnLibType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnLibType.kt.after
@@ -6,5 +6,5 @@ fun test() {
 }
 
 operator fun Boolean.unaryMinus(): Any {
-    throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt.after
index 12aaa39a31e..a84642950d2 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     operator fun unaryMinus(): Any {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt.after
index 33ececf9fc5..c7eb6a998fb 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     operator fun unaryMinus(): A<T> {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/nonIdentifier.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/nonIdentifier.kt
index 5a0e3abf205..3e6ab6dadd5 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/nonIdentifier.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/nonIdentifier.kt
@@ -2,7 +2,7 @@
 // ACTION: Create extension function 'minus'
 // ACTION: Create member function 'minus'
 // ACTION: Replace overloaded operator with function call
-// ERROR: Unresolved reference: -
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>@InlineOnly public operator inline fun BigDecimal.minus(other: BigDecimal): BigDecimal defined in kotlin<br>@InlineOnly public operator inline fun BigInteger.minus(other: BigInteger): BigInteger defined in kotlin<br>public operator fun <T> Iterable<???>.minus(elements: Array<out ???>): List<???> defined in kotlin.collections<br>public operator fun <T> Iterable<???>.minus(elements: Iterable<???>): List<???> defined in kotlin.collections<br>public operator fun <T> Iterable<???>.minus(elements: Sequence<???>): List<???> defined in kotlin.collections<br>public operator fun <T> Iterable<A>.minus(element: A): List<A> defined in kotlin.collections<br>public operator fun <T> Set<???>.minus(elements: Array<out ???>): Set<???> defined in kotlin.collections<br>public operator fun <T> Set<???>.minus(elements: Iterable<???>): Set<???> defined in kotlin.collections<br>public operator fun <T> Set<???>.minus(elements: Sequence<???>): Set<???> defined in kotlin.collections<br>public operator fun <T> Set<A>.minus(element: A): Set<A> defined in kotlin.collections<br>public operator fun <T> Sequence<???>.minus(elements: Array<out ???>): Sequence<???> defined in kotlin.sequences<br>public operator fun <T> Sequence<???>.minus(elements: Iterable<???>): Sequence<???> defined in kotlin.sequences<br>public operator fun <T> Sequence<???>.minus(elements: Sequence<???>): Sequence<???> defined in kotlin.sequences<br>public operator fun <T> Sequence<A>.minus(element: A): Sequence<A> defined in kotlin.sequences
 class A
 
 fun bar() {
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/nonIdentifier.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/nonIdentifier.kt
index b2254a78d1e..f98433cb176 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/parameter/nonIdentifier.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/parameter/nonIdentifier.kt
@@ -2,7 +2,7 @@
 // ACTION: Create extension function 'minus'
 // ACTION: Create member function 'minus'
 // ACTION: Replace overloaded operator with function call
-// ERROR: Unresolved reference: -
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>@InlineOnly public operator inline fun BigDecimal.minus(other: BigDecimal): BigDecimal defined in kotlin<br>@InlineOnly public operator inline fun BigInteger.minus(other: BigInteger): BigInteger defined in kotlin<br>public operator fun <T> Iterable<???>.minus(elements: Array<out ???>): List<???> defined in kotlin.collections<br>public operator fun <T> Iterable<???>.minus(elements: Iterable<???>): List<???> defined in kotlin.collections<br>public operator fun <T> Iterable<???>.minus(elements: Sequence<???>): List<???> defined in kotlin.collections<br>public operator fun <T> Iterable<A>.minus(element: A): List<A> defined in kotlin.collections<br>public operator fun <T> Set<???>.minus(elements: Array<out ???>): Set<???> defined in kotlin.collections<br>public operator fun <T> Set<???>.minus(elements: Iterable<???>): Set<???> defined in kotlin.collections<br>public operator fun <T> Set<???>.minus(elements: Sequence<???>): Set<???> defined in kotlin.collections<br>public operator fun <T> Set<A>.minus(element: A): Set<A> defined in kotlin.collections<br>public operator fun <T> Sequence<???>.minus(elements: Array<out ???>): Sequence<???> defined in kotlin.sequences<br>public operator fun <T> Sequence<???>.minus(elements: Iterable<???>): Sequence<???> defined in kotlin.sequences<br>public operator fun <T> Sequence<???>.minus(elements: Sequence<???>): Sequence<???> defined in kotlin.sequences<br>public operator fun <T> Sequence<A>.minus(element: A): Sequence<A> defined in kotlin.sequences
 class A
 
 fun bar() {
diff --git a/idea/testData/quickfix/implement/abstract.kt b/idea/testData/quickfix/implement/abstract.kt
index da7ffb185dd..47b5b8fbc73 100644
--- a/idea/testData/quickfix/implement/abstract.kt
+++ b/idea/testData/quickfix/implement/abstract.kt
@@ -1,4 +1,5 @@
 // "Implement abstract class" "true"
+// WITH_RUNTIME
 // SHOULD_BE_AVAILABLE_AFTER_EXECUTION
 
 private abstract class <caret>Base {
diff --git a/idea/testData/quickfix/implement/abstract.kt.after b/idea/testData/quickfix/implement/abstract.kt.after
index 03606d53162..adf07835cf5 100644
--- a/idea/testData/quickfix/implement/abstract.kt.after
+++ b/idea/testData/quickfix/implement/abstract.kt.after
@@ -1,4 +1,5 @@
 // "Implement abstract class" "true"
+// WITH_RUNTIME
 // SHOULD_BE_AVAILABLE_AFTER_EXECUTION
 
 private abstract class Base {
@@ -14,6 +15,6 @@ private class BaseImpl : Base() {
         }
 
     override fun toInt(arg: String): Int {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/implement/inner.kt b/idea/testData/quickfix/implement/inner.kt
index 0afb5349d32..0c1e7704727 100644
--- a/idea/testData/quickfix/implement/inner.kt
+++ b/idea/testData/quickfix/implement/inner.kt
@@ -1,4 +1,5 @@
 // "Implement abstract class" "true"
+// WITH_RUNTIME
 // SHOULD_BE_AVAILABLE_AFTER_EXECUTION
 
 class Container {
diff --git a/idea/testData/quickfix/implement/inner.kt.after b/idea/testData/quickfix/implement/inner.kt.after
index e2459dbd4db..83535db97ec 100644
--- a/idea/testData/quickfix/implement/inner.kt.after
+++ b/idea/testData/quickfix/implement/inner.kt.after
@@ -1,4 +1,5 @@
 // "Implement abstract class" "true"
+// WITH_RUNTIME
 // SHOULD_BE_AVAILABLE_AFTER_EXECUTION
 
 class Container {
@@ -8,7 +9,7 @@ class Container {
 
     inner class BaseImpl : Base() {
         override fun foo(): String {
-            throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
         }
     }
 }
diff --git a/idea/testData/quickfix/implement/interface.kt b/idea/testData/quickfix/implement/interface.kt
index 3937ebf6d99..f3ffa939974 100644
--- a/idea/testData/quickfix/implement/interface.kt
+++ b/idea/testData/quickfix/implement/interface.kt
@@ -1,4 +1,5 @@
 // "Implement interface" "true"
+// WITH_RUNTIME
 // SHOULD_BE_AVAILABLE_AFTER_EXECUTION
 
 interface <caret>Base {
diff --git a/idea/testData/quickfix/implement/interface.kt.after b/idea/testData/quickfix/implement/interface.kt.after
index a80d329c9ba..8a022ab5dbc 100644
--- a/idea/testData/quickfix/implement/interface.kt.after
+++ b/idea/testData/quickfix/implement/interface.kt.after
@@ -1,4 +1,5 @@
 // "Implement interface" "true"
+// WITH_RUNTIME
 // SHOULD_BE_AVAILABLE_AFTER_EXECUTION
 
 interface Base {
@@ -9,6 +10,6 @@ interface Base {
 
 class BaseImpl : Base {
     override fun foo(x: Int): Int {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/implement/nested.kt b/idea/testData/quickfix/implement/nested.kt
index ebd7be1ba0b..b56f2f7ba97 100644
--- a/idea/testData/quickfix/implement/nested.kt
+++ b/idea/testData/quickfix/implement/nested.kt
@@ -1,4 +1,5 @@
 // "Implement interface" "true"
+// WITH_RUNTIME
 // SHOULD_BE_AVAILABLE_AFTER_EXECUTION
 
 class Container {
diff --git a/idea/testData/quickfix/implement/nested.kt.after b/idea/testData/quickfix/implement/nested.kt.after
index 49b2a5510c5..a612ae3f007 100644
--- a/idea/testData/quickfix/implement/nested.kt.after
+++ b/idea/testData/quickfix/implement/nested.kt.after
@@ -1,4 +1,5 @@
 // "Implement interface" "true"
+// WITH_RUNTIME
 // SHOULD_BE_AVAILABLE_AFTER_EXECUTION
 
 class Container {
@@ -19,7 +20,7 @@ class BaseImpl : Container.Base {
         get() = throw UnsupportedOperationException()
 
     override fun bar(z: Int): String {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
 
diff --git a/idea/testData/quickfix/implement/sealed.kt b/idea/testData/quickfix/implement/sealed.kt
index 93398b39f75..1d360339ce5 100644
--- a/idea/testData/quickfix/implement/sealed.kt
+++ b/idea/testData/quickfix/implement/sealed.kt
@@ -1,4 +1,5 @@
 // "Implement sealed class" "true"
+// WITH_RUNTIME
 // SHOULD_BE_AVAILABLE_AFTER_EXECUTION
 
 sealed class <caret>Base {
diff --git a/idea/testData/quickfix/implement/sealed.kt.after b/idea/testData/quickfix/implement/sealed.kt.after
index 54f15a196c0..c2e37d06e84 100644
--- a/idea/testData/quickfix/implement/sealed.kt.after
+++ b/idea/testData/quickfix/implement/sealed.kt.after
@@ -1,11 +1,12 @@
 // "Implement sealed class" "true"
+// WITH_RUNTIME
 // SHOULD_BE_AVAILABLE_AFTER_EXECUTION
 
 sealed class Base {
     abstract fun foo(): Int
     class BaseImpl : Base() {
         override fun foo(): Int {
-            throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
         }
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/implement/sealedWithConflict.kt b/idea/testData/quickfix/implement/sealedWithConflict.kt
index ce94ccee4f2..8b89b7c6278 100644
--- a/idea/testData/quickfix/implement/sealedWithConflict.kt
+++ b/idea/testData/quickfix/implement/sealedWithConflict.kt
@@ -1,4 +1,5 @@
 // "Implement sealed class" "true"
+// WITH_RUNTIME
 // SHOULD_BE_AVAILABLE_AFTER_EXECUTION
 
 sealed class <caret>Base {
diff --git a/idea/testData/quickfix/implement/sealedWithConflict.kt.after b/idea/testData/quickfix/implement/sealedWithConflict.kt.after
index 670ef68551d..8dcd81dfea5 100644
--- a/idea/testData/quickfix/implement/sealedWithConflict.kt.after
+++ b/idea/testData/quickfix/implement/sealedWithConflict.kt.after
@@ -1,4 +1,5 @@
 // "Implement sealed class" "true"
+// WITH_RUNTIME
 // SHOULD_BE_AVAILABLE_AFTER_EXECUTION
 
 sealed class Base {
@@ -10,7 +11,7 @@ sealed class Base {
 
     class BaseImpl1 : Base() {
         override fun foo(): Int {
-            throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
         }
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/implementMember.kt b/idea/testData/quickfix/override/implementMember.kt
index 843d7360844..e38b4d910c6 100644
--- a/idea/testData/quickfix/override/implementMember.kt
+++ b/idea/testData/quickfix/override/implementMember.kt
@@ -1,4 +1,5 @@
 // "Implement members" "true"
+// WITH_RUNTIME
 interface I {
     fun foo()
 }
diff --git a/idea/testData/quickfix/override/implementMember.kt.after b/idea/testData/quickfix/override/implementMember.kt.after
index fdf027fdfc1..154ccd2b23d 100644
--- a/idea/testData/quickfix/override/implementMember.kt.after
+++ b/idea/testData/quickfix/override/implementMember.kt.after
@@ -1,10 +1,11 @@
 // "Implement members" "true"
+// WITH_RUNTIME
 interface I {
     fun foo()
 }
 
 class A : I {
     override fun foo() {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/override/implementMemberFromAbstractClass.kt b/idea/testData/quickfix/override/implementMemberFromAbstractClass.kt
index be78ca4258b..2d1812e1180 100644
--- a/idea/testData/quickfix/override/implementMemberFromAbstractClass.kt
+++ b/idea/testData/quickfix/override/implementMemberFromAbstractClass.kt
@@ -1,4 +1,5 @@
 // "Implement members" "true"
+// WITH_RUNTIME
 abstract class A {
     abstract fun foo()
 }
diff --git a/idea/testData/quickfix/override/implementMemberFromAbstractClass.kt.after b/idea/testData/quickfix/override/implementMemberFromAbstractClass.kt.after
index 6c41c615b1c..d549b5684a3 100644
--- a/idea/testData/quickfix/override/implementMemberFromAbstractClass.kt.after
+++ b/idea/testData/quickfix/override/implementMemberFromAbstractClass.kt.after
@@ -1,10 +1,11 @@
 // "Implement members" "true"
+// WITH_RUNTIME
 abstract class A {
     abstract fun foo()
 }
 
 class B : A() {
     override fun foo() {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/typeMismatch/letClassImplementInterface.kt b/idea/testData/quickfix/typeMismatch/letClassImplementInterface.kt
index ebc3f977d40..4ea99e2756d 100644
--- a/idea/testData/quickfix/typeMismatch/letClassImplementInterface.kt
+++ b/idea/testData/quickfix/typeMismatch/letClassImplementInterface.kt
@@ -1,4 +1,5 @@
 // "Let 'B' implement interface 'A'" "true"
+// WITH_RUNTIME
 package let.implement
 
 fun bar() {
diff --git a/idea/testData/quickfix/typeMismatch/letClassImplementInterface.kt.after b/idea/testData/quickfix/typeMismatch/letClassImplementInterface.kt.after
index 839798a4e8f..5af7155d811 100644
--- a/idea/testData/quickfix/typeMismatch/letClassImplementInterface.kt.after
+++ b/idea/testData/quickfix/typeMismatch/letClassImplementInterface.kt.after
@@ -1,4 +1,5 @@
 // "Let 'B' implement interface 'A'" "true"
+// WITH_RUNTIME
 package let.implement
 
 fun bar() {
@@ -14,6 +15,6 @@ interface A {
 }
 class B : A {
     override fun gav() {
-        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.kt
index 7377d12808b..115c99c99b6 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.kt
@@ -34,7 +34,7 @@ import org.jetbrains.kotlin.idea.core.overrideImplement.OverrideImplementMembers
 import org.jetbrains.kotlin.idea.core.overrideImplement.OverrideMemberChooserObject
 import org.jetbrains.kotlin.idea.core.overrideImplement.OverrideMembersHandler
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
-import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor
+import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
 import org.jetbrains.kotlin.idea.test.dumpTextWithErrors
 import org.jetbrains.kotlin.idea.util.application.executeWriteCommand
 import org.jetbrains.kotlin.psi.KtClassOrObject
@@ -48,7 +48,7 @@ import java.io.File
 import kotlin.test.assertEquals
 
 abstract class AbstractOverrideImplementTest : KotlinLightCodeInsightFixtureTestCase() {
-    override fun getProjectDescriptor(): LightProjectDescriptor = KotlinLightProjectDescriptor.INSTANCE
+    override fun getProjectDescriptor(): LightProjectDescriptor = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
 
     protected fun doImplementFileTest(memberToOverride: String? = null) {
         doFileTest(ImplementMembersHandler(), memberToOverride)
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java
index 33a3cffa729..8ad1cc3157d 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java
@@ -225,18 +225,22 @@ public abstract class AbstractQuickFixTest extends KotlinLightQuickFixTestCase {
 
             ConfigLibraryUtil.configureKotlinJsRuntimeAndSdk(getModule(), getFullJavaJDK());
         }
-        else if (beforeFileName.endsWith("Runtime.kt") ||
-                 InTextDirectivesUtils.isDirectiveDefined(FileUtil.loadFile(new File(beforeFileName)), "WITH_RUNTIME")) {
+        else if (isRuntimeNeeded(beforeFileName)) {
             ConfigLibraryUtil.configureKotlinRuntimeAndSdk(getModule(), getFullJavaJDK());
         }
     }
 
+    private static boolean isRuntimeNeeded(@NotNull String beforeFileName) throws IOException {
+        return beforeFileName.endsWith("Runtime.kt") ||
+               beforeFileName.toLowerCase().contains("createfromusage") ||
+               InTextDirectivesUtils.isDirectiveDefined(FileUtil.loadFile(new File(beforeFileName)), "WITH_RUNTIME");
+    }
+
     private void unConfigureRuntimeIfNeeded(@NotNull String beforeFileName) throws IOException {
         if (beforeFileName.endsWith("JsRuntime.kt")) {
             ConfigLibraryUtil.unConfigureKotlinJsRuntimeAndSdk(getModule(), getProjectJDK());
         }
-        else if (beforeFileName.endsWith("Runtime.kt") ||
-                 InTextDirectivesUtils.isDirectiveDefined(FileUtil.loadFile(new File(beforeFileName)), "WITH_RUNTIME")) {
+        else if (isRuntimeNeeded(beforeFileName)) {
             ConfigLibraryUtil.unConfigureKotlinRuntimeAndSdk(getModule(), getProjectJDK());
         }
     }