diff options
| author | Daniel Jasper <djasper@google.com> | 2013-12-18 07:08:51 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2013-12-18 07:08:51 +0000 |
| commit | 3460b2546c1b76f0772d2b3f8edbea0b8aa7f47b (patch) | |
| tree | 155f07f979d9f95e87af8e8b8e92991750837ce6 /clang/lib/Format/TokenAnnotator.cpp | |
| parent | 53eaea0104d1931e73ee782d1780ac2310759747 (diff) | |
| download | bcm5719-llvm-3460b2546c1b76f0772d2b3f8edbea0b8aa7f47b.tar.gz bcm5719-llvm-3460b2546c1b76f0772d2b3f8edbea0b8aa7f47b.zip | |
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
Diffstat (limited to 'clang/lib/Format/TokenAnnotator.cpp')
| -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 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)) { |
