diff options
| author | Daniel Jasper <djasper@google.com> | 2013-02-06 21:04:05 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2013-02-06 21:04:05 +0000 |
| commit | ba9ddb66e11bf290e4b3fca9ad0449a5f1a3bbd6 (patch) | |
| tree | af9698e2dde3a42dd8ea558a75d90351760ddb11 /clang | |
| parent | d3d4356f6e50eef68db561349a39417c409ec148 (diff) | |
| download | bcm5719-llvm-ba9ddb66e11bf290e4b3fca9ad0449a5f1a3bbd6.tar.gz bcm5719-llvm-ba9ddb66e11bf290e4b3fca9ad0449a5f1a3bbd6.zip | |
Become a little smarter with formatting long chains of pipes.
Assign a high penalty to breaking before "<<" if the previous token is a
string literal ending in ":" or "=".
Before:
llvm::outs()
<< "aaaaaaaaaaaaaaaaa = " << aaaaaaaaaaaaaaaaa << "bbbbbbbbbbbbbbbbb = "
<< bbbbbbbbbbbbbbbbb << "ccccccccccccccccc = " << ccccccccccccccccc
<< "ddddddddddddddddd = " << ddddddddddddddddd << "eeeeeeeeeeeeeeeee = "
<< eeeeeeeeeeeeeeeee;
After:
llvm::outs() << "aaaaaaaaaaaaaaaaa = " << aaaaaaaaaaaaaaaaa
<< "bbbbbbbbbbbbbbbbb = " << bbbbbbbbbbbbbbbbb
<< "ccccccccccccccccc = " << ccccccccccccccccc
<< "ddddddddddddddddd = " << ddddddddddddddddd
<< "eeeeeeeeeeeeeeeee = " << eeeeeeeeeeeeeeeee;
llvm-svn: 174545
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 10 | ||||
| -rw-r--r-- | clang/unittests/Format/FormatTest.cpp | 7 |
2 files changed, 16 insertions, 1 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 9c7834f5640..ad3baae00d4 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -784,8 +784,16 @@ unsigned TokenAnnotator::splitPenalty(const AnnotatedLine &Line, Left.Type == TT_TemplateOpener) return 20; - if (Right.is(tok::lessless)) + if (Right.is(tok::lessless)) { + if (Left.is(tok::string_literal)) { + char LastChar = + StringRef(Left.FormatTok.Tok.getLiteralData(), + Left.FormatTok.TokenLength).drop_back(1).rtrim().back(); + if (LastChar == ':' || LastChar == '=') + return 100; + } return prec::Shift; + } if (Left.Type == TT_ConditionalExpr) return prec::Assignment; prec::Level Level = getPrecedence(Left); diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index 69096076bad..160126ba3d9 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -1318,6 +1318,13 @@ TEST_F(FormatTest, AlignsPipes) { " << \" cccccc = \" << pkt.cccccc << \"\\n\"\n" " << \" ddd = [\" << pkt.ddd << \"]\\n\"\n" " << \"}\";"); + + verifyFormat( + "llvm::outs() << \"aaaaaaaaaaaaaaaaa = \" << aaaaaaaaaaaaaaaaa\n" + " << \"bbbbbbbbbbbbbbbbb = \" << bbbbbbbbbbbbbbbbb\n" + " << \"ccccccccccccccccc = \" << ccccccccccccccccc\n" + " << \"ddddddddddddddddd = \" << ddddddddddddddddd\n" + " << \"eeeeeeeeeeeeeeeee = \" << eeeeeeeeeeeeeeeee;"); } TEST_F(FormatTest, UnderstandsEquals) { |
