Merge remote-tracking branch 'origin/master'

java/java-tests/testData/codeInsight/typing/fixIfByBraceCompositeCondition_after.java

@@ -0,0 +1,5 @@
+class C {
+  boolean f() {
+    if (f() && new Object(){<caret>)
+  }
+}

java/java-tests/testData/codeInsight/typing/fixIfByBraceCompositeCondition_before.java

@@ -0,0 +1,5 @@
+class C {
+  boolean f() {
+    if (f() && new Object()<caret>)
+  }
+}

java/java-tests/testData/codeInsight/typing/fixIfByBraceNewObject_after.java

@@ -0,0 +1,5 @@
+class C {
+  boolean f() {
+    if (new Object(){<caret>)
+  }
+}

java/java-tests/testData/codeInsight/typing/fixIfByBraceNewObject_before.java

@@ -0,0 +1,5 @@
+class C {
+  boolean f() {
+    if (new Object()<caret>)
+  }
+}

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

@@ -78,6 +78,14 @@ public class JavaTypingTest extends LightPlatformCodeInsightFixtureTestCase {
     doTest('{');
   }
 
+  public void testFixIfByBraceNewObject() {
+    doTest('{');
+  }
+
+  public void testFixIfByBraceCompositeCondition() {
+    doTest('{');
+  }
+
   public void testFixWhileByBrace() {
     doTest('{');
   }