mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-26 08:16:06 +00:00
Code Issues Projects Releases Wiki Activity

[clang-format] Fix idempotent format of hash in macro body (#118513)

Browse Source 
Fixes #118334.
This commit is contained in:
Owen Pan 2024-12-10 16:47:21 -08:00 committed by GitHub
parent e940353fd2
commit 54ca1c4212
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/Format/UnwrappedLineParser.cpp
View File

@ -512,7 +512,7 @@ void UnwrappedLineParser::calculateBraceTypes(bool ExpectClassBody) {
break;
do {
NextTok = Tokens->getNextToken();
} while (NextTok->NewlinesBefore == 0 && NextTok->isNot(tok::eof));
} while (!NextTok->HasUnescapedNewline && NextTok->isNot(tok::eof));
while (NextTok->is(tok::comment))
NextTok = Tokens->getNextToken();

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

@ -5724,6 +5724,24 @@ TEST_F(FormatTest, HashInMacroDefinition) {
getLLVMStyleWithColumns(22));
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) {

19
clang/unittests/Format/TokenAnnotatorTest.cpp
View File

@ -3346,6 +3346,25 @@ TEST_F(TokenAnnotatorTest, BraceKind) {
EXPECT_BRACE_KIND(Tokens[11], BK_BracedInit);
EXPECT_BRACE_KIND(Tokens[13], BK_Block);
Tokens = annotate("{\n"
" {\n"
"#define GEN_ID(_x) char *_x{#_x}\n"
" GEN_ID(one);\n"
" }\n"
"}");
ASSERT_EQ(Tokens.size(), 23u) << Tokens;
EXPECT_TOKEN(Tokens[0], tok::l_brace, TT_BlockLBrace);
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("a = class extends goog.a {};",
getGoogleStyle(FormatStyle::LK_JavaScript));
ASSERT_EQ(Tokens.size(), 11u) << Tokens;