Re: [PATCH] D19069: clang-format: Fixed various brace wrapping and block merging bugs

2016-04-14 Thread Maxime Beaulieu via cfe-commits
mxbOctasic added inline comments. Comment at: lib/Format/UnwrappedLineParser.cpp:789-790 @@ -773,4 +788,4 @@ if (FormatTok->Tok.is(tok::l_brace)) { -if (Style.BraceWrapping.AfterObjCDeclaration) - addUnwrappedLine(); +CompoundStatementIndenter Inden

Re: [PATCH] D19069: clang-format: Fixed various brace wrapping and block merging bugs

2016-04-13 Thread Daniel Jasper via cfe-commits
djasper added inline comments. Comment at: lib/Format/UnwrappedLineParser.cpp:1388-1390 @@ -1372,3 +1387,5 @@ parseBlock(/*MustBeDeclaration=*/false); -if (Style.BraceWrapping.BeforeElse) +if (Style.BraceWrapping.BeforeElse || +Style.BraceWrapping.AfterControl

Re: [PATCH] D19069: clang-format: Fixed various brace wrapping and block merging bugs

2016-04-13 Thread Maxime Beaulieu via cfe-commits
mxbOctasic added inline comments. Comment at: lib/Format/UnwrappedLineParser.cpp:789-790 @@ -773,4 +788,4 @@ if (FormatTok->Tok.is(tok::l_brace)) { -if (Style.BraceWrapping.AfterObjCDeclaration) - addUnwrappedLine(); +CompoundStatementIndenter Inden

[PATCH] D19069: clang-format: Fixed various brace wrapping and block merging bugs

2016-04-13 Thread Maxime Beaulieu via cfe-commits
mxbOctasic created this revision. mxbOctasic added a reviewer: djasper. mxbOctasic added subscribers: cameron314, cfe-commits. Herald added a subscriber: klimek. Multiple brace wrapping flag combination were broken. First, IndentBraces + !AfterControlStatement caused the whole If-Else construct