Author: mydeveloperday Date: 2021-11-14T14:13:44Z New Revision: fce3eed9f93afac512d809c22234db7be7a9d478
URL: https://github.com/llvm/llvm-project/commit/fce3eed9f93afac512d809c22234db7be7a9d478 DIFF: https://github.com/llvm/llvm-project/commit/fce3eed9f93afac512d809c22234db7be7a9d478.diff LOG: [clang-format][c++2b] support removal of the space between auto and {} in P0849R8 Looks like the work of {D113393} requires manual clang-formatting intervention. Removal of the space between `auto` and `{}` Reviewed By: HazardyKnusperkeks, Quuxplusone Differential Revision: https://reviews.llvm.org/D113826 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 73c88201f76d3..ace3d25ca460c 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -2940,6 +2940,10 @@ bool TokenAnnotator::spaceRequiredBetween(const AnnotatedLine &Line, return true; } + // auto{x} auto(x) + if (Left.is(tok::kw_auto) && Right.isOneOf(tok::l_paren, tok::l_brace)) + return false; + // requires clause Concept1<T> && Concept2<T> if (Left.is(TT_ConstraintJunctions) && Right.is(tok::identifier)) return true; diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index eea1e49da8089..6507cbefc5a90 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -22566,6 +22566,30 @@ TEST_F(FormatTest, LimitlessStringsAndComments) { EXPECT_EQ(Code, format(Code, Style)); } +TEST_F(FormatTest, FormatDecayCopy) { + // error cases from unit tests + verifyFormat("foo(auto())"); + verifyFormat("foo(auto{})"); + verifyFormat("foo(auto({}))"); + verifyFormat("foo(auto{{}})"); + + verifyFormat("foo(auto(1))"); + verifyFormat("foo(auto{1})"); + verifyFormat("foo(new auto(1))"); + verifyFormat("foo(new auto{1})"); + verifyFormat("decltype(auto(1)) x;"); + verifyFormat("decltype(auto{1}) x;"); + verifyFormat("auto(x);"); + verifyFormat("auto{x};"); + verifyFormat("new auto{x};"); + verifyFormat("auto{x} = y;"); + verifyFormat("auto(x) = y;"); // actually a declaration, but this is clearly + // the user's own fault + verifyFormat("integral auto(x) = y;"); // actually a declaration, but this is + // clearly the user's own fault + verifyFormat("auto(*p)() = f;"); // actually a declaration; TODO FIXME +} + } // namespace } // namespace format } // namespace clang _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
