Skip to content

Commit b084eff

Browse files
owencatru
authored andcommitted
[clang-format] Fix a bug in annotating CastRParen (#102261)
Fixes #102102. (cherry picked from commit 8c7a038)
1 parent 9ec7815 commit b084eff

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

clang/lib/Format/TokenAnnotator.cpp

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2872,9 +2872,18 @@ class AnnotatingParser {
28722872
return false;
28732873

28742874
// Search for unexpected tokens.
2875-
for (auto *Prev = BeforeRParen; Prev != LParen; Prev = Prev->Previous)
2875+
for (auto *Prev = BeforeRParen; Prev != LParen; Prev = Prev->Previous) {
2876+
if (Prev->is(tok::r_paren)) {
2877+
Prev = Prev->MatchingParen;
2878+
if (!Prev)
2879+
return false;
2880+
if (Prev->is(TT_FunctionTypeLParen))
2881+
break;
2882+
continue;
2883+
}
28762884
if (!Prev->isOneOf(tok::kw_const, tok::identifier, tok::coloncolon))
28772885
return false;
2886+
}
28782887

28792888
return true;
28802889
}

clang/unittests/Format/TokenAnnotatorTest.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -734,6 +734,13 @@ TEST_F(TokenAnnotatorTest, UnderstandsCasts) {
734734
EXPECT_TOKEN(Tokens[10], tok::r_paren, TT_Unknown);
735735
EXPECT_TOKEN(Tokens[11], tok::amp, TT_BinaryOperator);
736736

737+
Tokens = annotate("func((void (*)())&a);");
738+
ASSERT_EQ(Tokens.size(), 15u) << Tokens;
739+
EXPECT_TOKEN(Tokens[4], tok::l_paren, TT_FunctionTypeLParen);
740+
EXPECT_TOKEN(Tokens[5], tok::star, TT_PointerOrReference);
741+
EXPECT_TOKEN(Tokens[9], tok::r_paren, TT_CastRParen);
742+
EXPECT_TOKEN(Tokens[10], tok::amp, TT_UnaryOperator);
743+
737744
auto Style = getLLVMStyle();
738745
Style.TypeNames.push_back("Foo");
739746
Tokens = annotate("#define FOO(bar) foo((Foo)&bar)", Style);

0 commit comments

Comments
 (0)