[clang-format] Fix a misannotation of less/greater as angle brackets (l…

…lvm#105941) Fixes llvm#105877.
MaxEW707 · Aug 25, 2024 · 0916ae4 · 0916ae4
1 parent 6bc225e
commit 0916ae4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
@@ -250,7 +250,7 @@ class AnnotatingParser {
  if (Precedence > prec::Conditional && Precedence < prec::Relational)
  return false;
  }
- if (Prev.is(TT_ConditionalExpr))
+ if (Prev.isOneOf(tok::question, tok::colon) && !Style.isProto())
  SeenTernaryOperator = true;
  updateParameterCount(Left, CurrentToken);
  if (Style.Language == FormatStyle::LK_Proto) {

diff --git a/clang/unittests/Format/TokenAnnotatorTest.cpp b/clang/unittests/Format/TokenAnnotatorTest.cpp
@@ -620,6 +620,11 @@ TEST_F(TokenAnnotatorTest, UnderstandsNonTemplateAngleBrackets) {
  EXPECT_TOKEN(Tokens[2], tok::less, TT_BinaryOperator);
  EXPECT_TOKEN(Tokens[8], tok::greater, TT_BinaryOperator);
 
+ Tokens = annotate("return checklower ? a < b : a > b;");
+ ASSERT_EQ(Tokens.size(), 12u) << Tokens;
+ EXPECT_TOKEN(Tokens[4], tok::less, TT_BinaryOperator);
+ EXPECT_TOKEN(Tokens[8], tok::greater, TT_BinaryOperator);
+
  Tokens = annotate("return A < B ^ A > B;");
  ASSERT_EQ(Tokens.size(), 10u) << Tokens;
  EXPECT_TOKEN(Tokens[2], tok::less, TT_BinaryOperator);