diff options
| author | Daniel Jasper <djasper@google.com> | 2014-01-10 08:40:17 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2014-01-10 08:40:17 +0000 |
| commit | 4d7a97adfc320afab2c02eeb47e1cef379a20515 (patch) | |
| tree | 4337ad4db996ea10891816007956ef50c34a220b /clang/lib/Format | |
| parent | 73cb84c271bd905d8f5c5c5d70c4b91ae8d1bf16 (diff) | |
| download | bcm5719-llvm-4d7a97adfc320afab2c02eeb47e1cef379a20515.tar.gz bcm5719-llvm-4d7a97adfc320afab2c02eeb47e1cef379a20515.zip | |
clang-format: Slightly adapt line break in edge case.
Before:
SomeMap[std::pair(aaaaaaaaaaaa, bbbbbbbbbbbbbbb)]
.insert(ccccccccccccccccccccccc);
After:
SomeMap[std::pair(aaaaaaaaaaaa, bbbbbbbbbbbbbbb)].insert(
ccccccccccccccccccccccc);
This seems to be about 3:1 more common in Google and Chromium style and I found
only a handful of instances inside the LLVM codebase.
llvm-svn: 198924
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 5799ae21af2..1c580c420db 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -1203,7 +1203,7 @@ unsigned TokenAnnotator::splitPenalty(const AnnotatedLine &Line, return 2; if (Right.isMemberAccess()) { - if (Left.isOneOf(tok::r_paren, tok::r_square) && Left.MatchingParen && + if (Left.is(tok::r_paren) && Left.MatchingParen && Left.MatchingParen->ParameterCount > 0) return 20; // Should be smaller than breaking at a nested comma. return 150; |
