diff options
| author | Daniel Jasper <djasper@google.com> | 2014-04-28 07:34:48 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2014-04-28 07:34:48 +0000 |
| commit | 437c3f518857a83776a8d149e581672db0c532c5 (patch) | |
| tree | 7e0c048b6318605562405f3dc0d3de88b17d039f /clang/lib/Format/TokenAnnotator.cpp | |
| parent | 9a342778b9ed69df03175ebfc915d1025218bc5a (diff) | |
| download | bcm5719-llvm-437c3f518857a83776a8d149e581672db0c532c5.tar.gz bcm5719-llvm-437c3f518857a83776a8d149e581672db0c532c5.zip | |
clang-format: Don't wrap after @interface.
This fixes llvm.org/PR19450.
Before:
@interface
BookmarkHomeHandsetViewController ()<BookmarkAllCollectionViewDelegate,
BookmarkFolderCollectionViewDelegate,
BookmarkMenuViewControllerDelegate,
BookmarkSearchViewControllerDelegate> {
}
After:
@interface aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ()<
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa> {
}
llvm-svn: 207400
Diffstat (limited to 'clang/lib/Format/TokenAnnotator.cpp')
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 52764552b0d..d2b79e544e3 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -1583,6 +1583,8 @@ bool TokenAnnotator::canBreakBefore(const AnnotatedLine &Line, const FormatToken &Left = *Right.Previous; if (Left.is(tok::at)) return false; + if (Left.Tok.getObjCKeywordID() == tok::objc_interface) + return false; if (Right.Type == TT_StartOfName || Right.is(tok::kw_operator)) return true; if (Right.isTrailingComment()) |
