From ddaa9be9783928ecd802c433821fe7c8e05bf8b9 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Tue, 29 Jan 2013 19:41:55 +0000 Subject: Improve formatting of code with comments. Before: aaaaaaa(aaaaaa( // comment aaaaaaa)); After: aaaaaaa(aaaaaa( // comment aaaaaaaa)); function(/* parameter 1 */ aaaaaaa, /* parameter 2 */ aaaaaaa, /* parameter 3 */ aaaaaaa, /* parameter 4 */ aaaaaaa); (the latter example was only wrong in the one-arg-per-line mode, e.g. in Google style). llvm-svn: 173821 --- clang/lib/Format/Format.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'clang/lib') diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp index 81c8309ef9d..ecd6f5d3854 100644 --- a/clang/lib/Format/Format.cpp +++ b/clang/lib/Format/Format.cpp @@ -617,12 +617,11 @@ private: (getPrecedence(Previous) == prec::Assignment || Previous.is(tok::kw_return))) State.Stack.back().AssignmentColumn = State.Column + Spaces; - if (Previous.is(tok::l_paren) || Previous.is(tok::l_brace) || - State.NextToken->Parent->Type == TT_TemplateOpener) + if (Current.Type != TT_LineComment && + (Previous.is(tok::l_paren) || Previous.is(tok::l_brace) || + State.NextToken->Parent->Type == TT_TemplateOpener)) State.Stack[ParenLevel].Indent = State.Column + Spaces; - if (Current.getPreviousNoneComment() != NULL && - Current.getPreviousNoneComment()->is(tok::comma) && - Current.isNot(tok::comment)) + if (Previous.is(tok::comma) && Current.Type != TT_LineComment) State.Stack[ParenLevel].HasMultiParameterLine = true; State.Column += Spaces; @@ -746,7 +745,7 @@ private: State.LineContainsContinuedForLoopSection) return UINT_MAX; if (!NewLine && State.NextToken->Parent->is(tok::comma) && - State.NextToken->isNot(tok::comment) && + State.NextToken->Type != TT_LineComment && State.Stack.back().BreakAfterComma) return UINT_MAX; // Trying to insert a parameter on a new line if there are already more than -- cgit v1.2.3