[clang-format] Fix `BraceWrapping: AfterFunction` affecting synchronized blocks in Java.

[curdeius]

Summary

Fixes https://github.com/llvm/llvm-project/issues/32031.

Before this change, BraceWrapping: AfterFunction would affect synchronized blocks in Java, but they should be formatted w.r.t. BraceWrapping: AfterControlStatement.

Using the config:

BreakBeforeBraces: Custom
BraceWrapping:
  AfterControlStatement: false
  AfterFunction: true

would result in misformatted code like:

class Foo {
  void bar()
  {
    synchronized (this)
    {
      a();
      a();
    }
  }
}

instead of:

class Foo {
  void bar()
  {
    synchronized (this) {
      a();
      a();
    }
  }
}

[owenpan]

LGTM except for the nits.

clang/lib/Format/UnwrappedLineParser.cpp

1526–1533

Remove redundant parens.

1533

Add braces to "keep it uniform" with the if block.

[MyDeveloperDay]

LGTM

[curdeius]

Thanks for the reviews!

clang/lib/Format/UnwrappedLineParser.cpp

1526–1533

I don't think they're redundant because of 2 reasons: nested if and comment inside.
Cf. https://llvm.org/docs/CodingStandards.html#don-t-use-braces-on-simple-single-statement-bodies-of-if-else-loop-statements.

1533

Will do.

[owenpan]

clang/lib/Format/UnwrappedLineParser.cpp

1526–1533

By "parens" I meant ( and ). :)

[curdeius]

clang/lib/Format/UnwrappedLineParser.cpp

1526–1533

Sorry, my bad.

clang/lib/Format/UnwrappedLineParser.cpp

case tok::caret:
         parseChildBlock();
       break;
     case tok::l_brace:
       if (!tryToParsePropertyAccessor() && !tryToParseBracedList()) {
         // A block outside of parentheses must be the last part of a
         // structural element.
         // FIXME: Figure out cases where this is not true, and add projections
         // for them (the one we know is missing are lambdas).
-        if (Style.BraceWrapping.AfterFunction)
+        if (Style.Language == FormatStyle::LK_Java &&
+            Line->Tokens.front().Tok->is(Keywords.kw_synchronized)) {
+          // If necessary, we could set the type to something different than
+          // TT_FunctionLBrace.
+          if (Style.BraceWrapping.AfterControlStatement ==
+              FormatStyle::BWACS_Always)
             addUnwrappedLine();
+        } else if (Style.BraceWrapping.AfterFunction) {
+          addUnwrappedLine();
+        }
         FormatTok->setType(TT_FunctionLBrace);
         parseBlock();
         addUnwrappedLine();
         return;
       }
       // Otherwise this was a braced init list, and the structural
       // element continues.
       break;

clang/unittests/Format/FormatTestJava.cpp

verifyFormat("try (SomeResource rs = someFunction()) {\n"
                "  HandleException(e);\n"
                "}");
 }
 
 TEST_F(FormatTestJava, SynchronizedKeyword) {
   verifyFormat("synchronized (mData) {\n"
                "  // ...\n"
                "}");
+
+  FormatStyle Style = getLLVMStyle(FormatStyle::LK_Java);
+  Style.BreakBeforeBraces = FormatStyle::BS_Custom;
+
+  Style.BraceWrapping.AfterControlStatement = FormatStyle::BWACS_Always;
+  Style.BraceWrapping.AfterFunction = false;
+  verifyFormat("synchronized (mData)\n"
+               "{\n"
+               "  // ...\n"
+               "}",
+               Style);
+
+  Style.BraceWrapping.AfterControlStatement = FormatStyle::BWACS_Never;
+  Style.BraceWrapping.AfterFunction = true;
+  verifyFormat("synchronized (mData) {\n"
+               "  // ...\n"
+               "}",
+               Style);
 }
 
 TEST_F(FormatTestJava, AssertKeyword) {
   verifyFormat("assert a && b;");
   verifyFormat("assert (a && b);");
 }
 
 TEST_F(FormatTestJava, PackageDeclarations) {