diff options
Diffstat (limited to 'clang/lib/Format')
| -rw-r--r-- | clang/lib/Format/FormatToken.h | 4 | ||||
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/clang/lib/Format/FormatToken.h b/clang/lib/Format/FormatToken.h index 7ced6eac409..053a3b050e4 100644 --- a/clang/lib/Format/FormatToken.h +++ b/clang/lib/Format/FormatToken.h @@ -546,7 +546,9 @@ struct AdditionalKeywords { kw_function = &IdentTable.get("function"); kw_var = &IdentTable.get("var"); + kw_abstract = &IdentTable.get("abstract"); kw_extends = &IdentTable.get("extends"); + kw_final = &IdentTable.get("final"); kw_implements = &IdentTable.get("implements"); kw_interface = &IdentTable.get("interface"); kw_synchronized = &IdentTable.get("synchronized"); @@ -569,7 +571,9 @@ struct AdditionalKeywords { IdentifierInfo *kw_var; // Java keywords. + IdentifierInfo *kw_abstract; IdentifierInfo *kw_extends; + IdentifierInfo *kw_final; IdentifierInfo *kw_implements; IdentifierInfo *kw_interface; IdentifierInfo *kw_synchronized; diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 6d9006be30b..b376ec95c1b 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -1710,8 +1710,9 @@ bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line, return true; 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, tok::kw_private, - tok::kw_protected) && + if ((Left.isOneOf(tok::kw_static, tok::kw_public, tok::kw_private, + tok::kw_protected) || + Left.isOneOf(Keywords.kw_final, Keywords.kw_abstract)) && Right.Type == TT_TemplateOpener) return true; } |
