Fix -Wswitch and -Wlogical-op-parentheses errors

Author: itzexpoexpo

clang/lib/Format/UnwrappedLineFormatter.cpp

@@ -595,13 +595,17 @@ class LineJoiner {
         return Style.BraceWrapping.AfterClass;
       case TT_UnionLBrace:
         return Style.BraceWrapping.AfterUnion;
+      default:
+        return false;
       };
     };
 
     // Current line begins both record and block, brace was not wrapped.
     if (Line->Last->isOneOf(TT_StructLBrace, TT_ClassLBrace, TT_UnionLBrace)) {
       auto TryMergeShortRecord = [&] {
         switch (Style.AllowShortRecordOnASingleLine) {
+        case FormatStyle::SRS_Never:
+          return false;
         case FormatStyle::SRS_EmptyIfAttached:
         case FormatStyle::SRS_Empty:
           return NextLine->First->is(tok::r_brace);
@@ -643,7 +647,7 @@ class LineJoiner {
       const bool IsEmptyBlock =
           Line->Last->is(tok::l_brace) && NextLine->First->is(tok::r_brace);
 
-      if (IsEmptyBlock && !Style.BraceWrapping.SplitEmptyRecord ||
+      if ((IsEmptyBlock && !Style.BraceWrapping.SplitEmptyRecord) ||
           Style.AllowShortBlocksOnASingleLine == FormatStyle::SBS_Always) {
         return tryMergeSimpleBlock(I, E, Limit);
       }