Fixup FormatStyle::operator==, misc UnwrappedLineFormatter

Author: itzexpoexpo

clang/include/clang/Format/Format.h

@@ -5511,6 +5511,7 @@ struct FormatStyle {
            AllowShortLoopsOnASingleLine == R.AllowShortLoopsOnASingleLine &&
            AllowShortNamespacesOnASingleLine ==
                R.AllowShortNamespacesOnASingleLine &&
+           AllowShortRecordOnASingleLine == R.AllowShortRecordOnASingleLine &&
            AlwaysBreakBeforeMultilineStrings ==
                R.AlwaysBreakBeforeMultilineStrings &&
            AttributeMacros == R.AttributeMacros &&

clang/lib/Format/UnwrappedLineFormatter.cpp

@@ -500,7 +500,7 @@ class LineJoiner {
                  : 0;
     }
 
-    auto TryMergeShortRecord = [&]() {
+    auto TryMergeShortRecord = [&] {
       switch (Style.AllowShortRecordOnASingleLine) {
       case FormatStyle::SRS_Never:
         return false;
@@ -527,7 +527,7 @@ class LineJoiner {
           // correctly elsewhere.
           ShouldMerge =
               !Style.BraceWrapping.AfterClass ||
-              (TryMergeShortRecord() && !Style.BraceWrapping.SplitEmptyRecord);
+              (!Style.BraceWrapping.SplitEmptyRecord && TryMergeShortRecord());
         }
       } else if (TheLine->InPPDirective ||
                  !TheLine->First->isOneOf(tok::kw_class, tok::kw_enum,
@@ -904,7 +904,11 @@ class LineJoiner {
       } else if (Limit != 0 && !Line.startsWithNamespace() &&
                  !startsExternCBlock(Line)) {
         // Merge short records only when requested.
-        if (isRecordLBrace(*Line.Last) &&
+        if (Line.Last->isOneOf(TT_EnumLBrace, TT_RecordLBrace))
+          return 0;
+
+        if (Line.Last->isOneOf(TT_ClassLBrace, TT_StructLBrace,
+                               TT_UnionLBrace) &&
             Style.AllowShortRecordOnASingleLine != FormatStyle::SRS_Always) {
           return 0;
         }
@@ -961,14 +965,16 @@ class LineJoiner {
       Limit -= 2;
       unsigned MergedLines = 0;
 
-      const bool TryMergeBlock =
-          Style.AllowShortBlocksOnASingleLine != FormatStyle::SBS_Never;
-      const bool TryMergeRecord =
-          Style.AllowShortRecordOnASingleLine == FormatStyle::SRS_Always;
-      const bool NextIsEmptyBlock = I[1]->First == I[1]->Last && I + 2 != E &&
-                                    I[2]->First->is(tok::r_brace);
+      auto TryMergeBlock = [&] {
+        if (Style.AllowShortBlocksOnASingleLine != FormatStyle::SBS_Never ||
+            Style.AllowShortRecordOnASingleLine == FormatStyle::SRS_Always) {
+          return true;
+        }
+        return I[1]->First == I[1]->Last && I + 2 != E &&
+               I[2]->First->is(tok::r_brace);
+      };
 
-      if (TryMergeBlock || TryMergeRecord || NextIsEmptyBlock) {
+      if (TryMergeBlock()) {
         MergedLines = tryMergeSimpleBlock(I + 1, E, Limit);
         // If we managed to merge the block, count the statement header, which
         // is on a separate line.