diff options
| author | Daniel Jasper <djasper@google.com> | 2014-11-14 09:05:32 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2014-11-14 09:05:32 +0000 |
| commit | 09f6abe8d87256d6d1b6285587418a1adad67a40 (patch) | |
| tree | 6cb5e5aa73380b287f86fcb10cb3284c08bdbb73 /clang/lib/Format/TokenAnnotator.cpp | |
| parent | 30a2406e65a914fff3e2abcfd233e60470245f85 (diff) | |
| download | bcm5719-llvm-09f6abe8d87256d6d1b6285587418a1adad67a40.tar.gz bcm5719-llvm-09f6abe8d87256d6d1b6285587418a1adad67a40.zip | |
clang-format: [Java] Improve generic return type formatting.
Before:
public<R> ArrayList<R> get() {
After:
public <R> ArrayList<R> get() {
llvm-svn: 221979
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 f926beb1066..bce1d64166f 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -1684,7 +1684,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.is(tok::kw_static) && Right.Type == TT_TemplateOpener) + if (Left.isOneOf(tok::kw_static, tok::kw_public) && + Right.Type == TT_TemplateOpener) return true; } if (Right.Tok.getIdentifierInfo() && Left.Tok.getIdentifierInfo()) |
