diff options
author | Daniel Jasper <djasper@google.com> | 2014-05-08 08:50:10 +0000 |
---|---|---|
committer | Daniel Jasper <djasper@google.com> | 2014-05-08 08:50:10 +0000 |
commit | ea2d042f897b082c6f270cf9fbda3be2937cecc0 (patch) | |
tree | ab55323c93028585fb3eaabca3913ec59bf321cd /clang/lib/Format | |
parent | a0e051e004d7fc05a64314c8cb82d9bcc5c45bf6 (diff) | |
download | bcm5719-llvm-ea2d042f897b082c6f270cf9fbda3be2937cecc0.tar.gz bcm5719-llvm-ea2d042f897b082c6f270cf9fbda3be2937cecc0.zip |
clang-format: Fix binary operator detection before lambdas.
Before:
bool foo = true&& [] { return false; }();
After:
bool foo = true && [] { return false; }();
llvm-svn: 208288
Diffstat (limited to 'clang/lib/Format')
-rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 2f8457c61b3..2d94c7e6b2a 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -904,7 +904,7 @@ private: PrevToken->Type == TT_UnaryOperator || PrevToken->Type == TT_CastRParen) return TT_UnaryOperator; - if (NextToken->is(tok::l_square)) + if (NextToken->is(tok::l_square) && NextToken->Type != TT_LambdaLSquare) return TT_PointerOrReference; if (PrevToken->is(tok::r_paren) && PrevToken->MatchingParen && |