Skip to content

[clang-format] Handle && in requires clause in requires requires #169207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
owenca merged 1 commit into from
Nov 23, 2025
Merged

[clang-format] Handle && in requires clause in requires requires #169207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion clang/lib/Format/TokenAnnotator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3129,8 +3129,11 @@ class AnnotatingParser {

// It is very unlikely that we are going to find a pointer or reference type
// definition on the RHS of an assignment.
if (IsExpression && !Contexts.back().CaretFound)
if (IsExpression && !Contexts.back().CaretFound &&
Line.getFirstNonComment()->isNot(
TT_RequiresClauseInARequiresExpression)) {
return TT_BinaryOperator;
}

// Opeartors at class scope are likely pointer or reference members.
if (!Scopes.empty() && Scopes.back() == ST_Class)
Expand Down
9 changes: 9 additions & 0 deletions clang/unittests/Format/TokenAnnotatorTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1391,6 +1391,15 @@ TEST_F(TokenAnnotatorTest, UnderstandsRequiresClausesAndConcepts) {
ASSERT_EQ(Tokens.size(), 38u) << Tokens;
EXPECT_TOKEN(Tokens[19], tok::l_brace, TT_RequiresExpressionLBrace);

Tokens =
annotate("template <typename... Ts>\n"
" requires requires {\n"
" requires std::same_as<int, SomeTemplate<void(Ts &&...)>>;\n"
" }\n"
"void Foo();");
ASSERT_EQ(Tokens.size(), 34u) << Tokens;
EXPECT_TOKEN(Tokens[21], tok::ampamp, TT_PointerOrReference);

Tokens =
annotate("template <class A, class B> concept C ="
"std::same_as<std::iter_value_t<A>, std::iter_value_t<B>>;");
Expand Down
Loading