diff options
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 6 | ||||
| -rw-r--r-- | clang/unittests/Format/FormatTestObjC.cpp | 12 |
2 files changed, 16 insertions, 2 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 7734b7e9a2b..681e790f877 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -2615,8 +2615,10 @@ bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line, if (Line.Type == LT_ObjCMethodDecl) { if (Left.is(TT_ObjCMethodSpecifier)) return true; - if (Left.is(tok::r_paren) && Right.is(tok::identifier)) - // Don't space between ')' and <id> + if (Left.is(tok::r_paren) && Right.isOneOf(tok::identifier, tok::kw_new)) + // Don't space between ')' and <id> or ')' and 'new'. 'new' is not a + // keyword in Objective-C, and '+ (instancetype)new;' is a standard class + // method declaration. return false; } if (Line.Type == LT_ObjCProperty && diff --git a/clang/unittests/Format/FormatTestObjC.cpp b/clang/unittests/Format/FormatTestObjC.cpp index 35c4d886386..51443c0f393 100644 --- a/clang/unittests/Format/FormatTestObjC.cpp +++ b/clang/unittests/Format/FormatTestObjC.cpp @@ -514,6 +514,7 @@ TEST_F(FormatTestObjC, FormatObjCMethodDeclarations) { " evenLongerKeyword:(float)theInterval\n" " error:(NSError **)theError {\n" "}"); + verifyFormat("+ (instancetype)new;\n"); Style.ColumnLimit = 60; verifyFormat("- (instancetype)initXxxxxx:(id<x>)x\n" " y:(id<yyyyyyyyyyyyyyyyyyyy>)y\n" @@ -914,6 +915,17 @@ TEST_F(FormatTestObjC, ObjCForIn) { " }]) {\n}"); } +TEST_F(FormatTestObjC, ObjCNew) { + verifyFormat("+ (instancetype)new {\n" + " return nil;\n" + "}\n"); + verifyFormat("+ (instancetype)myNew {\n" + " return [self new];\n" + "}\n"); + verifyFormat("SEL NewSelector(void) { return @selector(new); }\n"); + verifyFormat("SEL MacroSelector(void) { return MACRO(new); }\n"); +} + TEST_F(FormatTestObjC, ObjCLiterals) { verifyFormat("@\"String\""); verifyFormat("@1"); |
