Fix missing empty block check

Author: itzexpoexpo

clang/lib/Format/UnwrappedLineFormatter.cpp

@@ -647,7 +647,8 @@ class LineJoiner {
           Line->Last->is(tok::l_brace) && NextLine->First->is(tok::r_brace);
 
       if ((IsEmptyBlock && !Style.BraceWrapping.SplitEmptyRecord) ||
-          Style.AllowShortBlocksOnASingleLine == FormatStyle::SBS_Always) {
+          (!IsEmptyBlock &&
+           Style.AllowShortBlocksOnASingleLine == FormatStyle::SBS_Always)) {
         return tryMergeSimpleBlock(I, E, Limit);
       }
     }

clang/unittests/Format/FormatTest.cpp

@@ -15410,7 +15410,11 @@ TEST_F(FormatTest, AllowShortRecordOnASingleLine) {
                "{ int i; };",
                Style);
   Style.AllowShortRecordOnASingleLine = FormatStyle::SRS_Always;
-  verifyFormat("class foo { int i; };", Style);
+  verifyFormat("class foo\n"
+               "{\n"
+               "};\n"
+               "class foo { int i; };",
+               Style);
 }
 
 TEST_F(FormatTest, UnderstandContextOfRecordTypeKeywords) {