Skip to content

[clang-format] Fix a bug in annotating CastRParen #102261

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

Merged
merged 1 commit into from
Aug 8, 2024
Merged

[clang-format] Fix a bug in annotating CastRParen #102261

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
11 changes: 10 additions & 1 deletion clang/lib/Format/TokenAnnotator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2874,9 +2874,18 @@ class AnnotatingParser {
return false;

// Search for unexpected tokens.
for (auto *Prev = BeforeRParen; Prev != LParen; Prev = Prev->Previous)
for (auto *Prev = BeforeRParen; Prev != LParen; Prev = Prev->Previous) {
if (Prev->is(tok::r_paren)) {
Prev = Prev->MatchingParen;
if (!Prev)
return false;
if (Prev->is(TT_FunctionTypeLParen))
break;
continue;
}
if (!Prev->isOneOf(tok::kw_const, tok::identifier, tok::coloncolon))
return false;
}

return true;
}
Expand Down
7 changes: 7 additions & 0 deletions clang/unittests/Format/TokenAnnotatorTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,6 +740,13 @@ TEST_F(TokenAnnotatorTest, UnderstandsCasts) {
EXPECT_TOKEN(Tokens[10], tok::r_paren, TT_Unknown);
EXPECT_TOKEN(Tokens[11], tok::amp, TT_BinaryOperator);

Tokens = annotate("func((void (*)())&a);");
ASSERT_EQ(Tokens.size(), 15u) << Tokens;
EXPECT_TOKEN(Tokens[4], tok::l_paren, TT_FunctionTypeLParen);
EXPECT_TOKEN(Tokens[5], tok::star, TT_PointerOrReference);
EXPECT_TOKEN(Tokens[9], tok::r_paren, TT_CastRParen);
EXPECT_TOKEN(Tokens[10], tok::amp, TT_UnaryOperator);

auto Style = getLLVMStyle();
Style.TypeNames.push_back("Foo");
Tokens = annotate("#define FOO(bar) foo((Foo)&bar)", Style);
Expand Down
Loading