diff options
| author | Daniel Jasper <djasper@google.com> | 2014-11-14 17:30:15 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2014-11-14 17:30:15 +0000 |
| commit | 4bfa736f1bc9b0761a3806bd884fcbf48ad3e553 (patch) | |
| tree | 59a6cea162655772b38394f2e6a1b3c4b4ae1d84 /clang/lib/Format/TokenAnnotator.cpp | |
| parent | d127e3b6af0559331ac9c16f5e100e69501fc818 (diff) | |
| download | bcm5719-llvm-4bfa736f1bc9b0761a3806bd884fcbf48ad3e553.tar.gz bcm5719-llvm-4bfa736f1bc9b0761a3806bd884fcbf48ad3e553.zip | |
clang-format: [Java] Further improve generics formatting.
llvm-svn: 222011
Diffstat (limited to 'clang/lib/Format/TokenAnnotator.cpp')
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 104eb1d7afb..74fb0f7a727 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -1696,7 +1696,8 @@ bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line, } else if (Style.Language == FormatStyle::LK_Java) { if (Left.is(Keywords.kw_synchronized) && Right.is(tok::l_paren)) return Style.SpaceBeforeParens != FormatStyle::SBPO_Never; - if (Left.isOneOf(tok::kw_static, tok::kw_public) && + if (Left.isOneOf(tok::kw_static, tok::kw_public, tok::kw_private, + tok::kw_protected) && Right.Type == TT_TemplateOpener) return true; } |
