llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang-format Author: Björn Schäpers (HazardyKnusperkeks) <details> <summary>Changes</summary> By using if init statement. --- Full diff: https://github.com/llvm/llvm-project/pull/70583.diff 1 Files Affected: - (modified) clang/lib/Format/TokenAnnotator.cpp (+10-12) ``````````diff diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 9ec8b93e39fd23a..eda312689f3ce4a 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -2093,18 +2093,16 @@ class AnnotatingParser { !Current.Next->isOneOf(tok::semi, tok::colon, tok::l_brace, tok::comma, tok::period, tok::arrow, tok::coloncolon, tok::kw_noexcept)) { - if (FormatToken *AfterParen = Current.MatchingParen->Next) { - // Make sure this isn't the return type of an Obj-C block declaration - if (AfterParen->isNot(tok::caret)) { - if (FormatToken *BeforeParen = Current.MatchingParen->Previous) { - if (BeforeParen->is(tok::identifier) && - BeforeParen->isNot(TT_TypenameMacro) && - BeforeParen->TokenText == BeforeParen->TokenText.upper() && - (!BeforeParen->Previous || - BeforeParen->Previous->ClosesTemplateDeclaration)) { - Current.setType(TT_FunctionAnnotationRParen); - } - } + if (FormatToken *AfterParen = Current.MatchingParen->Next; + AfterParen->isNot(tok::caret)) { + // Make sure this isn't the return type of an Obj-C block declaration. + if (FormatToken *BeforeParen = Current.MatchingParen->Previous; + BeforeParen->is(tok::identifier) && + BeforeParen->isNot(TT_TypenameMacro) && + BeforeParen->TokenText == BeforeParen->TokenText.upper() && + (!BeforeParen->Previous || + BeforeParen->Previous->ClosesTemplateDeclaration)) { + Current.setType(TT_FunctionAnnotationRParen); } } } `````````` </details> https://github.com/llvm/llvm-project/pull/70583 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits