Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release/19.x: [clang-format] Correctly annotate braces in macro definitions (#123279) #123439

Open
wants to merge 1 commit into
base: release/19.x
Choose a base branch
from
Open

release/19.x: [clang-format] Correctly annotate braces in macro definitions (#123279) #123439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions clang/lib/Format/UnwrappedLineParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,14 +505,14 @@ void UnwrappedLineParser::calculateBraceTypes(bool ExpectClassBody) {
auto *NextTok = Tokens->getNextNonComment();

if (!Line->InMacroBody && !Style.isTableGen()) {
// Skip PPDirective lines and comments.
// Skip PPDirective lines (except macro definitions) and comments.
while (NextTok->is(tok::hash)) {
NextTok = Tokens->getNextToken();
if (NextTok->is(tok::pp_not_keyword))
if (NextTok->isOneOf(tok::pp_not_keyword, tok::pp_define))
break;
do {
NextTok = Tokens->getNextToken();
} while (!NextTok->HasUnescapedNewline && NextTok->isNot(tok::eof));
} while (NextTok->NewlinesBefore == 0 && NextTok->isNot(tok::eof));

while (NextTok->is(tok::comment))
NextTok = Tokens->getNextToken();
Expand Down
11 changes: 0 additions & 11 deletions clang/unittests/Format/FormatTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5725,23 +5725,12 @@ TEST_F(FormatTest, HashInMacroDefinition) {

verifyFormat("#define A void # ## #", getLLVMStyleWithColumns(22));

#if 0
// FIXME: The correct format is:
verifyFormat("{\n"
" {\n"
"#define GEN_ID(_x) char *_x{#_x}\n"
" GEN_ID(one);\n"
" }\n"
"}");
#endif
verifyFormat("{\n"
" {\n"
"#define GEN_ID(_x) \\\n"
" char *_x { #_x }\n"
" GEN_ID(one);\n"
" }\n"
"}",
getGoogleStyle());
}

TEST_F(FormatTest, RespectWhitespaceInMacroDefinitions) {
Expand Down
19 changes: 16 additions & 3 deletions clang/unittests/Format/TokenAnnotatorTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3214,14 +3214,27 @@ TEST_F(TokenAnnotatorTest, BraceKind) {
EXPECT_BRACE_KIND(Tokens[0], BK_Block);
EXPECT_TOKEN(Tokens[1], tok::l_brace, TT_BlockLBrace);
EXPECT_BRACE_KIND(Tokens[1], BK_Block);
#if 0
// FIXME:
EXPECT_BRACE_KIND(Tokens[11], BK_BracedInit);
EXPECT_BRACE_KIND(Tokens[14], BK_BracedInit);
#endif
EXPECT_BRACE_KIND(Tokens[20], BK_Block);
EXPECT_BRACE_KIND(Tokens[21], BK_Block);

Tokens = annotate("{\n"
"#define FOO \\\n"
" { \\\n"
" case bar: { \\\n"
" break; \\\n"
" } \\\n"
" }\n"
"}");
ASSERT_EQ(Tokens.size(), 15u) << Tokens;
EXPECT_TOKEN(Tokens[4], tok::l_brace, TT_BlockLBrace);
EXPECT_BRACE_KIND(Tokens[4], BK_Block);
EXPECT_TOKEN(Tokens[7], tok::colon, TT_CaseLabelColon);
EXPECT_BRACE_KIND(Tokens[8], BK_Block);
EXPECT_BRACE_KIND(Tokens[11], BK_Block);
EXPECT_BRACE_KIND(Tokens[12], BK_Block);

Tokens = annotate("a = class extends goog.a {};",
getGoogleStyle(FormatStyle::LK_JavaScript));
ASSERT_EQ(Tokens.size(), 11u) << Tokens;
Expand Down
Loading