krasimir created this revision. krasimir requested review of this revision. Herald added a project: clang. Herald added a subscriber: cfe-commits.
Depends on https://reviews.llvm.org/D116000. Added test cases from the comments on https://reviews.llvm.org/D114583. Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D116001 Files: clang/unittests/Format/FormatTest.cpp Index: clang/unittests/Format/FormatTest.cpp =================================================================== --- clang/unittests/Format/FormatTest.cpp +++ clang/unittests/Format/FormatTest.cpp @@ -11515,6 +11515,17 @@ " };\n" "};"); verifyFormat("#define A {a, a},"); + // Don't confuse braced list initializers with compound statements. + verifyFormat( + "class A {\n" + " A() : a{} {}\n" + " A(int b) : b(b) {}\n" + " A(int a, int b) : a(a), bs{{bs...}} { f(); }\n" + " int a, b;\n" + " explicit Expr(const Scalar<Result> &x) : u{Constant<Result>{x}} {}\n" + " explicit Expr(Scalar<Result> &&x) : u{Constant<Result>{std::move(x)}} " + "{}\n" + "};"); // Avoid breaking between equal sign and opening brace FormatStyle AvoidBreakingFirstArgument = getLLVMStyle();
Index: clang/unittests/Format/FormatTest.cpp =================================================================== --- clang/unittests/Format/FormatTest.cpp +++ clang/unittests/Format/FormatTest.cpp @@ -11515,6 +11515,17 @@ " };\n" "};"); verifyFormat("#define A {a, a},"); + // Don't confuse braced list initializers with compound statements. + verifyFormat( + "class A {\n" + " A() : a{} {}\n" + " A(int b) : b(b) {}\n" + " A(int a, int b) : a(a), bs{{bs...}} { f(); }\n" + " int a, b;\n" + " explicit Expr(const Scalar<Result> &x) : u{Constant<Result>{x}} {}\n" + " explicit Expr(Scalar<Result> &&x) : u{Constant<Result>{std::move(x)}} " + "{}\n" + "};"); // Avoid breaking between equal sign and opening brace FormatStyle AvoidBreakingFirstArgument = getLLVMStyle();
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits