Skip to content

Commit 6bc225e

Browse files
authored
[clang-format] Fix a misannotation of redundant r_paren as CastRParen (#105921)
Fixes #105880.
1 parent 3ef64f7 commit 6bc225e

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
@@ -2875,6 +2875,8 @@ class AnnotatingParser {
28752875
// Search for unexpected tokens.
28762876
for (auto *Prev = BeforeRParen; Prev != LParen; Prev = Prev->Previous) {
28772877
if (Prev->is(tok::r_paren)) {
2878+
if (Prev->is(TT_CastRParen))
2879+
return false;
28782880
Prev = Prev->MatchingParen;
28792881
if (!Prev)
28802882
return false;

clang/unittests/Format/TokenAnnotatorTest.cpp

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

750+
Tokens = annotate("int result = ((int)a) - b;");
751+
ASSERT_EQ(Tokens.size(), 13u) << Tokens;
752+
EXPECT_TOKEN(Tokens[6], tok::r_paren, TT_CastRParen);
753+
EXPECT_TOKEN(Tokens[8], tok::r_paren, TT_Unknown);
754+
EXPECT_TOKEN(Tokens[9], tok::minus, TT_BinaryOperator);
755+
750756
auto Style = getLLVMStyle();
751757
Style.TypeNames.push_back("Foo");
752758
Tokens = annotate("#define FOO(bar) foo((Foo)&bar)", Style);

0 commit comments

Comments
 (0)