generate constructor: do not insert new line if member would be generated in another place (IDEA-151327)

java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersHandlerBase.java

@@ -124,7 +124,9 @@ public abstract class GenerateMembersHandlerBase implements CodeInsightActionHan
     CharSequence docText = document.getCharsSequence();
     String textBeforeCaret = docText.subSequence(lineStartOffset, offset).toString();
     final String afterCaret = docText.subSequence(offset, document.getLineEndOffset(line)).toString();
-    if (textBeforeCaret.trim().length() > 0 && StringUtil.isEmptyOrSpaces(afterCaret) && !editor.getSelectionModel().hasSelection()) {
+    final PsiElement lBrace = aClass.getLBrace();
+    if (textBeforeCaret.trim().length() > 0 && StringUtil.isEmptyOrSpaces(afterCaret) &&
+        (lBrace == null || lBrace.getTextOffset() < offset) && !editor.getSelectionModel().hasSelection()) {
       EnterAction.insertNewLineAtCaret(editor);
       PsiDocumentManager.getInstance(project).commitDocument(document);
       offset = editor.getCaretModel().getOffset();

java/java-tests/testData/codeInsight/generateConstructor/afterNewLine.java

@@ -0,0 +1,8 @@
+class Test 
+{
+  private int i;
+
+    public Test(int i) {
+        this.i = i;
+    }
+}

java/java-tests/testData/codeInsight/generateConstructor/beforeNewLine.java

@@ -0,0 +1,4 @@
+class Test <caret>
+{
+  private int i;  
+}

java/java-tests/testSrc/com/intellij/codeInsight/GenerateConstructorTest.java

@@ -46,6 +46,7 @@ public class GenerateConstructorTest extends LightCodeInsightFixtureTestCase {
   }
 
   public void testAbstractClass() { doTest(); }
+  public void testNewLine() { doTest(); }
   public void testPackageLocalClass() { doTest(); }
   public void testPrivateClass() { doTest(); }
   public void testBoundComments() { doTest(); }