Skip to content

Commit 1b1ddb7

Browse files
owencatru
authored andcommitted
[clang-format] Fix a misannotation of redundant r_paren as CastRParen (llvm#105921)
Fixes llvm#105880. (cherry picked from commit 6bc225e)
1 parent 00ff55d commit 1b1ddb7

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

clang/lib/Format/TokenAnnotator.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2874,6 +2874,8 @@ class AnnotatingParser {
28742874
// Search for unexpected tokens.
28752875
for (auto *Prev = BeforeRParen; Prev != LParen; Prev = Prev->Previous) {
28762876
if (Prev->is(tok::r_paren)) {
2877+
if (Prev->is(TT_CastRParen))
2878+
return false;
28772879
Prev = Prev->MatchingParen;
28782880
if (!Prev)
28792881
return false;

clang/unittests/Format/TokenAnnotatorTest.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,12 @@ TEST_F(TokenAnnotatorTest, UnderstandsCasts) {
741741
EXPECT_TOKEN(Tokens[9], tok::r_paren, TT_CastRParen);
742742
EXPECT_TOKEN(Tokens[10], tok::amp, TT_UnaryOperator);
743743

744+
Tokens = annotate("int result = ((int)a) - b;");
745+
ASSERT_EQ(Tokens.size(), 13u) << Tokens;
746+
EXPECT_TOKEN(Tokens[6], tok::r_paren, TT_CastRParen);
747+
EXPECT_TOKEN(Tokens[8], tok::r_paren, TT_Unknown);
748+
EXPECT_TOKEN(Tokens[9], tok::minus, TT_BinaryOperator);
749+
744750
auto Style = getLLVMStyle();
745751
Style.TypeNames.push_back("Foo");
746752
Tokens = annotate("#define FOO(bar) foo((Foo)&bar)", Style);

0 commit comments

Comments
 (0)