From 16b3562f00e8e55e34f6f4244b2ffddacce717df Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Tue, 26 Feb 2013 13:18:08 +0000 Subject: In range-based for-loops, prefer splitting after ":". Before: for (const aaaaaaaaaaaaaaaaaaaaa & aaaaaaaaa : aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) {} After: for (const aaaaaaaaaaaaaaaaaaaaa &aaaaaaaaa : aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) {} llvm-svn: 176087 --- clang/lib/Format/TokenAnnotator.cpp | 2 +- clang/unittests/Format/FormatTest.cpp | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'clang') diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 08290b905a4..83e1facb219 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -886,7 +886,7 @@ unsigned TokenAnnotator::splitPenalty(const AnnotatedLine &Line, if (Left.Type == TT_RangeBasedForLoopColon || Left.Type == TT_InheritanceColon) - return 5; + return 2; if (Right.is(tok::arrow) || Right.is(tok::period)) { if (Line.Type == LT_BuilderTypeCall) diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index 53f3773d5c1..9e777c66e99 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -318,6 +318,8 @@ TEST_F(FormatTest, RangeBasedForLoops) { " aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) {\n}"); verifyFormat("for (auto aaaaaaaaaaaaaaaaaaaaa :\n" " aaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaa, aaaaaaaaaaaaa)) {\n}"); + verifyFormat("for (const aaaaaaaaaaaaaaaaaaaaa &aaaaaaaaa :\n" + " aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) {\n}"); } TEST_F(FormatTest, FormatsWhileLoop) { @@ -601,10 +603,10 @@ TEST_F(FormatTest, CommentsInStaticInitializers) { " b\n" "}")); EXPECT_EQ("S s = { a, b };", format("S s = {\n" - " a,\n" - "\n" - " b\n" - "};")); + " a,\n" + "\n" + " b\n" + "};")); } //===----------------------------------------------------------------------===// -- cgit v1.2.3