Skip to content

Commit 4d03db0

Browse files
owencatstellar
authored andcommitted
[clang-format] Fix a bug in AnnotatingParser::rParenEndsCast() (llvm#79549)
Fixes llvm#78965. (cherry picked from commit f826f55)
1 parent f6881fc commit 4d03db0

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

clang/lib/Format/TokenAnnotator.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2488,6 +2488,8 @@ class AnnotatingParser {
24882488
(Tok.Next->Next->is(tok::numeric_constant) || Line.InPPDirective)) {
24892489
return false;
24902490
}
2491+
if (Line.InPPDirective && Tok.Next->is(tok::minus))
2492+
return false;
24912493
// Search for unexpected tokens.
24922494
for (FormatToken *Prev = Tok.Previous; Prev != Tok.MatchingParen;
24932495
Prev = Prev->Previous) {

clang/unittests/Format/TokenAnnotatorTest.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -611,6 +611,11 @@ TEST_F(TokenAnnotatorTest, UnderstandsCasts) {
611611
EXPECT_TOKEN(Tokens[13], tok::r_paren, TT_Unknown);
612612
EXPECT_TOKEN(Tokens[14], tok::star, TT_BinaryOperator);
613613

614+
Tokens = annotate("#define foo(i) ((i) - bar)");
615+
ASSERT_EQ(Tokens.size(), 14u) << Tokens;
616+
EXPECT_TOKEN(Tokens[9], tok::r_paren, TT_Unknown);
617+
EXPECT_TOKEN(Tokens[10], tok::minus, TT_BinaryOperator);
618+
614619
Tokens = annotate("return (Foo) & 10;");
615620
ASSERT_EQ(Tokens.size(), 8u) << Tokens;
616621
EXPECT_TOKEN(Tokens[3], tok::r_paren, TT_Unknown);

0 commit comments

Comments
 (0)