IndentWrappedFunctionNames should win out over align colons

[kmensah]

Summary

clang-format's current output:

• (CGFloat)collectionView:(UICollectionView *)collectionView

heightForHeaderWithLayout:(GPNCardCollectionViewLayout *)layout {
}

Output after patch:

• (CGFloat)collectionView:(UICollectionView *)collectionView heightForHeaderWithLayout:(GPNCardCollectionViewLayout *)layout {

}

.clang-format contents

BasedOnStyle: Google
IndentWrappedFunctionNames: true
ColumnLimit: 100

[djasper]

unittests/Format/FormatTest.cpp

7115

justong?

[kmensah]

I was looking for a selector name that the same length as "- (void)shortf:"
and taking the l out did that. Changing to something more intuitive.

[kmensah]

changed name of test selector to be more intuitive.

[djasper]

Looks good. Submitted as r242484. Thank you.

lib/Format/ContinuationIndenter.cpp

   if (Current.isMemberAccess())
     State.Stack.back().StartOfFunctionCall =
         Current.LastOperator ? 0 : State.Column;
-  if (Current.is(TT_SelectorName))
+  if (Current.is(TT_SelectorName)) {
     State.Stack.back().ObjCSelectorNameFound = true;
+    if (Style.IndentWrappedFunctionNames) {
+      State.Stack.back().Indent =
+          State.FirstIndent + Style.ContinuationIndentWidth;
+    }
+  }
   if (Current.is(TT_CtorInitializerColon)) {
     // Indent 2 from the column, so:
     // SomeClass::SomeClass()

unittests/Format/FormatTest.cpp

                "                         y:(id<yyyyyyyyyyyyyyyyyyyy>)y\n"
                "    NS_DESIGNATED_INITIALIZER;",
                getLLVMStyleWithColumns(60));
+
+  // Continuation indent width should win over aligning colons if the function
+  // name is long.
+  FormatStyle continuationStyle = getGoogleStyle();
+  continuationStyle.ColumnLimit = 40;
+  continuationStyle.IndentWrappedFunctionNames = true;
+  verifyFormat("- (void)shortf:(GTMFoo *)theFoo\n"
+               "    dontAlignNamef:(NSRect)theRect {\n"
+               "}",
+               continuationStyle);
+
+  // Make sure we don't break aligning for short parameter names.
+  verifyFormat("- (void)shortf:(GTMFoo *)theFoo\n"
+               "       aShortf:(NSRect)theRect {\n"
+               "}",
+               continuationStyle);
 }
 
 TEST_F(FormatTest, FormatObjCMethodExpr) {