diff options
| author | Daniel Jasper <djasper@google.com> | 2014-07-28 12:08:06 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2014-07-28 12:08:06 +0000 |
| commit | 8b76d608b8eaf24ec2ad80dd7b06db0edc9365cf (patch) | |
| tree | 46c81419f8e3d591c2ac4fed889db8651e2148ae /clang/lib/Format | |
| parent | a1e66057c14309fe3e2405e70746d1b32a7afa25 (diff) | |
| download | bcm5719-llvm-8b76d608b8eaf24ec2ad80dd7b06db0edc9365cf.tar.gz bcm5719-llvm-8b76d608b8eaf24ec2ad80dd7b06db0edc9365cf.zip | |
clang-format: Fix formatting of lock annotations in lambda definitions.
Before:
SomeFunction([](int i)LOCKS_EXCLUDED(a) {});
After:
SomeFunction([](int i) LOCKS_EXCLUDED(a) {});
llvm-svn: 214069
Diffstat (limited to 'clang/lib/Format')
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 017afe1a370..5f8ce797469 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -842,6 +842,10 @@ private: LeftOfParens = Tok.MatchingParen->getPreviousNonComment(); if (LeftOfParens && LeftOfParens->is(tok::r_paren)) return false; + if (LeftOfParens && LeftOfParens->is(tok::r_square) && + LeftOfParens->MatchingParen && + LeftOfParens->MatchingParen->Type == TT_LambdaLSquare) + return false; bool IsCast = false; bool ParensAreEmpty = Tok.Previous == Tok.MatchingParen; bool ParensAreType = !Tok.Previous || |
