Skip to content

Commit 0faa913

Browse files
committed
clang-format: Properly detect variable declarations with ObjC.
Before: LoooooooooooooooooooooooooooooooooooooooongType LoooooooooooooooooooooooooooooooooooooongVariable([A a]); After: LoooooooooooooooooooooooooooooooooooooooongType LoooooooooooooooooooooooooooooooooooooongVariable([A a]); llvm-svn: 235599
1 parent 5372c72 commit 0faa913

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

clang/lib/Format/TokenAnnotator.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1400,7 +1400,8 @@ static bool isFunctionDeclarationName(const FormatToken &Current) {
14001400
if (Tok->is(tok::kw_const) || Tok->isSimpleTypeSpecifier() ||
14011401
Tok->isOneOf(TT_PointerOrReference, TT_StartOfName))
14021402
return true;
1403-
if (Tok->isOneOf(tok::l_brace, tok::string_literal) || Tok->Tok.isLiteral())
1403+
if (Tok->isOneOf(tok::l_brace, tok::string_literal, TT_ObjCMethodExpr) ||
1404+
Tok->Tok.isLiteral())
14041405
return false;
14051406
}
14061407
return false;

clang/unittests/Format/FormatTest.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5698,6 +5698,8 @@ TEST_F(FormatTest, BreaksLongVariableDeclarations) {
56985698
" LoooooooooooooooooooooooooooooooooooooooongVariable(a);");
56995699
verifyFormat("LoooooooooooooooooooooooooooooooooooooooongType\n"
57005700
" LoooooooooooooooooooooooooooooooooooooooongVariable({});");
5701+
verifyFormat("LoooooooooooooooooooooooooooooooooooooooongType\n"
5702+
" LoooooooooooooooooooooooooooooooooooooongVariable([A a]);");
57015703
}
57025704

57035705
TEST_F(FormatTest, BreaksLongDeclarations) {

0 commit comments

Comments
 (0)