Commit 2eff1c3c authored by Mitchell Balan's avatar Mitchell Balan
Browse files

[clang-format] Extend AllowShortLoopsOnASingleLine to do ... while loops. 

Summary:
If AllowShortLoopsOnASingleLine is enabled,

  do
    a++;
  while (true);

becomes

  do a++;
  while (true);

Reviewers: MyDeveloperDay, mitchell-stellar

Reviewed by: mitchell-stellar

Contributed by: DaanDeMeyer

Subscribers: cfe-commits

Tags: #clang, #clang-format

Differential Revision: https://reviews.llvm.org/D75022
parent 3a1bc41a

clang/lib/Format/UnwrappedLineFormatter.cpp

+5 −2
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ private: 
                 ? tryMergeSimpleControlStatement(I, E, Limit)

                 : 0;

    }

    if (TheLine->First->isOneOf(tok::kw_for, tok::kw_while)) {

    if (TheLine->First->isOneOf(tok::kw_for, tok::kw_while, tok::kw_do)) {

      return Style.AllowShortLoopsOnASingleLine

                 ? tryMergeSimpleControlStatement(I, E, Limit)

                 : 0;
@@ -514,7 +514,10 @@ private: 
      return 0;

    Limit = limitConsideringMacros(I + 1, E, Limit);

    AnnotatedLine &Line = **I;

    if (Line.Last->isNot(tok::r_paren))

    if (!Line.First->is(tok::kw_do) && Line.Last->isNot(tok::r_paren))

      return 0;

    // Only merge do while if do is the only statement on the line.

    if (Line.First->is(tok::kw_do) && !Line.Last->is(tok::kw_do))

      return 0;

    if (1 + I[1]->Last->TotalLength > Limit)

      return 0;

clang/unittests/Format/FormatTest.cpp

+24 −0
Original line number Diff line number Diff line
@@ -556,6 +556,30 @@ TEST_F(FormatTest, FormatLoopsWithoutCompoundStatement) { 
  verifyFormat("for (;;) /* still don't merge */\n"

               "  continue;",

               AllowsMergedLoops);

  verifyFormat("do a++;\n"

               "while (true);",

               AllowsMergedLoops);

  verifyFormat("do /* Don't merge */\n"

               "  a++;\n"

               "while (true);",

               AllowsMergedLoops);

  verifyFormat("do // Don't merge\n"

               "  a++;\n"

               "while (true);",

               AllowsMergedLoops);

  verifyFormat("do\n"

               "  // Don't merge\n"

               "  a++;\n"

               "while (true);",

               AllowsMergedLoops);

  // Without braces labels are interpreted differently.

  verifyFormat("{\n"

               "  do\n"

               "  label:\n"

               "    a++;\n"

               "  while (true);\n"

               "}",

               AllowsMergedLoops);

}















TEST_F(FormatTest, FormatShortBracedStatements) {