]> granicus.if.org Git - clang/commit
[clang-format] Fix regression about not aligning trailing comments in case they were...
authorKrasimir Georgiev <krasimir@google.com>
Wed, 1 Feb 2017 10:10:04 +0000 (10:10 +0000)
committerKrasimir Georgiev <krasimir@google.com>
Wed, 1 Feb 2017 10:10:04 +0000 (10:10 +0000)
commit17abd01ec81c0b36c3531a85f22c6e93b35e02f1
treec36acad73868fa7d478acf15aa21c3f5d5fbaa81
parent469b6394c1972c289a80c803bc1029173b8b280e
[clang-format] Fix regression about not aligning trailing comments in case they were previously aligned, but at different indent.

Summary:
Comment reflower was adding untouchable tokens in case two consecutive comment lines are aligned in the source code. This disallows the whitespace manager to re-indent them later.

source:
```
int i = f(abc, // line 1
          d, // line 2
     // line 3
  b);
```
Since line 2 and line 3 are aligned, the reflower was marking line 3 as untouchable; however the three comment lines need to be re-aligned.
output before:
```
int i = f(abc, // line 1
          d,   // line 2
     // line 3
  b);
```
output after:
```
int i = f(abc, // line 1
          d,   // line 2
       // line 3
  b);
```

Reviewers: djasper

Reviewed By: djasper

Subscribers: sammccall, cfe-commits, klimek

Differential Revision: https://reviews.llvm.org/D29383

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@293755 91177308-0d34-0410-b5e6-96231b3b80d8
lib/Format/BreakableToken.cpp
unittests/Format/FormatTest.cpp