diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/generateUtil.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/generateUtil.kt
new file mode 100644
index 00000000000..4912fe48dae
--- /dev/null
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/generateUtil.kt
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2010-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.plugin.quickfix
+
+import com.intellij.openapi.editor.Editor
+import com.intellij.psi.PsiElement
+import org.jetbrains.jet.lang.psi.JetDeclarationWithBody
+import org.jetbrains.jet.lang.psi.JetBlockExpression
+import com.intellij.psi.PsiWhiteSpace
+import com.intellij.openapi.editor.ScrollType
+import org.jetbrains.jet.lang.psi.JetWithExpressionInitializer
+import org.jetbrains.jet.lang.psi.JetProperty
+import org.jetbrains.jet.lang.psi.psiUtil.siblings
+
+private fun moveCaretIntoGeneratedElement(editor: Editor, element: PsiElement): Boolean {
+    // Inspired by GenerateMembersUtils.positionCaret()
+
+    if (element is JetDeclarationWithBody && element.hasBody()) {
+        val expression = element.getBodyExpression()
+        if (expression is JetBlockExpression) {
+            val lBrace = expression.getLBrace()
+            val rBrace = expression.getRBrace()
+
+            if (lBrace != null && rBrace != null) {
+                val firstInBlock = lBrace.siblings(forward = true, withItself = false).first { it !is PsiWhiteSpace }
+                val lastInBlock = rBrace.siblings(forward = false, withItself = false).first { it !is PsiWhiteSpace }
+
+                val start = firstInBlock.getTextRange()!!.getStartOffset()
+                val end = lastInBlock.getTextRange()!!.getEndOffset()
+
+                editor.moveCaret(Math.min(start, end))
+
+                if (start < end) {
+                    editor.getSelectionModel().setSelection(start, end)
+                }
+
+                return true
+            }
+        }
+    }
+
+    if (element is JetWithExpressionInitializer && element.hasInitializer()) {
+        val expression = element.getInitializer()
+        if (expression == null) throw AssertionError()
+
+        val initializerRange = expression.getTextRange()
+
+        val offset = initializerRange?.getStartOffset() ?: element.getTextOffset()
+
+        editor.moveCaret(offset)
+
+        if (initializerRange != null) {
+            editor.getSelectionModel().setSelection(initializerRange.getStartOffset(), initializerRange.getEndOffset())
+        }
+
+        return true
+    }
+
+    if (element is JetProperty) {
+        for (accessor in element.getAccessors()) {
+            if (moveCaretIntoGeneratedElement(editor, accessor)) {
+                return true
+            }
+        }
+    }
+
+    return false
+}
+
+public fun Editor.moveCaret(offset: Int, scrollType: ScrollType = ScrollType.RELATIVE) {
+    getCaretModel().moveToOffset(offset)
+    getScrollingModel().scrollToCaret(scrollType)
+}
diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java
index 1f87396ee2d..a67504e01d3 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java
@@ -25,6 +25,7 @@ import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
+import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiDocumentManager;
@@ -39,6 +40,7 @@ import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
+import org.jetbrains.jet.plugin.quickfix.QuickfixPackage;
 import org.jetbrains.jet.renderer.DescriptorRenderer;
 import org.jetbrains.jet.renderer.DescriptorRendererBuilder;
 
