[clang-format][NFC] Format lib/Format and unittests/Format in clang

[owenpan]

Summary

Run clang-format 5ead1f1 with InsertBraces and RemoveBracesLLVM in clang/lib/Format and clang/unittests/Format.

[curdeius]

LGTM.

clang/unittests/Format/FormatTest.cpp

25442

This line was just left unformatted, right? Or there was a recent change in the behaviour?

[owenpan]

clang/unittests/Format/FormatTest.cpp

25442

It was unformatted. I must have forgotten to run git-clang-format.

clang/lib/Format/BreakableToken.cpp

if (LineIndex + 1 == Lines.size()) {
         // line up with the decoration (if it exists).
         Prefix = "";
       }
     } else if (!Decoration.empty()) {
       // For other empty lines, if we do have a decoration, adapt it to not
       // contain a trailing whitespace.
       Prefix = Prefix.substr(0, 1);
     }
-  } else {
-    if (ContentColumn[LineIndex] == 1) {
-      // This line starts immediately after the decorating *.
-      Prefix = Prefix.substr(0, 1);
-    }
-  }
+  } else if (ContentColumn[LineIndex] == 1) {
   // This is the offset of the end of the last line relative to the start of the
   // token text in the token.
   unsigned WhitespaceOffsetInToken = Content[LineIndex - 1].data() +
                                      Content[LineIndex - 1].size() -
                                      tokenAt(LineIndex).TokenText.data();
   unsigned WhitespaceLength = Content[LineIndex].data() -
                               tokenAt(LineIndex).TokenText.data() -
                               WhitespaceOffsetInToken;

clang/lib/Format/WhitespaceManager.cpp

for (auto &Change : Changes) {
     // to be aligned.
     if (Change.IsInsideToken && Change.NewlinesBefore == 0)
       Change.IsTrailingComment = false;
     Change.StartOfBlockComment = nullptr;
     Change.IndentationOffset = 0;
     if (Change.Tok->is(tok::comment)) {
       if (Change.Tok->is(TT_LineComment) || !Change.IsInsideToken) {
         LastBlockComment = &Change;
-      } else {
-        if ((Change.StartOfBlockComment = LastBlockComment)) {
-          Change.IndentationOffset =
-              Change.StartOfTokenColumn -
-              Change.StartOfBlockComment->StartOfTokenColumn;
-        }
-      }
+      } else if ((Change.StartOfBlockComment = LastBlockComment)) {
     } else {
       LastBlockComment = nullptr;
     }
   }
 
   // Compute conditional nesting level
   // Level is increased for each conditional, unless this conditional continues
   // a chain of conditional, i.e. starts immediately after the colon of another

clang/unittests/Format/FormatTest.cpp

verifyFormat("if (isa<VarDecl>(D)) {\n"
                "    }\n"
                "  }\n"
                "}",
                Style);
 
   verifyFormat("do {\n"
                "  ++I;\n"
                "} while (hasMore() && Filter(*I));",
-               "do { ++I; } while (hasMore() && Filter(*I));",
-               Style);
+               "do { ++I; } while (hasMore() && Filter(*I));", Style);
 
   verifyFormat("if (a)\n"
                "  if (b)\n"
                "    c;\n"
                "  else {\n"
                "    if (d)\n"
                "      e;\n"
                "  }\n"