https://github.com/owenca created
https://github.com/llvm/llvm-project/pull/124240
Fixes #124223.
>From dbaee952414957db7b43232b82929e8d04e51564 Mon Sep 17 00:00:00 2001
From: Owen Pan <owenpi...@gmail.com>
Date: Fri, 24 Jan 2025 00:05:11 -0800
Subject: [PATCH] [clang-format] Fix a bug in annotating overloaded co_await
decl
Fixes #124223.
---
clang/lib/Format/TokenAnnotator.cpp | 2 +-
clang/unittests/Format/TokenAnnotatorTest.cpp | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/clang/lib/Format/TokenAnnotator.cpp
b/clang/lib/Format/TokenAnnotator.cpp
index f36cf7b638e0d2..bc41d43d1438c5 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -3784,7 +3784,7 @@ static bool isFunctionDeclarationName(const LangOptions
&LangOpts,
return Next;
if (Next->is(TT_OverloadedOperator))
continue;
- if (Next->isOneOf(tok::kw_new, tok::kw_delete)) {
+ if (Next->isOneOf(tok::kw_new, tok::kw_delete, tok::kw_co_await)) {
// For 'new[]' and 'delete[]'.
if (Next->Next &&
Next->Next->startsSequence(tok::l_square, tok::r_square)) {
diff --git a/clang/unittests/Format/TokenAnnotatorTest.cpp
b/clang/unittests/Format/TokenAnnotatorTest.cpp
index 9ac60ce73750bf..10587449dcea95 100644
--- a/clang/unittests/Format/TokenAnnotatorTest.cpp
+++ b/clang/unittests/Format/TokenAnnotatorTest.cpp
@@ -1025,6 +1025,12 @@ TEST_F(TokenAnnotatorTest,
UnderstandsOverloadedOperators) {
EXPECT_TOKEN(Tokens[6], tok::l_paren, TT_OverloadedOperatorLParen);
EXPECT_TOKEN(Tokens[8], tok::amp, TT_PointerOrReference);
EXPECT_TOKEN(Tokens[12], tok::amp, TT_PointerOrReference);
+
+ Tokens = annotate("SomeLoooooooooooooooooType::Awaitable\n"
+ "SomeLoooooooooooooooooType::operator co_await();");
+ ASSERT_EQ(Tokens.size(), 11u) << Tokens;
+ EXPECT_TOKEN(Tokens[3], tok::identifier, TT_FunctionDeclarationName);
+ EXPECT_TOKEN(Tokens[7], tok::l_paren, TT_OverloadedOperatorLParen);
}
TEST_F(TokenAnnotatorTest, OverloadedOperatorInTemplate) {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
