diff options
| author | Daniel Jasper <djasper@google.com> | 2015-05-19 11:06:33 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2015-05-19 11:06:33 +0000 |
| commit | ed41f774fca65e8d9319e66b7128da48d85724fc (patch) | |
| tree | 033f88f40e294e14b27f5285c27957e0582968b1 /clang/lib/Format | |
| parent | 5cdda674c6daa61a0f6c679d70bf878a112f2c8d (diff) | |
| download | bcm5719-llvm-ed41f774fca65e8d9319e66b7128da48d85724fc.tar.gz bcm5719-llvm-ed41f774fca65e8d9319e66b7128da48d85724fc.zip | |
clang-format: Fix regression caused by r237244.
Before:
[call aaaaaaaa.aaaaaaaa.aaaaaaaa.aaaaaaaa.aaaaaaaa.aaaaaaaa.aaaaaaaa.aaaaaaaa.
aaaaaaaa];
After:
[call aaaaaaaa.aaaaaaaa.aaaaaaaa.aaaaaaaa.aaaaaaaa.aaaaaaaa.aaaaaaaa.aaaaaaaa
.aaaaaaaa];
This merely papers over the fact that we aren't parsing ObjC method calls
correctly. Also, the indentation is weird.
llvm-svn: 237681
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 f4b2f006556..d3122615c83 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -2132,7 +2132,7 @@ bool TokenAnnotator::canBreakBefore(const AnnotatedLine &Line, return true; if (Right.is(TT_SelectorName) || (Right.is(tok::identifier) && Right.Next && Right.Next->is(TT_ObjCMethodExpr))) - return true; + return Left.isNot(tok::period); // FIXME: Properly parse ObjC calls. if (Left.is(tok::r_paren) && Line.Type == LT_ObjCProperty) return true; if (Left.ClosesTemplateDeclaration) |
