summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2015-04-23 13:58:40 +0000
committerDaniel Jasper <djasper@google.com>2015-04-23 13:58:40 +0000
commit0faa9136faaec5455f7d0039d4deb42debd0756a (patch)
tree56b824886b0287b58db9ac90ac589bfa729538cf /clang/lib/Format
parent5372c72a427ee8770b5876a949f381f8f1ca9bdc (diff)
downloadbcm5719-llvm-0faa9136faaec5455f7d0039d4deb42debd0756a.tar.gz
bcm5719-llvm-0faa9136faaec5455f7d0039d4deb42debd0756a.zip
clang-format: Properly detect variable declarations with ObjC.
Before: LoooooooooooooooooooooooooooooooooooooooongType LoooooooooooooooooooooooooooooooooooooongVariable([A a]); After: LoooooooooooooooooooooooooooooooooooooooongType LoooooooooooooooooooooooooooooooooooooongVariable([A a]); llvm-svn: 235599
Diffstat (limited to 'clang/lib/Format')
-rw-r--r--clang/lib/Format/TokenAnnotator.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
index c6ffd8a9778..e52650be07f 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -1400,7 +1400,8 @@ static bool isFunctionDeclarationName(const FormatToken &Current) {
if (Tok->is(tok::kw_const) || Tok->isSimpleTypeSpecifier() ||
Tok->isOneOf(TT_PointerOrReference, TT_StartOfName))
return true;
- if (Tok->isOneOf(tok::l_brace, tok::string_literal) || Tok->Tok.isLiteral())
+ if (Tok->isOneOf(tok::l_brace, tok::string_literal, TT_ObjCMethodExpr) ||
+ Tok->Tok.isLiteral())
return false;
}
return false;
OpenPOWER on IntegriCloud