From ea2d042f897b082c6f270cf9fbda3be2937cecc0 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Thu, 8 May 2014 08:50:10 +0000 Subject: clang-format: Fix binary operator detection before lambdas. Before: bool foo = true&& [] { return false; }(); After: bool foo = true && [] { return false; }(); llvm-svn: 208288 --- clang/lib/Format/TokenAnnotator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'clang/lib/Format') 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 && -- cgit v1.2.3