clang-format: Fix false positive in function annotation detection.

llvm-svn: 238285
This commit is contained in:
Daniel Jasper 2015-05-27 04:55:47 +00:00
parent 9b7f6677d9
commit 3273930d9a
2 changed files with 3 additions and 1 deletions

View File

@ -925,7 +925,7 @@ private:
Current.Type = TT_CastRParen;
if (Current.MatchingParen && Current.Next &&
!Current.Next->isBinaryOperator() &&
!Current.Next->isOneOf(tok::semi, tok::colon))
!Current.Next->isOneOf(tok::semi, tok::colon, tok::l_brace))
if (FormatToken *BeforeParen = Current.MatchingParen->Previous)
if (BeforeParen->is(tok::identifier) &&
BeforeParen->TokenText == BeforeParen->TokenText.upper() &&

View File

@ -4064,6 +4064,8 @@ TEST_F(FormatTest, FunctionAnnotations) {
// Not function annotations.
verifyFormat("ASSERT(\"aaaaa\") << aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
" << bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
verifyFormat("TEST_F(ThisIsATestFixtureeeeeeeeeeeee,\n"
" ThisIsATestWithAReallyReallyReallyReallyLongName) {}");
}
TEST_F(FormatTest, BreaksDesireably) {