Author: Owen Pan Date: 2024-08-27T19:14:16-07:00 New Revision: fac7e87d6634a153450bbc6dd147245d7b534a16
URL: https://github.com/llvm/llvm-project/commit/fac7e87d6634a153450bbc6dd147245d7b534a16 DIFF: https://github.com/llvm/llvm-project/commit/fac7e87d6634a153450bbc6dd147245d7b534a16.diff LOG: [clang-format] Insert a space between new/delete and a C-style cast (#106175) It doesn't make sense to remove the space between new/delete and a C-style cast when SpaceBeforeParensOptions.AfterPlacementOperator is set to false. Fixes #105628. Added: Modified: clang/lib/Format/TokenAnnotator.cpp clang/unittests/Format/FormatTest.cpp Removed: ################################################################################ diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index f15330098a2395..d92874266cc36f 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -4732,7 +4732,9 @@ bool TokenAnnotator::spaceRequiredBetween(const AnnotatedLine &Line, Left.isOneOf(tok::kw_new, tok::kw_delete) && Right.isNot(TT_OverloadedOperatorLParen) && !(Line.MightBeFunctionDecl && Left.is(TT_FunctionDeclarationName))) { - return Style.SpaceBeforeParensOptions.AfterPlacementOperator; + const auto *RParen = Right.MatchingParen; + return Style.SpaceBeforeParensOptions.AfterPlacementOperator || + (RParen && RParen->is(TT_CastRParen)); } if (Line.Type == LT_ObjCDecl) return true; diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index 7a0c7e2d157bd6..5ebf0d7068dd6c 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -11749,6 +11749,7 @@ TEST_F(FormatTest, UnderstandsNewAndDelete) { "};", AfterPlacementOperator); verifyFormat("void operator new(void *foo) ATTRIB;", AfterPlacementOperator); + verifyFormat("delete (int *)p;", AfterPlacementOperator); AfterPlacementOperator.SpaceBeforeParensOptions.AfterPlacementOperator = false; @@ -11764,6 +11765,7 @@ TEST_F(FormatTest, UnderstandsNewAndDelete) { "};", AfterPlacementOperator); verifyFormat("void operator new(void *foo) ATTRIB;", AfterPlacementOperator); + verifyFormat("delete (int *)p;", AfterPlacementOperator); } TEST_F(FormatTest, UnderstandsUsesOfStarAndAmp) { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
