Simplify and add more tests

Author: rayroudc

clang/lib/Format/WhitespaceManager.cpp

@@ -464,20 +464,18 @@ AlignTokenSequence(const FormatStyle &Style, unsigned Start, unsigned End,
     if (i + 1 != Changes.size())
       Changes[i + 1].PreviousEndOfTokenColumn += Shift;
 
-    // If PointerAlignment is PAS_Right, keep *s or &s next to the token
+    // If PointerAlignment is PAS_Right, keep *s or &s next to the token,
+    // except if the token is equal, then a space is needed.
     if ((Style.PointerAlignment == FormatStyle::PAS_Right ||
          Style.ReferenceAlignment == FormatStyle::RAS_Right) &&
-        CurrentChange.Spaces != 0) {
+        CurrentChange.Spaces != 0 && !CurrentChange.Tok->is(tok::equal)) {
       const bool ReferenceNotRightAligned =
           Style.ReferenceAlignment != FormatStyle::RAS_Right &&
           Style.ReferenceAlignment != FormatStyle::RAS_Pointer;
       for (int Previous = i - 1;
            Previous >= 0 &&
            Changes[Previous].Tok->getType() == TT_PointerOrReference;
            --Previous) {
-        // Don't align function default argument using return type maximum size
-        if (Changes[Previous + 1].Tok->is(tok::equal))
-          continue;
         assert(Changes[Previous].Tok->isPointerOrReference());
         if (Changes[Previous].Tok->isNot(tok::star)) {
           if (ReferenceNotRightAligned)

clang/unittests/Format/FormatTest.cpp

@@ -19056,7 +19056,8 @@ TEST_F(FormatTest, AlignConsecutiveDeclarations) {
   verifyFormat("int    a(int x);\n"
                "double b();",
                Alignment);
-  verifyFormat("int    a(const Test & = Test());\n"
+  verifyFormat("int    a(int &count, SomeType &foo, const Test & = Test());\n"
+               "int    a2(int &foo, const Test &name = Test());\n"
                "double b();",
                Alignment);
   verifyFormat("struct Test {\n"
@@ -19280,7 +19281,7 @@ TEST_F(FormatTest, AlignConsecutiveDeclarations) {
                "int    foobar;",
                AlignmentLeft);
 
-  verifyFormat("int    a(const Test& = Test());\n"
+  verifyFormat("int    a(int& count, SomeType& foo, const Test& = Test());\n"
                "double b();",
                AlignmentLeft);
 
@@ -19344,6 +19345,10 @@ TEST_F(FormatTest, AlignConsecutiveDeclarations) {
                "int     foobar;",
                AlignmentMiddle);
 
+  verifyFormat("int    a(int & count, SomeType & foo, const Test & = Test());\n"
+               "double b();",
+               AlignmentMiddle);
+
   Alignment.AlignConsecutiveAssignments.Enabled = false;
   Alignment.AlignEscapedNewlines = FormatStyle::ENAS_DontAlign;
   verifyFormat("#define A \\\n"