diff options
| -rw-r--r-- | lib/Format/TokenAnnotator.cpp | 10 | ||||
| -rw-r--r-- | unittests/Format/FormatTest.cpp | 7 |
2 files changed, 16 insertions, 1 deletions
diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp index 9c7834f564..ad3baae00d 100644 --- a/lib/Format/TokenAnnotator.cpp +++ b/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/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index 69096076ba..160126ba3d 100644 --- a/unittests/Format/FormatTest.cpp +++ b/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) { |