llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang-format Author: Owen Pan (owenca) <details> <summary>Changes</summary> … parentheses (#<!-- -->138229) Backport d3506ee573a2aa1403817642ef45f8c0305bb572 --- Full diff: https://github.com/llvm/llvm-project/pull/138380.diff 2 Files Affected: - (modified) clang/lib/Format/UnwrappedLineParser.cpp (+2-1) - (modified) clang/unittests/Format/FormatTest.cpp (+2) ``````````diff diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp index 2b348c926294e..c3ffabce15ec8 100644 --- a/clang/lib/Format/UnwrappedLineParser.cpp +++ b/clang/lib/Format/UnwrappedLineParser.cpp @@ -2581,7 +2581,8 @@ bool UnwrappedLineParser::parseParens(TokenType AmpAmpTokenType) { if (Prev) { auto OptionalParens = [&] { if (MightBeStmtExpr || MightBeFoldExpr || Line->InMacroBody || - SeenComma || Style.RemoveParentheses == FormatStyle::RPS_Leave) { + SeenComma || Style.RemoveParentheses == FormatStyle::RPS_Leave || + RParen->getPreviousNonComment() == LParen) { return false; } const bool DoubleParens = diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index bf3eff129efd5..49e1fde1d9ccf 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -27895,6 +27895,8 @@ TEST_F(FormatTest, RemoveParentheses) { verifyFormat("return ((... && std::is_convertible_v<TArgsLocal, TArgs>));", "return (((... && std::is_convertible_v<TArgsLocal, TArgs>)));", Style); + verifyFormat("MOCK_METHOD(void, Function, (), override);", + "MOCK_METHOD(void, Function, (), (override));", Style); Style.RemoveParentheses = FormatStyle::RPS_ReturnStatement; verifyFormat("#define Return0 return (0);", Style); `````````` </details> https://github.com/llvm/llvm-project/pull/138380 _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