@@ -78,32 +80,50 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns
     }
 
     public static void generateMethods(
-            @NotNull Editor editor,
-            @NotNull JetClassOrObject classOrObject,
-            @NotNull List<DescriptorClassMember> selectedElements
+            @NotNull final Editor editor,
+            @NotNull final JetClassOrObject classOrObject,
+            @NotNull final List<DescriptorClassMember> selectedElements
     ) {
-        JetClassBody body = classOrObject.getBody();
-        if (body == null) {
-            JetPsiFactory psiFactory = JetPsiFactory(classOrObject);
-            classOrObject.add(psiFactory.createWhiteSpace());
-            body = (JetClassBody) classOrObject.add(psiFactory.createEmptyClassBody());
+        PsiElement firstGenerated = ApplicationManager.getApplication().runWriteAction(new Computable<PsiElement>() {
+            @Override
+            public PsiElement compute() {
+                JetClassBody body = classOrObject.getBody();
+                if (body == null) {
+                    JetPsiFactory psiFactory = JetPsiFactory(classOrObject);
+                    classOrObject.add(psiFactory.createWhiteSpace());
+                    body = (JetClassBody) classOrObject.add(psiFactory.createEmptyClassBody());
+                }
+
+                PsiElement afterAnchor = findInsertAfterAnchor(editor, body);
+
+                if (afterAnchor == null) {
+                    return null;
+                }
+
+                PsiElement firstGenerated = null;
+
+                List<JetElement> elementsToCompact = new ArrayList<JetElement>();
+                JetFile file = classOrObject.getContainingJetFile();
+                for (JetElement element : generateOverridingMembers(selectedElements, file)) {
+                    PsiElement added = body.addAfter(element, afterAnchor);
+
+                    if (firstGenerated == null) {
+                        firstGenerated = added;
+                    }
+
+                    afterAnchor = added;
+                    elementsToCompact.add((JetElement) added);
+                }
+
+                ShortenReferences.INSTANCE$.process(elementsToCompact);
+
+                return firstGenerated;
+            }
+        });
+
+        if (firstGenerated != null) {
+            QuickfixPackage.moveCaretIntoGeneratedElement(editor, firstGenerated);
         }
-
-        PsiElement afterAnchor = findInsertAfterAnchor(editor, body);
-
-        if (afterAnchor == null) {
-            return;
-        }
-
-        List<JetElement> elementsToCompact = new ArrayList<JetElement>();
-        JetFile file = classOrObject.getContainingJetFile();
-        for (JetElement element : generateOverridingMembers(selectedElements, file)) {
-            PsiElement added = body.addAfter(element, afterAnchor);
-            afterAnchor = added;
-            elementsToCompact.add((JetElement) added);
-        }
-
-        ShortenReferences.INSTANCE$.process(elementsToCompact);
     }
 
     @Nullable
@@ -270,9 +290,9 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns
 
     protected abstract String getNoMethodsFoundHint();
 
-    public void invoke(@NotNull Project project, @NotNull final Editor editor, @NotNull PsiFile file, boolean implementAll) {
+    public void invoke(@NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file, boolean implementAll) {
         PsiElement elementAtCaret = file.findElementAt(editor.getCaretModel().getOffset());
-        final JetClassOrObject classOrObject = PsiTreeUtil.getParentOfType(elementAtCaret, JetClassOrObject.class);
+        JetClassOrObject classOrObject = PsiTreeUtil.getParentOfType(elementAtCaret, JetClassOrObject.class);
 
         assert classOrObject != null : "ClassObject should be checked in isValidFor method";
 
@@ -283,7 +303,7 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns
         }
         List<DescriptorClassMember> members = membersFromDescriptors((JetFile) file, missingImplementations);
 
-        final List<DescriptorClassMember> selectedElements;
+        List<DescriptorClassMember> selectedElements;
         if (implementAll) {
             selectedElements = members;
         }
@@ -302,12 +322,7 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns
 
         PsiDocumentManager.getInstance(project).commitAllDocuments();
 
-        ApplicationManager.getApplication().runWriteAction(new Runnable() {
-            @Override
-            public void run() {
-                generateMethods(editor, classOrObject, selectedElements);
-            }
-        });
+        generateMethods(editor, classOrObject, selectedElements);
     }
 
     @Override
diff --git a/idea/testData/codeInsight/overrideImplement/checkNotImportedTypesFromJava/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/checkNotImportedTypesFromJava/foo/Impl.kt.after
index 677355b47d5..e1dd792cf14 100644
--- a/idea/testData/codeInsight/overrideImplement/checkNotImportedTypesFromJava/foo/Impl.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/checkNotImportedTypesFromJava/foo/Impl.kt.after
@@ -6,7 +6,7 @@ import bar.Bar
 
 class Impl: Foo() {
     override fun foo(list: ArrayList<Int>?, other: Other?): Bar? {
-        throw UnsupportedOperationException()
+        <selection><caret>throw UnsupportedOperationException()</selection>
     }
 }
 
diff --git a/idea/testData/codeInsight/overrideImplement/complexMultiOverride.kt.after b/idea/testData/codeInsight/overrideImplement/complexMultiOverride.kt.after
index 78100104238..115324684f2 100644
--- a/idea/testData/codeInsight/overrideImplement/complexMultiOverride.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/complexMultiOverride.kt.after
@@ -6,7 +6,7 @@ open class Base<A, B, C>() {
 
 class C : Base<String, C, Unit>() {
     override fun bar(value: () -> Unit): (String) -> Unit {
-        return super<Base>.bar(value)
+        <selection><caret>return super<Base>.bar(value)</selection>
     }
     override fun equals(other: Any?): Boolean {
         return super<Base>.equals(other)
diff --git a/idea/testData/codeInsight/overrideImplement/delegatedMembers.kt.after b/idea/testData/codeInsight/overrideImplement/delegatedMembers.kt.after
index 97133cf12fa..a840aa39221 100644
--- a/idea/testData/codeInsight/overrideImplement/delegatedMembers.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/delegatedMembers.kt.after
@@ -5,7 +5,7 @@ trait T {
 
 class C(t :T) : T by t {
     override fun bar() {
-        throw UnsupportedOperationException()
+        <selection><caret>throw UnsupportedOperationException()</selection>
     }
     override fun equals(other: Any?): Boolean {
         return super<T>.equals(other)
diff --git a/idea/testData/codeInsight/overrideImplement/emptyClassBodyFunctionMethod.kt.after b/idea/testData/codeInsight/overrideImplement/emptyClassBodyFunctionMethod.kt.after
index a45b0a7ee27..cfaf2fc8c34 100644
--- a/idea/testData/codeInsight/overrideImplement/emptyClassBodyFunctionMethod.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/emptyClassBodyFunctionMethod.kt.after
@@ -5,6 +5,6 @@ trait T {
 
 class C : T {
     override fun Foo(): (String) -> Unit {
-        throw UnsupportedOperationException()
+        <selection><caret>throw UnsupportedOperationException()</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 a45b0a7ee27..cfaf2fc8c34 100644
--- a/idea/testData/codeInsight/overrideImplement/functionMethod.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/functionMethod.kt.after
@@ -5,6 +5,6 @@ trait T {
 
 class C : T {
     override fun Foo(): (String) -> Unit {
-        throw UnsupportedOperationException()
+        <selection><caret>throw UnsupportedOperationException()</selection>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/functionProperty.kt b/idea/testData/codeInsight/overrideImplement/functionProperty.kt
index 120b33b00d1..32b3fc10ef5 100644
--- a/idea/testData/codeInsight/overrideImplement/functionProperty.kt
+++ b/idea/testData/codeInsight/overrideImplement/functionProperty.kt
@@ -6,3 +6,5 @@ trait A {
 fun some() : A {
     return object : A {<caret>}
 }
+
+// TODO: need better selection and caret
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/functionProperty.kt.after b/idea/testData/codeInsight/overrideImplement/functionProperty.kt.after
index 79a9173cbee..1100b2ca473 100644
--- a/idea/testData/codeInsight/overrideImplement/functionProperty.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/functionProperty.kt.after
@@ -4,7 +4,9 @@ trait A {
 }
 
 fun some() : A {
-    return object : A {
+    return object : A {<caret>
         override val method: () -> Unit? = ?
     }
 }
+
+// TODO: need better selection and caret
\ 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 de1bfc6d25a..618c827f73f 100644
--- a/idea/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt.after
@@ -4,6 +4,6 @@ trait Trait {
 
 class TraitImpl : Trait {
     override fun <A, B : Runnable, E : Map.Entry<A, B>> foo() where B : Cloneable, B : Comparable<B> {
-        throw UnsupportedOperationException()
+        <selection><caret>throw UnsupportedOperationException()</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 096c168630f..1a26be78483 100644
--- a/idea/testData/codeInsight/overrideImplement/generateMulti.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/generateMulti.kt.after
@@ -8,7 +8,7 @@ trait Some<T> {
 
 class SomeOther<S> : Some<S> {
     override fun someFoo() {
-        throw UnsupportedOperationException()
+        <selection><caret>throw UnsupportedOperationException()</selection>
     }
     override fun someGenericFoo(): S {
         throw UnsupportedOperationException()
diff --git a/idea/testData/codeInsight/overrideImplement/genericMethod.kt.after b/idea/testData/codeInsight/overrideImplement/genericMethod.kt.after
index 59c0b9523ac..13767de189d 100644
--- a/idea/testData/codeInsight/overrideImplement/genericMethod.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/genericMethod.kt.after
@@ -4,6 +4,6 @@ trait G<T> {
 
 class GC() : G<Int> {
     override fun foo(t: Int): Int {
-        throw UnsupportedOperationException()
+        <selection><caret>throw UnsupportedOperationException()</selection>
     }
 }
diff --git a/idea/testData/codeInsight/overrideImplement/genericTypesSeveralMethods.kt.after b/idea/testData/codeInsight/overrideImplement/genericTypesSeveralMethods.kt.after
index 4f60a4c3443..ca6e2a55cb8 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> {
-        throw UnsupportedOperationException()
+        <selection><caret>throw UnsupportedOperationException()</selection>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/implementSamAdapters/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/implementSamAdapters/foo/Impl.kt.after
index 2705112bc26..4ccad3ed591 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?) {
-        throw UnsupportedOperationException()
+        <selection><caret>throw UnsupportedOperationException()</selection>
     }
 }
diff --git a/idea/testData/codeInsight/overrideImplement/inheritVisibilities.kt.after b/idea/testData/codeInsight/overrideImplement/inheritVisibilities.kt.after
index 09ecb6ed74a..9efbadc58d9 100644
--- a/idea/testData/codeInsight/overrideImplement/inheritVisibilities.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/inheritVisibilities.kt.after
@@ -12,7 +12,7 @@ trait B {
 
 class C : A(), B {
     override fun equals(other: Any?): Boolean {
-        return super<A>.equals(other)
+        <selection><caret>return super<A>.equals(other)</selection>
     }
     override fun hashCode(): Int {
         return super<A>.hashCode()
diff --git a/idea/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.after
index 49405a888ac..407807ab486 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? {
-        throw UnsupportedOperationException()
+        <selection><caret>throw UnsupportedOperationException()</selection>
     }
 }
diff --git a/idea/testData/codeInsight/overrideImplement/javaMethodWithPackageProtectedVisibility/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/javaMethodWithPackageProtectedVisibility/foo/Impl.kt.after
index 58f1610e019..2e785dfaacf 100644
--- a/idea/testData/codeInsight/overrideImplement/javaMethodWithPackageProtectedVisibility/foo/Impl.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/javaMethodWithPackageProtectedVisibility/foo/Impl.kt.after
@@ -4,6 +4,6 @@ import foo.Intf
 
 class Impl(): Intf() {
     override fun getFooBar(): String? {
-        return super<Intf>.getFooBar()
+        <selection><caret>return super<Intf>.getFooBar()</selection>
     }
 }
diff --git a/idea/testData/codeInsight/overrideImplement/javaMethodWithPackageVisibility/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/javaMethodWithPackageVisibility/foo/Impl.kt.after
index 58f1610e019..2e785dfaacf 100644
--- a/idea/testData/codeInsight/overrideImplement/javaMethodWithPackageVisibility/foo/Impl.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/javaMethodWithPackageVisibility/foo/Impl.kt.after
@@ -4,6 +4,6 @@ import foo.Intf
 
 class Impl(): Intf() {
     override fun getFooBar(): String? {
-        return super<Intf>.getFooBar()
+        <selection><caret>return super<Intf>.getFooBar()</selection>
     }
 }
diff --git a/idea/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.after
index d6467330ed4..8da281bcf31 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?) {
-        throw UnsupportedOperationException()
+        <selection><caret>throw UnsupportedOperationException()</selection>
     }
 }
diff --git a/idea/testData/codeInsight/overrideImplement/multiOverride.kt.after b/idea/testData/codeInsight/overrideImplement/multiOverride.kt.after
index 0d933975b3f..c7cd2e5e918 100644
--- a/idea/testData/codeInsight/overrideImplement/multiOverride.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/multiOverride.kt.after
@@ -5,7 +5,7 @@ trait A {
 
 class C : A {
     override fun bar(): String {
-        return super<A>.bar()
+        <selection><caret>return super<A>.bar()</selection>
     }
     override fun equals(other: Any?): Boolean {
         return super<A>.equals(other)
diff --git a/idea/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt.after b/idea/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt.after
index ddcb13ead82..53963ddc39e 100644
--- a/idea/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt.after
@@ -4,6 +4,6 @@ trait A {
 
 class B : A {
     override fun String.foo() {
-        throw UnsupportedOperationException()
+        <selection><caret>throw UnsupportedOperationException()</selection>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/overrideExtensionProperty.kt.after b/idea/testData/codeInsight/overrideImplement/overrideExtensionProperty.kt.after
index 23df20fd587..5c49b259528 100644
--- a/idea/testData/codeInsight/overrideImplement/overrideExtensionProperty.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/overrideExtensionProperty.kt.after
@@ -4,5 +4,5 @@ trait A {
 
 class B : A {
     override val String.prop: Int
-        get() = 0
+        get() = <selection><caret>0</selection>
 }
diff --git a/idea/testData/codeInsight/overrideImplement/overrideFunctionProperty.kt b/idea/testData/codeInsight/overrideImplement/overrideFunctionProperty.kt
index 508e0d84fb8..762b66b7d12 100644
--- a/idea/testData/codeInsight/overrideImplement/overrideFunctionProperty.kt
+++ b/idea/testData/codeInsight/overrideImplement/overrideFunctionProperty.kt
@@ -5,3 +5,5 @@ open class A() {
 fun some() : A {
     return object : A() {<caret>}
 }
+
+// TODO: need better selection and caret
diff --git a/idea/testData/codeInsight/overrideImplement/overrideFunctionProperty.kt.after b/idea/testData/codeInsight/overrideImplement/overrideFunctionProperty.kt.after
index 37199e16f0d..db16a5d356f 100644
--- a/idea/testData/codeInsight/overrideImplement/overrideFunctionProperty.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/overrideFunctionProperty.kt.after
@@ -3,7 +3,9 @@ open class A() {
 }
 
 fun some() : A {
-    return object : A() {
+    return object : A() {<caret>
         override val method: () -> Unit? = ?
     }
 }
+
+// TODO: need better selection and caret
diff --git a/idea/testData/codeInsight/overrideImplement/overrideGenericFunction.kt.after b/idea/testData/codeInsight/overrideImplement/overrideGenericFunction.kt.after
index d75e59e5bba..b2642a1af87 100644
--- a/idea/testData/codeInsight/overrideImplement/overrideGenericFunction.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/overrideGenericFunction.kt.after
@@ -4,6 +4,6 @@ trait A<T> {
 
 class C : A<C> {
     override fun foo(value: C) {
-        super<A>.foo(value)
+        <selection><caret>super<A>.foo(value)</selection>
     }
 }
diff --git a/idea/testData/codeInsight/overrideImplement/overrideJavaMethod/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/overrideJavaMethod/foo/Impl.kt.after
index f93d94f496d..51626db22a1 100644
--- a/idea/testData/codeInsight/overrideImplement/overrideJavaMethod/foo/Impl.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/overrideJavaMethod/foo/Impl.kt.after
@@ -2,6 +2,6 @@ import foo.A
 
 class C : A() {
     override fun getAnswer(array: Array<out String>?, number: Int, value: Any?): Int {
-        return super<A>.getAnswer(array, number, value)
+        <selection><caret>return super<A>.getAnswer(array, number, value)</selection>
     }
 }
diff --git a/idea/testData/codeInsight/overrideImplement/overrideMutableExtensionProperty.kt.after b/idea/testData/codeInsight/overrideImplement/overrideMutableExtensionProperty.kt.after
index 0cca4020029..38f8135afbd 100644
--- a/idea/testData/codeInsight/overrideImplement/overrideMutableExtensionProperty.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/overrideMutableExtensionProperty.kt.after
@@ -4,7 +4,7 @@ trait A {
 
 class B : A {
     override var Int.foo: Double
-        get() = 0.0
+        get() = <selection><caret>0.0</selection>
         set(value) {
         }
 }
diff --git a/idea/testData/codeInsight/overrideImplement/overrideNonUnitFunction.kt.after b/idea/testData/codeInsight/overrideImplement/overrideNonUnitFunction.kt.after
index 0cfbb5a681f..c0f920ab107 100644
--- a/idea/testData/codeInsight/overrideImplement/overrideNonUnitFunction.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/overrideNonUnitFunction.kt.after
@@ -4,6 +4,6 @@ trait A {
 
 class C : A {
     override fun foo(value: String): Int {
-        return super<A>.foo(value)
+        <selection><caret>return super<A>.foo(value)</selection>
     }
 }
diff --git a/idea/testData/codeInsight/overrideImplement/overridePrimitiveProperty.kt.after b/idea/testData/codeInsight/overrideImplement/overridePrimitiveProperty.kt.after
index 773139e5ecb..74a2b930204 100644
--- a/idea/testData/codeInsight/overrideImplement/overridePrimitiveProperty.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/overridePrimitiveProperty.kt.after
@@ -10,7 +10,7 @@ trait T {
 }
 
 class C : T {
-    override val a1: Byte = 0
+    override val a1: Byte = <selection><caret>0</selection>
     override val a2: Short = 0
     override val a3: Int = 0
     override val a4: Long = 0
diff --git a/idea/testData/codeInsight/overrideImplement/overrideRespectCaretPosition.kt.after b/idea/testData/codeInsight/overrideImplement/overrideRespectCaretPosition.kt.after
index 01098b8c902..73bc5134be9 100644
--- a/idea/testData/codeInsight/overrideImplement/overrideRespectCaretPosition.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/overrideRespectCaretPosition.kt.after
@@ -6,7 +6,7 @@ open class A() {
 class C : A() {
     val constant = 42
     // Some comment
-    override val bar: Int = 0
+    override val bar: Int = <selection><caret>0</selection>
     override fun equals(other: Any?): Boolean {
         return super<A>.equals(other)
     }
diff --git a/idea/testData/codeInsight/overrideImplement/overrideSamAdapters/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/overrideSamAdapters/foo/Impl.kt.after
index 8d16dccda51..f3e27752c97 100644
--- a/idea/testData/codeInsight/overrideImplement/overrideSamAdapters/foo/Impl.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/overrideSamAdapters/foo/Impl.kt.after
@@ -2,6 +2,6 @@ package foo
 
 class Impl: B() {
     override fun foo(r: Runnable?) {
-        super<B>.foo(r)
+        <selection><caret>super<B>.foo(r)</selection>
     }
 }
diff --git a/idea/testData/codeInsight/overrideImplement/overrideUnitFunction.kt.after b/idea/testData/codeInsight/overrideImplement/overrideUnitFunction.kt.after
index 15f0a985336..0c07ec2f1a2 100644
--- a/idea/testData/codeInsight/overrideImplement/overrideUnitFunction.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/overrideUnitFunction.kt.after
@@ -4,6 +4,6 @@ trait A {
 
 class C : A {
     override fun foo(value: String) {
-        super<A>.foo(value)
+        <selection><caret>super<A>.foo(value)</selection>
     }
 }
diff --git a/idea/testData/codeInsight/overrideImplement/propagationKJK/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/propagationKJK/foo/Impl.kt.after
index 4ae8497a8c1..35abf62d33b 100644
--- a/idea/testData/codeInsight/overrideImplement/propagationKJK/foo/Impl.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/propagationKJK/foo/Impl.kt.after
@@ -2,6 +2,6 @@ package foo
 
 class Impl : Bar() {
     override fun f(): Any {
-        return super<Bar>.f()
+        <selection><caret>return super<Bar>.f()</selection>
     }
 }
diff --git a/idea/testData/codeInsight/overrideImplement/property.kt.after b/idea/testData/codeInsight/overrideImplement/property.kt.after
index b5f14fd36bd..cacc967511f 100644
--- a/idea/testData/codeInsight/overrideImplement/property.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/property.kt.after
@@ -3,5 +3,5 @@ trait T {
 }
 
 class GC() : T {
-    override val v: Int = 0
+    override val v: Int = <selection><caret>0</selection>
 }
diff --git a/idea/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after b/idea/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after
index 1df50d610ef..2538fd2f44d 100644
--- a/idea/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after
@@ -6,7 +6,7 @@ trait Test {
 class SomeTest : Test {
     val hello = 12
     override fun test() {
-        throw UnsupportedOperationException()
+        <selection><caret>throw UnsupportedOperationException()</selection>
     }
     override val testProp: Int = 0
     /**
diff --git a/idea/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt.after
index 33e3d6466ca..3a4d8f7885d 100644
--- a/idea/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt.after
@@ -3,6 +3,6 @@ import lib.ArrayFactory
 
 public class Impl : ArrayFactory {
     override fun create(): lib.Array {
-        throw UnsupportedOperationException()
+        <selection><caret>throw UnsupportedOperationException()</selection>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/traitGenericImplement.kt.after b/idea/testData/codeInsight/overrideImplement/traitGenericImplement.kt.after
index d97c5b146c6..3111b802c11 100644
--- a/idea/testData/codeInsight/overrideImplement/traitGenericImplement.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/traitGenericImplement.kt.after
@@ -4,6 +4,6 @@ trait G<T> {
 
 class GC<T>() : G<T> {
     override fun foo(t: T): T {
-        throw UnsupportedOperationException()
+        <selection><caret>throw UnsupportedOperationException()</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 ee25a192514..2ef222e6f35 100644
--- a/idea/testData/codeInsight/overrideImplement/traitNullableFunction.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/traitNullableFunction.kt.after
@@ -4,6 +4,6 @@ trait Some {
 
 class SomeOther : Some {
     override fun foo(some: Int?): Int {
-        throw UnsupportedOperationException()
+        <selection><caret>throw UnsupportedOperationException()</selection>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/withLib/fakeOverride.kt.after b/idea/testData/codeInsight/overrideImplement/withLib/fakeOverride.kt.after
index 466d1d5605a..29988a051f3 100644
--- a/idea/testData/codeInsight/overrideImplement/withLib/fakeOverride.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/withLib/fakeOverride.kt.after
@@ -8,6 +8,6 @@ public open class B() : A() {
 
 public open class C() : B() {
     override fun foo() {
-        super<B>.foo()
+        <selection><caret>super<B>.foo()</selection>
     }
 }
\ No newline at end of file