From 9ffa29ca2dde544dfd6df3e0fa6f79d51cada575 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Thu, 20 Oct 2016 18:10:31 +0200
Subject: [PATCH] doPostponedFormatting after formatting in completion after
 new (IDEA-CR-14717)

---
 .../completion/ConstructorInsertHandler.java           |  1 +
 .../signature/NewAnonymousInMethodArgTemplate.java     |  9 +++++++++
 .../NewAnonymousInMethodArgTemplate_after.java         | 10 ++++++++++
 .../completion/SignatureCompletionTest.groovy          |  8 ++++++++
 4 files changed, 28 insertions(+)
 create mode 100644 java/java-tests/testData/codeInsight/completion/signature/NewAnonymousInMethodArgTemplate.java
 create mode 100644 java/java-tests/testData/codeInsight/completion/signature/NewAnonymousInMethodArgTemplate_after.java

diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/ConstructorInsertHandler.java b/java/java-impl/src/com/intellij/codeInsight/completion/ConstructorInsertHandler.java
index 03369610d3c3..9e61965f730f 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/ConstructorInsertHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/ConstructorInsertHandler.java
@@ -194,6 +194,7 @@ public class ConstructorInsertHandler implements InsertHandler<LookupElementDeco
     PsiExpressionList listToReformat = getEnclosingExpressionList(elementAtOffset.getParent());
     if (listToReformat != null) {
       CodeStyleManager.getInstance(file.getProject()).reformat(listToReformat);
+      PostprocessReformattingAspect.getInstance(file.getProject()).doPostponedFormatting();
     }
   }
 
diff --git a/java/java-tests/testData/codeInsight/completion/signature/NewAnonymousInMethodArgTemplate.java b/java/java-tests/testData/codeInsight/completion/signature/NewAnonymousInMethodArgTemplate.java
new file mode 100644
index 000000000000..946347aaa145
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/signature/NewAnonymousInMethodArgTemplate.java
@@ -0,0 +1,9 @@
+abstract class A {
+    A(int x){}
+    abstract void foo();
+    void test(A a){}
+
+    {
+        tes<caret>
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/signature/NewAnonymousInMethodArgTemplate_after.java b/java/java-tests/testData/codeInsight/completion/signature/NewAnonymousInMethodArgTemplate_after.java
new file mode 100644
index 000000000000..1d4ad2405673
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/signature/NewAnonymousInMethodArgTemplate_after.java
@@ -0,0 +1,10 @@
+abstract class A {
+    A(int x){}
+    abstract void foo();
+    void test(A a){}
+
+    {
+        test(new A(<selection>x<caret></selection>) {
+        });
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SignatureCompletionTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SignatureCompletionTest.groovy
index bed15ad0b482..3914cad4eacf 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SignatureCompletionTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SignatureCompletionTest.groovy
@@ -76,4 +76,12 @@ class SignatureCompletionTest extends LightFixtureCompletionTestCase {
     checkResult()
   }
 
+  void testNewAnonymousInMethodArgTemplate() {
+    configureByTestName()
+    myFixture.type('new ')
+    myFixture.complete(CompletionType.SMART)
+    myFixture.type('\n')
+    checkResult()
+  }
+
 }