From 3460b2546c1b76f0772d2b3f8edbea0b8aa7f47b Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Wed, 18 Dec 2013 07:08:51 +0000 Subject: clang-format: Fix ObjC method expr in binary expressions. Before: bool a = ([aaaaaaaa aaaaa] == aaaaaaaaaaaaaaaaa || [aaaaaaaa aaaaa] == aaaaaaaaaaaaaaaaaaaa); After: bool a = ([aaaaaaaa aaaaa] == aaaaaaaaaaaaaaaaa || [aaaaaaaa aaaaa] == aaaaaaaaaaaaaaaaaaaa); This fixes llvm.org/PR18271. llvm-svn: 197552 --- clang/lib/Format/TokenAnnotator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'clang/lib/Format/TokenAnnotator.cpp') diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index db071f101e4..6135783557e 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -1144,7 +1144,7 @@ unsigned TokenAnnotator::splitPenalty(const AnnotatedLine &Line, return 0; if (Left.is(tok::comma)) return 1; - if (Right.is(tok::l_square)) + if (Right.is(tok::l_square) && Right.Type != TT_ObjCMethodExpr) return 250; if (Right.Type == TT_StartOfName || Right.is(tok::kw_operator)) { -- cgit v1.2.3