[clang] [clang-format] Don't remove parentheses separated from ellipsis by comma (PR #130471)
Owen Pan via cfe-commits
cfe-commits at lists.llvm.org
Sat Mar 8 22:50:33 PST 2025
https://github.com/owenca created https://github.com/llvm/llvm-project/pull/130471
Also clean up `case tok::r_paren` in UnwrappedLineParser::parseParens()
Fix #130359
>From 1f12041d3e28ee0de3277f6718967fd5d84e2161 Mon Sep 17 00:00:00 2001
From: Owen Pan <owenpiano at gmail.com>
Date: Sat, 8 Mar 2025 22:41:51 -0800
Subject: [PATCH] [clang-format] Don't remove parentheses separated from
ellipsis by comma
Also clean up `case tok::r_paren` in UnwrappedLineParser::parseParens()
Fix #130359
---
clang/lib/Format/UnwrappedLineParser.cpp | 86 ++++++++++++++----------
clang/unittests/Format/FormatTest.cpp | 4 ++
2 files changed, 55 insertions(+), 35 deletions(-)
diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp
index 6854e224c2631..a6e0596add5d2 100644
--- a/clang/lib/Format/UnwrappedLineParser.cpp
+++ b/clang/lib/Format/UnwrappedLineParser.cpp
@@ -2562,12 +2562,12 @@ bool UnwrappedLineParser::parseBracedList(bool IsAngleBracket, bool IsEnum) {
/// Returns whether there is a `=` token between the parentheses.
bool UnwrappedLineParser::parseParens(TokenType AmpAmpTokenType) {
assert(FormatTok->is(tok::l_paren) && "'(' expected.");
- auto *LeftParen = FormatTok;
+ auto *LParen = FormatTok;
bool SeenComma = false;
bool SeenEqual = false;
bool MightBeFoldExpr = false;
- const bool MightBeStmtExpr = Tokens->peekNextToken()->is(tok::l_brace);
nextToken();
+ const bool MightBeStmtExpr = FormatTok->is(tok::l_brace);
do {
switch (FormatTok->Tok.getKind()) {
case tok::l_paren:
@@ -2577,44 +2577,60 @@ bool UnwrappedLineParser::parseParens(TokenType AmpAmpTokenType) {
parseChildBlock();
break;
case tok::r_paren: {
- auto *Prev = LeftParen->Previous;
- if (!MightBeStmtExpr && !MightBeFoldExpr && !Line->InMacroBody &&
- Style.RemoveParentheses > FormatStyle::RPS_Leave) {
- const auto *Next = Tokens->peekNextToken();
- const bool DoubleParens =
- Prev && Prev->is(tok::l_paren) && Next && Next->is(tok::r_paren);
- const bool CommaSeparated =
- !DoubleParens && Prev && Prev->isOneOf(tok::l_paren, tok::comma) &&
- Next && Next->isOneOf(tok::comma, tok::r_paren);
- const auto *PrevPrev = Prev ? Prev->getPreviousNonComment() : nullptr;
- const bool Excluded =
- PrevPrev &&
- (PrevPrev->isOneOf(tok::kw___attribute, tok::kw_decltype) ||
- SeenComma ||
- (SeenEqual &&
- (PrevPrev->isOneOf(tok::kw_if, tok::kw_while) ||
- PrevPrev->endsSequence(tok::kw_constexpr, tok::kw_if))));
- const bool ReturnParens =
- Style.RemoveParentheses == FormatStyle::RPS_ReturnStatement &&
- ((NestedLambdas.empty() && !IsDecltypeAutoFunction) ||
- (!NestedLambdas.empty() && !NestedLambdas.back())) &&
- Prev && Prev->isOneOf(tok::kw_return, tok::kw_co_return) && Next &&
- Next->is(tok::semi);
- if ((DoubleParens && !Excluded) || (CommaSeparated && !SeenComma) ||
- ReturnParens) {
- LeftParen->Optional = true;
- FormatTok->Optional = true;
- }
- }
+ auto *Prev = LParen->Previous;
+ auto *RParen = FormatTok;
+ nextToken();
if (Prev) {
+ auto OptionalParens = [&] {
+ if (MightBeStmtExpr || MightBeFoldExpr || Line->InMacroBody ||
+ SeenComma || Style.RemoveParentheses == FormatStyle::RPS_Leave) {
+ return false;
+ }
+ const bool DoubleParens =
+ Prev->is(tok::l_paren) && FormatTok->is(tok::r_paren);
+ if (DoubleParens) {
+ const auto *PrevPrev = Prev->getPreviousNonComment();
+ const bool Excluded =
+ PrevPrev &&
+ (PrevPrev->isOneOf(tok::kw___attribute, tok::kw_decltype) ||
+ (SeenEqual &&
+ (PrevPrev->isOneOf(tok::kw_if, tok::kw_while) ||
+ PrevPrev->endsSequence(tok::kw_constexpr, tok::kw_if))));
+ if (!Excluded)
+ return true;
+ } else {
+ const bool CommaSeparated =
+ Prev->isOneOf(tok::l_paren, tok::comma) &&
+ FormatTok->isOneOf(tok::comma, tok::r_paren);
+ if (CommaSeparated &&
+ // LParen is not preceded by ellipsis, comma.
+ !Prev->endsSequence(tok::comma, tok::ellipsis) &&
+ // RParen is not followed by comma, ellipsis.
+ !(FormatTok->is(tok::comma) &&
+ Tokens->peekNextToken()->is(tok::ellipsis))) {
+ return true;
+ }
+ const bool ReturnParens =
+ Style.RemoveParentheses == FormatStyle::RPS_ReturnStatement &&
+ ((NestedLambdas.empty() && !IsDecltypeAutoFunction) ||
+ (!NestedLambdas.empty() && !NestedLambdas.back())) &&
+ Prev->isOneOf(tok::kw_return, tok::kw_co_return) &&
+ FormatTok->is(tok::semi);
+ if (ReturnParens)
+ return true;
+ }
+ return false;
+ };
if (Prev->is(TT_TypenameMacro)) {
- LeftParen->setFinalizedType(TT_TypeDeclarationParen);
- FormatTok->setFinalizedType(TT_TypeDeclarationParen);
- } else if (Prev->is(tok::greater) && FormatTok->Previous == LeftParen) {
+ LParen->setFinalizedType(TT_TypeDeclarationParen);
+ RParen->setFinalizedType(TT_TypeDeclarationParen);
+ } else if (Prev->is(tok::greater) && RParen->Previous == LParen) {
Prev->setFinalizedType(TT_TemplateCloser);
+ } else if (OptionalParens()) {
+ LParen->Optional = true;
+ RParen->Optional = true;
}
}
- nextToken();
return SeenEqual;
}
case tok::r_brace:
diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp
index bd335f4b6a21b..6cd424c20720d 100644
--- a/clang/unittests/Format/FormatTest.cpp
+++ b/clang/unittests/Format/FormatTest.cpp
@@ -28187,6 +28187,10 @@ TEST_F(FormatTest, RemoveParentheses) {
verifyFormat("foo((a, b));", "foo(((a), b));", Style);
verifyFormat("foo((a, b));", "foo((a, (b)));", Style);
verifyFormat("foo((a, b, c));", "foo((a, ((b)), c));", Style);
+ verifyFormat("(..., (hash_a = hash_combine(hash_a, hash_b)));",
+ "(..., ((hash_a = hash_combine(hash_a, hash_b))));", Style);
+ verifyFormat("((hash_a = hash_combine(hash_a, hash_b)), ...);",
+ "(((hash_a = hash_combine(hash_a, hash_b))), ...);", Style);
verifyFormat("return (0);", "return (((0)));", Style);
verifyFormat("return (({ 0; }));", "return ((({ 0; })));", Style);
verifyFormat("return ((... && std::is_convertible_v<TArgsLocal, TArgs>));",
More information about the cfe-commits
mailing list