replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clang-format: Fix fake parentheses placement with comments. 

Before:
  return (a > b
          // comment1
      // comment2
      || c);

After:
  return (a > b
      // comment1
      // comment2
      || c);

llvm-svn: 223234
This commit is contained in:
Daniel Jasper 2014-12-03 14:02:59 +00:00
parent 7395cae005
commit c095663ec1
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/Format/TokenAnnotator.cpp
View File

@ -1217,7 +1217,7 @@ private:
Start->StartsBinaryExpression = true;
if (Current) {
FormatToken *Previous = Current->Previous;
if (Previous->is(tok::comment) && Previous->Previous)
while (Previous->is(tok::comment) && Previous->Previous)
Previous = Previous->Previous;
++Previous->FakeRParens;
if (Precedence > prec::Unknown)

7
clang/unittests/Format/FormatTest.cpp
View File

@ -3337,6 +3337,13 @@ TEST_F(FormatTest, NoOperandAlignment) {
" + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\n"
" * cccccccccccccccccccccccccccccccccccc;",
Style);
Style.AlignAfterOpenBracket = false;
verifyFormat("return (a > b\n"
" // comment1\n"
" // comment2\n"
" || c);",
Style);
}
TEST_F(FormatTest, BreakingBeforeNonAssigmentOperators) {