caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[clang-format] Make BreakAfterReturnType work with K&R C functions

Browse Source 
This fixes PR50999.

Differential Revision: https://reviews.llvm.org/D105964
This commit is contained in:
owenca
2021-07-13 23:49:48 -07:00
parent 3bf101f34c
commit 58494c856a
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
clang/lib/Format/TokenAnnotator.cpp
View File

@@ -2476,6 +2476,14 @@ static bool isFunctionDeclarationName(const FormatToken &Current,
if (Next->MatchingParen->Next &&
Next->MatchingParen->Next->is(TT_PointerOrReference))
return true;
// Check for K&R C function definitions, e.g.:
// int f(i)
// {
// return i + 1;
// }
if (Next->Next && Next->Next->is(tok::identifier) &&
!(Next->MatchingParen->Next && Next->MatchingParen->Next->is(tok::semi)))
return true;
for (const FormatToken *Tok = Next->Next; Tok && Tok != Next->MatchingParen;
Tok = Tok->Next) {
if (Tok->is(TT_TypeDeclarationParen))

10
clang/unittests/Format/FormatTest.cpp
View File

@@ -8209,6 +8209,16 @@ TEST_F(FormatTest, ReturnTypeBreakingStyle) {
"}\n",
Style);
Style.BreakBeforeBraces = FormatStyle::BS_Custom;
Style.BraceWrapping.AfterFunction = true;
verifyFormat("int f(i);\n" // No break here.
"int\n" // Break here.
"f(i)\n"
"{\n"
" return i + 1;\n"
"}\n",
Style);
Style = getGNUStyle();
// Test for comments at the end of function declarations.