diff options
| -rw-r--r-- | lib/Format/TokenAnnotator.cpp | 6 | ||||
| -rw-r--r-- | lib/Format/UnwrappedLineParser.cpp | 5 | ||||
| -rw-r--r-- | unittests/Format/FormatTest.cpp | 1 |
3 files changed, 5 insertions, 7 deletions
diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp index 7e3ef75d3d..25670d4f68 100644 --- a/lib/Format/TokenAnnotator.cpp +++ b/lib/Format/TokenAnnotator.cpp @@ -313,11 +313,7 @@ private: switch (Tok->FormatTok.Tok.getKind()) { case tok::plus: case tok::minus: - // At the start of the line, +/- specify ObjectiveC method declarations. - if (Tok->Children.empty() || Tok->Children[0].Children.empty()) - break; // Can't be an ObjectiveC method declaration. - if (Tok->Parent == NULL && (Tok->Children[0].is(tok::l_paren) || - Tok->Children[0].Children[0].is(tok::colon))) + if (Tok->Parent == NULL && Line.MustBeDeclaration) Tok->Type = TT_ObjCMethodSpecifier; break; case tok::colon: diff --git a/lib/Format/UnwrappedLineParser.cpp b/lib/Format/UnwrappedLineParser.cpp index a01344c03e..8408ce3a0d 100644 --- a/lib/Format/UnwrappedLineParser.cpp +++ b/lib/Format/UnwrappedLineParser.cpp @@ -144,8 +144,9 @@ bool UnwrappedLineParser::parse() { } bool UnwrappedLineParser::parseFile() { - ScopedDeclarationState DeclarationState(*Line, DeclarationScopeStack, - /*MustBeDeclaration=*/ true); + ScopedDeclarationState DeclarationState( + *Line, DeclarationScopeStack, + /*MustBeDeclaration=*/ !Line->InPPDirective); bool Error = parseLevel(/*HasOpeningBrace=*/ false); // Make sure to format the remaining tokens. flushComments(true); diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index 0840302754..5988a90596 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -2815,6 +2815,7 @@ TEST_F(FormatTest, FormatForObjectiveCMethodDecls) { // If there's no return type (very rare in practice!), LLVM and Google style // agree. + verifyFormat("- foo;"); verifyFormat("- foo:(int)f;"); verifyGoogleFormat("- foo:(int)foo;"); } |