From 4bfa736f1bc9b0761a3806bd884fcbf48ad3e553 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Fri, 14 Nov 2014 17:30:15 +0000 Subject: clang-format: [Java] Further improve generics formatting. llvm-svn: 222011 --- clang/lib/Format/TokenAnnotator.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'clang/lib/Format/TokenAnnotator.cpp') 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; } -- cgit v1.2.3