Author: benhamilton Date: Thu Dec 14 13:44:11 2017 New Revision: 320747 URL: http://llvm.org/viewvc/llvm-project?rev=320747&view=rev Log: Revert "[ClangFormat] IndentWrappedFunctionNames should be true in the google ObjC style"
This reverts commit 37e69667f748e1458b46483b7c1b8f9ba33eec44. We're going to discuss its ramifications further before making a conclusion. Modified: cfe/trunk/lib/Format/Format.cpp cfe/trunk/unittests/Format/FormatTestObjC.cpp Modified: cfe/trunk/lib/Format/Format.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/Format.cpp?rev=320747&r1=320746&r2=320747&view=diff ============================================================================== --- cfe/trunk/lib/Format/Format.cpp (original) +++ cfe/trunk/lib/Format/Format.cpp Thu Dec 14 13:44:11 2017 @@ -732,7 +732,6 @@ FormatStyle getGoogleStyle(FormatStyle:: GoogleStyle.SpacesInContainerLiterals = false; } else if (Language == FormatStyle::LK_ObjC) { GoogleStyle.ColumnLimit = 100; - GoogleStyle.IndentWrappedFunctionNames = true; } return GoogleStyle; Modified: cfe/trunk/unittests/Format/FormatTestObjC.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTestObjC.cpp?rev=320747&r1=320746&r2=320747&view=diff ============================================================================== --- cfe/trunk/unittests/Format/FormatTestObjC.cpp (original) +++ cfe/trunk/unittests/Format/FormatTestObjC.cpp Thu Dec 14 13:44:11 2017 @@ -382,9 +382,9 @@ TEST_F(FormatTestObjC, FormatObjCMethodD " ofSize:(size_t)height\n" " :(size_t)width;"); - Style = getGoogleStyle(FormatStyle::LK_ObjC); // Continuation indent width should win over aligning colons if the function // name is long. + Style = getGoogleStyle(FormatStyle::LK_ObjC); Style.ColumnLimit = 40; Style.IndentWrappedFunctionNames = true; verifyFormat("- (void)shortf:(GTMFoo *)theFoo\n" @@ -395,10 +395,7 @@ TEST_F(FormatTestObjC, FormatObjCMethodD verifyFormat("- (void)shortf:(GTMFoo *)theFoo\n" " aShortf:(NSRect)theRect {\n" "}"); - // Wrapped method parameters should be indented. - verifyFormat("- (LongReturnTypeName)\n" - " longParam:(ParamName)longParamName\n" - " param:(paramName)paramName;"); + // Format pairs correctly. Style.ColumnLimit = 80; verifyFormat("- (void)drawRectOn:(id)surface\n" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits