summaryrefslogtreecommitdiffstats
path: root/clang/unittests/Format/FormatTestObjC.cpp
diff options
context:
space:
mode:
authorBen Hamilton <benhamilton@google.com>2017-12-14 16:17:38 +0000
committerBen Hamilton <benhamilton@google.com>2017-12-14 16:17:38 +0000
commit687e5fa936f5211c542397990ed74ce0d328edb3 (patch)
treea7eba494d5d83078598c1522613409d41c5900cf /clang/unittests/Format/FormatTestObjC.cpp
parent3d161ab6f437b2a5eeea4f29f56a611d42a8c8f0 (diff)
downloadbcm5719-llvm-687e5fa936f5211c542397990ed74ce0d328edb3.tar.gz
bcm5719-llvm-687e5fa936f5211c542397990ed74ce0d328edb3.zip
[ClangFormat] IndentWrappedFunctionNames should be true in the google ObjC style
Summary: If we write the following code, it goes over 100 columns, so we need to wrap it: ``` - (VeryLongReturnTypeName)veryLongMethodParameter:(VeryLongParameterName)thisIsAVeryLongParameterName longMethodParameter:(LongParameterName)thisIsAlsoAnotherLongParameterName; ``` Currently, clang-format with the google style aligns the method parameter names on the first column: ``` - (VeryLongReturnTypeName) veryLongMethodParameter:(VeryLongParameterName)thisIsAVeryLongParameterName longMethodParameter:(LongParameterName)thisIsAlsoAnotherLongParameterName; ``` We'd like clang-format in the google style to align these to column 4 for Objective-C: ``` - (VeryLongReturnTypeName) veryLongMethodParameter:(VeryLongParameterName)thisIsAVeryLongParameterName longMethodParameter:(LongParameterName)thisIsAlsoAnotherLongParameterName; ``` Test Plan: make -j12 FormatTests && ./tools/clang/unittests/Format/FormatTests Reviewers: krasimir, djasper, klimek Reviewed By: djasper Subscribers: cfe-commits, thakis Differential Revision: https://reviews.llvm.org/D41195 llvm-svn: 320714
Diffstat (limited to 'clang/unittests/Format/FormatTestObjC.cpp')
-rw-r--r--clang/unittests/Format/FormatTestObjC.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/clang/unittests/Format/FormatTestObjC.cpp b/clang/unittests/Format/FormatTestObjC.cpp
index 4220b44b4c4..292466c0aa5 100644
--- a/clang/unittests/Format/FormatTestObjC.cpp
+++ b/clang/unittests/Format/FormatTestObjC.cpp
@@ -382,9 +382,9 @@ TEST_F(FormatTestObjC, FormatObjCMethodDeclarations) {
" 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,7 +395,10 @@ TEST_F(FormatTestObjC, FormatObjCMethodDeclarations) {
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"
OpenPOWER on IntegriCloud