diff options
| author | Daniel Jasper <djasper@google.com> | 2014-04-14 11:08:45 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2014-04-14 11:08:45 +0000 |
| commit | c0d606a584596039532a3770c5c65529bc18d47e (patch) | |
| tree | f44278657f318d1ba341cf1b816f1ace4f8dcc34 /clang/unittests/Format/FormatTest.cpp | |
| parent | f694ab1f18df8beaec81fcabf7edf4818f7ffbac (diff) | |
| download | bcm5719-llvm-c0d606a584596039532a3770c5c65529bc18d47e.tar.gz bcm5719-llvm-c0d606a584596039532a3770c5c65529bc18d47e.zip | |
clang-format: Don't allow hanging indentation for operators on new lines
Before:
if (aaaaaaaa && bbbbbbbbbbbbbbb // need to wrap
== cccccccccccccc) ...
After:
if (aaaaaaaa
&& bbbbbbbbbbbbbbb // need to wrap
== cccccccccccccc) ...
The same rule has already be implemented for BreakBeforeBinaryOperators
set to false in r205527.
llvm-svn: 206159
Diffstat (limited to 'clang/unittests/Format/FormatTest.cpp')
| -rw-r--r-- | clang/unittests/Format/FormatTest.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index fb33bd685be..0dc06594f15 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -2940,8 +2940,9 @@ TEST_F(FormatTest, ExpressionIndentationBreakingBeforeOperators) { " + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb) {\n}", Style); verifyFormat("if () {\n" - "} else if (aaaaa && bbbbb // break\n" - " > ccccc) {\n" + "} else if (aaaaa\n" + " && bbbbb // break\n" + " > ccccc) {\n" "}", Style); @@ -3697,6 +3698,12 @@ TEST_F(FormatTest, BreaksConditionalExpressions) { " : (bbbbbbbbbbbbbbb //\n" " ? ccccccccccccccc\n" " : ddddddddddddddd);"); + verifyFormat( + "int aaaaaaaaaaaaaaaaaaaaaaaaaaa = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n" + " ? aaaaaaaaaaaaaaaaaaaaaaaaa +\n" + " aaaaaaaaaaaaaaaaaaaaa +\n" + " aaaaaaaaaaaaaaaaaaaaa\n" + " : aaaaaaaaaa;"); FormatStyle NoBinPacking = getLLVMStyle(); NoBinPacking.BinPackParameters = false; @@ -4000,6 +4007,8 @@ TEST_F(FormatTest, AlignsPipes) { " llvm::outs() << \"aaaaaaaaaaaaaaaaaaaa: \"\n" " << aaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaa);\n" "}"); + verifyFormat("llvm::outs() << \"aaaaaaaaaaaaaaaa: \"\n" + " << aaaaaaaa.aaaaaaaaaaaa(aaa)->aaaaaaaaaaaaaa();"); // Breaking before the first "<<" is generally not desirable. verifyFormat( |
