diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Format/Format.cpp | 4 | ||||
| -rw-r--r-- | lib/Format/TokenAnnotator.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp index 0e4a2b797f..1a7dbe0936 100644 --- a/lib/Format/Format.cpp +++ b/lib/Format/Format.cpp @@ -372,8 +372,8 @@ private: void alignComments(comment_iterator I, comment_iterator E, unsigned Column) { while (I != E) { unsigned Spaces = I->Spaces + Column - I->MinColumn; - storeReplacement(I->Tok, std::string(I->NewLines, '\n') + - std::string(Spaces, ' ')); + storeReplacement( + I->Tok, std::string(I->NewLines, '\n') + std::string(Spaces, ' ')); ++I; } } diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp index c2b6c1b3e4..7c4797978f 100644 --- a/lib/Format/TokenAnnotator.cpp +++ b/lib/Format/TokenAnnotator.cpp @@ -937,7 +937,7 @@ unsigned TokenAnnotator::splitPenalty(const AnnotatedLine &Line, return 20; if (opensScope(Left)) - return 20; + return Left.ParameterCount > 1 ? prec::Comma : 20; if (Right.is(tok::lessless)) { if (Left.is(tok::string_literal)) { |