[clang-format] Fix indentation for array variables with alignment of consecutive assignments and declarations.

[curdeius]

Summary

Fixes https://github.com/llvm/llvm-project/issues/52914.

[curdeius]

I know I changed existing tests. I'm not sure what we really want here.
If you have ideas, I'm open to suggestions.

[MyDeveloperDay]

The fix looks ok, butr I don't understand the cause of the side effect? is it explicitly aligning to the v of auto v?

[curdeius]

In D116527#3217211, @MyDeveloperDay wrote:

The fix looks ok, butr I don't understand the cause of the side effect? is it explicitly aligning to the v of auto v?

It's adding two spaces inside the auto v = ..., because of aligned declaration (identifier v, additional 1 space) and aligned assignment operator (=, 1 more space).

[owenpan]

Unless the test cases are wrong, they should not be changed. The original test case looked correct to me as it was doing a continuation indent between type{ and }.

[MyDeveloperDay]

This is born out by setting ContinuationIndentWidth: 8

int   i  = 0;
float i2 = 0;
auto  v  = type{
        i = 1,   //
        (i = 2), //
        i = 3    //
};

So maybe the original test is correct..

[MyDeveloperDay]

Could we resolve this with just

// Continued braced list.
if (Changes[ScopeStart - 2].Tok->isNot(tok::identifier) &&
    Changes[ScopeStart - 1].Tok->is(tok::l_brace) &&
    Changes[i].Tok->isNot(tok::r_brace))
  return true;

[curdeius]

Reverted test changes. Checking for identifier before brace.

[hans]

This seems to have caused a strange indentation problem, see https://github.com/llvm/llvm-project/issues/55161

[curdeius]

Feel free to revert and add a regression test please. I'll take a look.

[hans]

In D116527#3479509, @curdeius wrote:

Feel free to revert and add a regression test please. I'll take a look.

Since this patch landed a couple of months back, I don't think we need to rush to revert it.

clang/lib/Format/WhitespaceManager.cpp

if (InsideNestedScope && Changes[i].NewlinesBefore > 0) {
         if (Changes[i].Tok->is(TT_DesignatedInitializerPeriod))
           return true;
 
         // Continued ternary operator
         if (Changes[i].Tok->Previous &&
             Changes[i].Tok->Previous->is(TT_ConditionalExpr))
           return true;
 
+        // Continued braced list.
+        if (Changes[ScopeStart - 1].Tok->is(tok::l_brace) &&
+            Changes[i].Tok->isNot(tok::r_brace))
+          return true;
+
         return false;
       };
 
       if (ShouldShiftBeAdded())
         Changes[i].Spaces += Shift;
     }
 
     if (ContinuedStringLiteral)

clang/unittests/Format/FormatTest.cpp

verifyFormat("#define a         5\n"
                "auto lambda = []() {\n"
                "  auto  ii = 0;\n"
                "  float j  = 0;\n"
                "  return 0;\n"
                "};\n"
                "int   i  = 0;\n"
                "float i2 = 0;\n"
                "auto  v  = type{\n"
-               "    i = 1,   //\n"
-               "    (i = 2), //\n"
-               "    i = 3    //\n"
+               "      i = 1,   //\n"
+               "      (i = 2), //\n"
+               "      i = 3    //\n"
                "};",
                Style);
 
   Style.AlignConsecutiveMacros = FormatStyle::ACS_None;
   Style.ColumnLimit = 20;
 
   verifyFormat("#define a          \\\n"
                "  \"aabbbbbbbbbbbb\"\n"
verifyFormat("struct test {\n"
                "};\n",
                Alignment);
   verifyFormat("struct test {\n"
                "  long long int foo();\n"
                "  int           operator()(int a);\n"
                "  double        bar();\n"
                "};\n",
                Alignment);
+  // http://llvm.org/PR52914
+  verifyFormat("char *a[]     = {\"a\", // comment\n"
+               "                 \"bb\"};\n"
+               "int   bbbbbbb = 0;",
+               Alignment);
 
   // PAS_Right
   EXPECT_EQ("void SomeFunction(int parameter = 0) {\n"
             "  int const i   = 1;\n"
             "  int      *j   = 2;\n"
             "  int       big = 10000;\n"
             "\n"
             "  unsigned oneTwoThree = 123;\n"
TEST_F(FormatTest, AlignConsecutiveDeclarations) {
   verifyFormat("auto lambda = []() {\n"
                "  auto  ii = 0;\n"
                "  float j  = 0;\n"
                "  return 0;\n"
                "};\n"
                "int   i  = 0;\n"
                "float i2 = 0;\n"
                "auto  v  = type{\n"
-               "    i = 1,   //\n"
-               "    (i = 2), //\n"
-               "    i = 3    //\n"
+               "      i = 1,   //\n"
+               "      (i = 2), //\n"
+               "      i = 3    //\n"
                "};",
                Alignment);
   Alignment.AlignConsecutiveAssignments = FormatStyle::ACS_None;
 
   verifyFormat(
       "int      i = 1;\n"
       "SomeType a = SomeFunction(looooooooooooooooooooooongParameterA,\n"
       "                          loooooooooooooooooooooongParameterB);\n"