clang-format: never align after 'return' for Java

[het]

Summary

In Java, alignment after returns is usually disabled: see https://github.com/google/guava/blob/master/guava/src/com/google/common/collect/Maps.java#L548

[djasper]

Hm. If you think this is Java-specific, I might be inclined to gate this based on the Style's Language for now. The problem is that each additional configuration flag has a certain amount of cost, e.g. because:

• Style flags become less discoverable
• Maintenance increases when ensuring that all combinations of flags work as expected

[djasper]

Submitted as r222424.

lib/Format/ContinuationIndenter.cpp

for (SmallVectorImpl<prec::Level>::const_reverse_iterator
        I != E; ++I) {
     ParenState NewParenState = State.Stack.back();
     NewParenState.ContainsLineBreak = false;
 
     // Indent from 'LastSpace' unless these are fake parentheses encapsulating
     // a builder type call after 'return' or, if the alignment after opening
     // brackets is disabled.
     if (!Current.isTrailingComment() &&
-        (!Previous || Previous->isNot(tok::kw_return) || *I > 0) &&
+        (!Previous || Previous->isNot(tok::kw_return) ||
+         (Style.Language != FormatStyle::LK_Java && *I > 0)) &&
         (Style.AlignAfterOpenBracket || *I != prec::Comma ||
          Current.NestingLevel == 0))
       NewParenState.Indent =
           std::max(std::max(State.Column, NewParenState.Indent),
                    State.Stack.back().LastSpace);
 
     // Don't allow the RHS of an operator to be split over multiple lines unless
     // there is a line-break right after the operator.

unittests/Format/FormatTestJava.cpp

 }
 
 TEST_F(FormatTestJava, CppKeywords) {
   verifyFormat("public void union(Type a, Type b);");
   verifyFormat("public void struct(Object o);");
   verifyFormat("public void delete(Object o);");
 }
 
+TEST_F(FormatTestJava, NeverAlignReturns) {
+  verifyFormat("return aaaaaaaaaaaaaaaaaaa\n"
+               "    && bbbbbbbbbbbbbbbbbbb\n"
+               "    && ccccccccccccccccccc",
+               getStyleWithColumns(40));
+  verifyFormat("return (result == null)\n"
+               "    ? aaaaaaaaaaaaaaaaa\n"
+               "    : bbbbbbbbbbbbbbbbb",
+               getStyleWithColumns(40));
+}
+
 } // end namespace tooling
 } // end namespace clang