Merge remote-tracking branch 'origin/master'

java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java

@@ -151,6 +151,14 @@ class BuildMessageDispatcher extends SimpleChannelHandler {
     }
   }
 
+  @Override
+  public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) throws Exception {
+    final Throwable cause = e.getCause();
+    if (cause != null) {
+      LOG.info(cause);
+    }
+    ctx.sendUpstream(e);
+  }
 
   @Override
   public void channelDisconnected(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {

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

@@ -503,4 +503,17 @@ public class JavaFormatterIndentationTest extends AbstractJavaFormatterTest {
       "// This is a line comment"
     );
   }
+
+  public void testMultilineComment() {
+    // IDEA-90860
+    String text =
+      "\n" +
+      "/*\n" +
+      " * comment\n" +
+      " */\n" +
+      "\n" +
+      "class Test {\n" +
+      "}";
+    doTextTest(text, text);
+  }
 }