diff options
| author | Daniel Jasper <djasper@google.com> | 2013-02-06 15:23:09 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2013-02-06 15:23:09 +0000 |
| commit | 383965914085e387937c63d1b7670a5d98734aaa (patch) | |
| tree | 9286521defb14a4a1b6a79f9e294540599bd11be /clang/lib/Format/Format.cpp | |
| parent | d895ae94f92be51f29e72912bf6e6825a7b3d62c (diff) | |
| download | bcm5719-llvm-383965914085e387937c63d1b7670a5d98734aaa.tar.gz bcm5719-llvm-383965914085e387937c63d1b7670a5d98734aaa.zip | |
Fix a formatting bug caused by comments in expressions.
This fixes llvm.org/PR15162.
Before:
bool aaaaaaaaaaaaa = // comment
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa || aaaaaaaaaaaaaaaaaaaaaaaaaaaa ||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaa;
After:
bool aaaaaaaaaaaaa = // comment
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa || aaaaaaaaaaaaaaaaaaaaaaaaaaaa ||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa || aaaaaaaaaaaaaaaaaaaaaaaaaaaaa;
llvm-svn: 174508
Diffstat (limited to 'clang/lib/Format/Format.cpp')
| -rw-r--r-- | clang/lib/Format/Format.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp index 99251f5c85b..eac822c5b72 100644 --- a/clang/lib/Format/Format.cpp +++ b/clang/lib/Format/Format.cpp @@ -494,6 +494,7 @@ private: // FIXME: Do we need to do this for assignments nested in other // expressions? if (RootToken.isNot(tok::kw_for) && ParenLevel == 0 && + !isTrailingComment(Current) && (getPrecedence(Previous) == prec::Assignment || Previous.is(tok::kw_return))) State.Stack.back().AssignmentColumn = State.Column + Spaces; |
