From 331e8e4e27be5dd673898a89a7cf00e76903216a Mon Sep 17 00:00:00 2001 From: Marek Kurdej Date: Thu, 17 Feb 2022 11:10:41 +0100 Subject: [PATCH] [clang-format] Do not add space after return-like keywords in macros. Fixes https://github.com/llvm/llvm-project/issues/33336. Reviewed By: HazardyKnusperkeks, owenpan Differential Revision: https://reviews.llvm.org/D120028 --- clang/lib/Format/TokenAnnotator.cpp | 5 +++-- clang/unittests/Format/FormatTest.cpp | 10 ++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 206fa45..9a020eb 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -2989,7 +2989,8 @@ bool TokenAnnotator::spaceRequiredBeforeParens(const FormatToken &Right) const { bool TokenAnnotator::spaceRequiredBetween(const AnnotatedLine &Line, const FormatToken &Left, const FormatToken &Right) { - if (Left.is(tok::kw_return) && Right.isNot(tok::semi)) + if (Left.is(tok::kw_return) && + !Right.isOneOf(tok::semi, tok::r_paren, tok::hashhash)) return true; if (Style.isJson() && Left.is(tok::string_literal) && Right.is(tok::colon)) return false; @@ -3026,7 +3027,7 @@ bool TokenAnnotator::spaceRequiredBetween(const AnnotatedLine &Line, return false; // co_await (x), co_yield (x), co_return (x) if (Left.isOneOf(tok::kw_co_await, tok::kw_co_yield, tok::kw_co_return) && - Right.isNot(tok::semi)) + !Right.isOneOf(tok::semi, tok::r_paren)) return true; if (Left.is(tok::l_paren) || Right.is(tok::r_paren)) diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index 7350369..f71f8dc 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -1861,6 +1861,16 @@ TEST_F(FormatTest, UnderstandsMacros) { "#define BBB }\n", Style); // verifyFormat("#define AAA N { //\n", Style); + + verifyFormat("MACRO(return)"); + verifyFormat("MACRO(co_await)"); + verifyFormat("MACRO(co_return)"); + verifyFormat("MACRO(co_yield)"); + verifyFormat("MACRO(return, something)"); + verifyFormat("MACRO(co_return, something)"); + verifyFormat("MACRO(something##something)"); + verifyFormat("MACRO(return##something)"); + verifyFormat("MACRO(co_return##something)"); } TEST_F(FormatTest, ShortBlocksInMacrosDontMergeWithCodeAfterMacro) { -- 2.7.4