create subclass: restore caret position after delegate constructors are inserted (IDEA-105566)

java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorMatchingSuperFix.java

@@ -96,7 +96,7 @@ public class CreateConstructorMatchingSuperFix extends BaseIntentionAction {
 
     LOG.assertTrue(constructors.length >=1); // Otherwise we won't have been messing with all this stuff
     boolean isCopyJavadoc = true;
-    if (constructors.length > 1) {
+    if (constructors.length > 1 && !ApplicationManager.getApplication().isUnitTestMode()) {
       MemberChooser<PsiMethodMember> chooser = new MemberChooser<PsiMethodMember>(constructors, false, true, project);
       chooser.setTitle(QuickFixBundle.message("super.class.constructors.chooser.title"));
       chooser.show();

java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateSubclassAction.java

@@ -245,7 +245,7 @@ public class CreateSubclassAction extends BaseIntentionAction {
       }
       if (psiClass.hasTypeParameters() || includeClassName) {
         final Editor editor = CodeInsightUtil.positionCursor(project, targetClass.getContainingFile(), targetClass.getLBrace());
-        final TemplateBuilderImpl templateBuilder = editor != null && !ApplicationManager.getApplication().isUnitTestMode() 
+        final TemplateBuilderImpl templateBuilder = editor != null 
                    ? (TemplateBuilderImpl)TemplateBuilderFactory.getInstance().createTemplateBuilder(targetClass) : null;
         
         if (includeClassName && templateBuilder != null) {
@@ -319,9 +319,11 @@ public class CreateSubclassAction extends BaseIntentionAction {
           baseConstructors.add(new PsiMethodMember(baseConstr, substitutor));
         }
       }
+      final int offset = editor.getCaretModel().getOffset();
       CreateConstructorMatchingSuperFix.chooseConstructor2Delegate(project, editor,
                                                                    substitutor,
                                                                    baseConstructors, constructors, targetClass);
+      editor.getCaretModel().moveToOffset(offset);
     }
 
     OverrideImplementUtil.chooseAndImplementMethods(project, editor, targetClass);

java/java-tests/testData/codeInsight/createSubclass/innerClass/after/Test.java

@@ -1,6 +1,5 @@
 public class Test {
     private interface Inner {}
 
-    public class InnerImpl implements Inner {
-    }
+    public class InnerImpl implements Inner { }
 }

java/java-tests/testData/codeInsight/createSubclass/innerClassImplement/after/Test.java

@@ -0,0 +1,17 @@
+public class Test {
+    private abstract class Inner {
+      Inner(String s){}
+      abstract void bar();
+    }
+
+    public class InnerImpl extends Inner {
+        InnerImpl(String s) {
+            super(s);
+        }
+
+        @Override
+        void bar() {
+            //To change body of implemented methods use File | Settings | File Templates.
+        }
+    }
+}

java/java-tests/testData/codeInsight/createSubclass/innerClassImplement/before/Test.java

@@ -0,0 +1,6 @@
+public class Test {
+    private abstract class Inner {
+      Inner(String s){}
+      abstract void bar();
+    }
+}

java/java-tests/testSrc/com/intellij/codeInsight/intention/CreateSubclassTest.java

@@ -1,11 +1,11 @@
 package com.intellij.codeInsight.intention;
 
+import com.intellij.codeInsight.intention.impl.CreateSubclassAction;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.search.ProjectScope;
 import com.intellij.refactoring.MultiFileTestCase;
-import com.intellij.codeInsight.intention.impl.CreateSubclassAction;
 
 /**
  * @author yole
@@ -14,8 +14,16 @@ public class CreateSubclassTest extends MultiFileTestCase {
   public void testGenerics() throws Exception {
     doTest();
   }
-  
+
+  public void testInnerClassImplement() throws Exception {
+    doTestInner();
+  }
+
   public void testInnerClass() throws Exception {
+    doTestInner();
+  }
+
+  private void doTestInner() throws Exception {
     doTest(new PerformAction() {
       @Override
       public void performAction(final VirtualFile rootDir, final VirtualFile rootAfter) throws Exception {