customize enter handler after unmatcjed brace to insert rBrace after first expression of expression list if applicable (IDEA-152395)

java/java-impl/src/com/intellij/codeInsight/editorActions/JavaEnterAfterUnmatchedBraceHandler.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2000-2016 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 com.intellij.codeInsight.editorActions;
+
+import com.intellij.codeInsight.editorActions.enter.EnterAfterUnmatchedBraceHandler;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiExpression;
+import com.intellij.psi.PsiExpressionList;
+import com.intellij.psi.PsiExpressionListStatement;
+
+public class JavaEnterAfterUnmatchedBraceHandler extends EnterAfterUnmatchedBraceHandler {
+  @Override
+  protected int calculateOffsetToInsertClosingBraceInsideElement(PsiElement element) {
+    if (element instanceof PsiExpressionListStatement) {
+      final PsiExpressionList list = ((PsiExpressionListStatement)element).getExpressionList();
+      if (list != null) {
+        final PsiExpression[] expressions = list.getExpressions();
+        if (expressions.length > 1) {
+          return expressions[0].getTextRange().getEndOffset();
+        }
+      }
+    }
+    return super.calculateOffsetToInsertClosingBraceInsideElement(element);
+  }
+}

java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaEnterActionTest.java

@@ -103,7 +103,22 @@ public class JavaEnterActionTest extends AbstractEnterActionTestCase {
                "  \n" +
                "}");
   }
-  
+
+  public void testToCodeBlockLambda() throws Exception {
+    doTextTest("java", "class Issue {\n" +
+                       "public static void main(String[] args) {\n" +
+                       "Arrays.asList().stream().collect(() -> {<caret> new ArrayList<>(), ArrayList::add, ArrayList::addAll);\n" +
+                       "}\n" +
+                       "}",
+                        "class Issue {\n" +
+                        "public static void main(String[] args) {\n" +
+                        "Arrays.asList().stream().collect(() -> {\n" +
+                        "    new ArrayList<>()\n" +
+                        "}, ArrayList::add, ArrayList::addAll);\n" +
+                        "}\n" +
+                        "}");
+  }
+
   public void testEnter_BetweenChainedMethodCalls() throws IOException {
     doTextTest("java",
                "class T {\n" +

platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterAfterUnmatchedBraceHandler.java

@@ -305,7 +305,11 @@ public class EnterAfterUnmatchedBraceHandler extends EnterHandlerDelegateAdapter
     if (element.getTextOffset() != offset) {
       return Pair.create(null, CharArrayUtil.shiftForwardUntil(text, offset, "\n"));
     }
-    return Pair.create(element, element.getTextRange().getEndOffset());
+    return Pair.create(element, calculateOffsetToInsertClosingBraceInsideElement(element));
+  }
+
+  protected int calculateOffsetToInsertClosingBraceInsideElement(PsiElement element) {
+    return element.getTextRange().getEndOffset();
   }
 
   public static boolean isAfterUnmatchedLBrace(Editor editor, int offset, FileType fileType) {

platform/platform-resources/src/META-INF/LangExtensions.xml

@@ -626,7 +626,7 @@
 
     <enterHandlerDelegate implementation="com.intellij.codeInsight.editorActions.enter.EnterInStringLiteralHandler"/>
     <enterHandlerDelegate implementation="com.intellij.codeInsight.editorActions.enter.EnterInLineCommentHandler"/>
-    <enterHandlerDelegate implementation="com.intellij.codeInsight.editorActions.enter.EnterAfterUnmatchedBraceHandler"/>
+    <enterHandlerDelegate implementation="com.intellij.codeInsight.editorActions.enter.EnterAfterUnmatchedBraceHandler" id="afterUnmatchedBrace"/>
     <enterHandlerDelegate implementation="com.intellij.codeInsight.editorActions.enter.EnterBetweenBracesHandler"
                           id="EnterBetweenBracesHandler"/>
     <enterHandlerDelegate implementation="com.intellij.codeInsight.editorActions.enter.EnterAfterJavadocTagHandler"/>

resources/src/META-INF/IdeaPlugin.xml

@@ -1133,6 +1133,7 @@
     <lang.smartEnterProcessor language="JAVA"
                               implementationClass="com.intellij.codeInsight.editorActions.smartEnter.JavaSmartEnterProcessor"/>
     <lang.smartEnterProcessor language="JSPX" implementationClass="com.intellij.codeInsight.completion.XmlSmartEnterProcessor"/>
+    <enterHandlerDelegate implementation="com.intellij.codeInsight.editorActions.JavaEnterAfterUnmatchedBraceHandler" order="before afterUnmatchedBrace"/>
 
     <codeStyle.ReferenceAdjuster language="JAVA" implementationClass="com.intellij.psi.impl.source.codeStyle.JavaReferenceAdjuster"/>