diff options
Diffstat (limited to 'clang/unittests/Format/FormatTestObjC.cpp')
| -rw-r--r-- | clang/unittests/Format/FormatTestObjC.cpp | 37 |
1 files changed, 9 insertions, 28 deletions
diff --git a/clang/unittests/Format/FormatTestObjC.cpp b/clang/unittests/Format/FormatTestObjC.cpp index fe86cfe8ce9..ded4607334e 100644 --- a/clang/unittests/Format/FormatTestObjC.cpp +++ b/clang/unittests/Format/FormatTestObjC.cpp @@ -536,28 +536,25 @@ TEST_F(FormatTestObjC, FormatObjCMethodDeclarations) { " ofSize:(size_t)height\n" " :(size_t)width;"); Style.ColumnLimit = 40; - // Make sure selectors with 0, 1, or more arguments are not indented - // when IndentWrappedFunctionNames is false. - Style.IndentWrappedFunctionNames = false; + // Make sure selectors with 0, 1, or more arguments are indented when wrapped. verifyFormat("- (aaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n" - "aaaaaaaaaaaaaaaaaaaaaaaaaaaa;\n"); + " aaaaaaaaaaaaaaaaaaaaaaaaaaaa;\n"); verifyFormat("- (aaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n" - "aaaaaaaaaaaaaaaaaaaaaaaaaaaa:(int)a;\n"); + " aaaaaaaaaaaaaaaaaaaaaaaaaaaa:(int)a;\n"); verifyFormat("- (aaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n" - "aaaaaaaaaaaaaaaaaaaaaaaaaaaa:(int)a\n" - "aaaaaaaaaaaaaaaaaaaaaaaaaaaa:(int)a;\n"); + " aaaaaaaaaaaaaaaaaaaaaaaaaaaa:(int)a\n" + " aaaaaaaaaaaaaaaaaaaaaaaaaaaa:(int)a;\n"); verifyFormat("- (aaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n" - " aaaaaaaaaaaaaaaaaaaaaaaaaaa:(int)a\n" - "aaaaaaaaaaaaaaaaaaaaaaaaaaaa:(int)a;\n"); + " aaaaaaaaaaaaaaaaaaaaaaaaaaa:(int)a\n" + " aaaaaaaaaaaaaaaaaaaaaaaaaaaa:(int)a;\n"); verifyFormat("- (aaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n" - "aaaaaaaaaaaaaaaaaaaaaaaaaaaa:(int)a\n" - " aaaaaaaaaaaaaaaaaaaaaaaaaaa:(int)a;\n"); + " aaaaaaaaaaaaaaaaaaaaaaaaaaaa:(int)a\n" + " aaaaaaaaaaaaaaaaaaaaaaaaaaa:(int)a;\n"); // 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" " dontAlignNamef:(NSRect)theRect {\n" "}"); @@ -567,22 +564,6 @@ TEST_F(FormatTestObjC, FormatObjCMethodDeclarations) { " aShortf:(NSRect)theRect {\n" "}"); - // Make sure selectors with 0, 1, or more arguments are indented - // when IndentWrappedFunctionNames is true. - verifyFormat("- (aaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n" - " aaaaaaaaaaaaaaaaaaaaaaaaaaaa;\n"); - verifyFormat("- (aaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n" - " aaaaaaaaaaaaaaaaaaaaaaaaaaaa:(int)a;\n"); - verifyFormat("- (aaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n" - " aaaaaaaaaaaaaaaaaaaaaaaaaaaa:(int)a\n" - " aaaaaaaaaaaaaaaaaaaaaaaaaaaa:(int)a;\n"); - verifyFormat("- (aaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n" - " aaaaaaaaaaaaaaaaaaaaaaaaaaa:(int)a\n" - " aaaaaaaaaaaaaaaaaaaaaaaaaaaa:(int)a;\n"); - verifyFormat("- (aaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n" - " aaaaaaaaaaaaaaaaaaaaaaaaaaaa:(int)a\n" - " aaaaaaaaaaaaaaaaaaaaaaaaaaa:(int)a;\n"); - // Format pairs correctly. Style.ColumnLimit = 80; verifyFormat("- (void)drawRectOn:(id)surface\n" |
