Fixup comments

Author: itzexpoexpo

clang/lib/Format/Format.cpp

@@ -1589,9 +1589,9 @@ FormatStyle getLLVMStyle(FormatStyle::LanguageKind Language) {
   LLVMStyle.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_All;
   LLVMStyle.AllowShortIfStatementsOnASingleLine = FormatStyle::SIS_Never;
   LLVMStyle.AllowShortLambdasOnASingleLine = FormatStyle::SLS_All;
-  LLVMStyle.AllowShortRecordOnASingleLine = FormatStyle::SRS_EmptyIfAttached;
   LLVMStyle.AllowShortLoopsOnASingleLine = false;
   LLVMStyle.AllowShortNamespacesOnASingleLine = false;
+  LLVMStyle.AllowShortRecordOnASingleLine = FormatStyle::SRS_EmptyIfAttached;
   LLVMStyle.AlwaysBreakAfterDefinitionReturnType = FormatStyle::DRTBS_None;
   LLVMStyle.AlwaysBreakBeforeMultilineStrings = false;
   LLVMStyle.AttributeMacros.push_back("__capability");

clang/lib/Format/TokenAnnotator.cpp

@@ -5962,13 +5962,12 @@ bool TokenAnnotator::mustBreakBefore(const AnnotatedLine &Line,
     // Don't attempt to interpret record return types as records.
     // FIXME: Not covered by tests.
     if (Right.isNot(TT_FunctionLBrace)) {
-      return ((Line.startsWith(tok::kw_class) &&
-               Style.BraceWrapping.AfterClass) ||
-              (Line.startsWith(tok::kw_struct) &&
-               Style.BraceWrapping.AfterStruct) ||
-              (Line.startsWith(tok::kw_union) &&
-               Style.BraceWrapping.AfterUnion)) &&
-             Style.AllowShortRecordOnASingleLine == FormatStyle::SRS_Never;
+      return Style.AllowShortRecordOnASingleLine == FormatStyle::SRS_Never &&
+                 (Line.startsWith(tok::kw_class) &&
+                  Style.BraceWrapping.AfterClass) ||
+             (Line.startsWith(tok::kw_struct) &&
+              Style.BraceWrapping.AfterStruct) ||
+             (Line.startsWith(tok::kw_union) && Style.BraceWrapping.AfterUnion);
     }
   }
 

clang/lib/Format/UnwrappedLineFormatter.cpp

@@ -10,7 +10,6 @@
 #include "FormatToken.h"
 #include "NamespaceEndCommentsFixer.h"
 #include "WhitespaceManager.h"
-#include "clang/Basic/TokenKinds.h"
 #include "llvm/Support/Debug.h"
 #include <queue>