Update release notes, fixup UnwrappedLineFormatter

Author: itzexpoexpo

clang/docs/ReleaseNotes.rst

@@ -543,7 +543,11 @@ clang-format
 - Add ``NumericLiteralCase`` option for enforcing character case in numeric
   literals.
 - Add ``Leave`` suboption to ``IndentPPDirectives``.
+<<<<<<< HEAD
 - Add ``AllowBreakBeforeQtProperty`` option.
+=======
+- Add ``AllowShortRecordOnASingleLine`` option and set it to ``EmptyIfAttached`` for LLVM style.
+>>>>>>> 47fe17fb9e64 (Update release notes, fixup UnwrappedLineFormatter)
 
 libclang
 --------

clang/lib/Format/UnwrappedLineFormatter.cpp

@@ -500,7 +500,7 @@ class LineJoiner {
                  : 0;
     }
 
-    const bool TryMergeShortRecord = [&]() {
+    auto TryMergeShortRecord = [&]() {
       switch (Style.AllowShortRecordOnASingleLine) {
       case FormatStyle::SRS_Never:
         return false;
@@ -510,7 +510,7 @@ class LineJoiner {
       case FormatStyle::SRS_Always:
         return true;
       }
-    }() && !Style.BraceWrapping.SplitEmptyRecord;
+    };
 
     if (TheLine->Last->is(tok::l_brace)) {
       bool ShouldMerge = false;
@@ -525,7 +525,9 @@ class LineJoiner {
           // NOTE: We use AfterClass (whereas AfterStruct exists) for both
           // classes and structs, but it seems that wrapping is still handled
           // correctly elsewhere.
-          ShouldMerge = !Style.BraceWrapping.AfterClass || TryMergeShortRecord;
+          ShouldMerge =
+              !Style.BraceWrapping.AfterClass ||
+              (TryMergeShortRecord() && !Style.BraceWrapping.SplitEmptyRecord);
         }
       } else if (TheLine->InPPDirective ||
                  !TheLine->First->isOneOf(tok::kw_class, tok::kw_enum,
@@ -959,12 +961,12 @@ class LineJoiner {
       Limit -= 2;
       unsigned MergedLines = 0;
 
-      bool TryMergeBlock =
+      const bool TryMergeBlock =
           Style.AllowShortBlocksOnASingleLine != FormatStyle::SBS_Never;
-      bool TryMergeRecord =
+      const bool TryMergeRecord =
           Style.AllowShortRecordOnASingleLine == FormatStyle::SRS_Always;
-      bool NextIsEmptyBlock = I[1]->First == I[1]->Last && I + 2 != E &&
-                              I[2]->First->is(tok::r_brace);
+      const bool NextIsEmptyBlock = I[1]->First == I[1]->Last && I + 2 != E &&
+                                    I[2]->First->is(tok::r_brace);
 
       if (TryMergeBlock || TryMergeRecord || NextIsEmptyBlock) {
         MergedLines = tryMergeSimpleBlock(I + 1, E, Limit);