Author: Owen Pan Date: 2025-01-27T00:11:18-08:00 New Revision: 9452ee4f750a849148a391ac75eb31220343fa1e
URL: https://github.com/llvm/llvm-project/commit/9452ee4f750a849148a391ac75eb31220343fa1e DIFF: https://github.com/llvm/llvm-project/commit/9452ee4f750a849148a391ac75eb31220343fa1e.diff LOG: [clang-format] Treat uppercase identifiers after struct as macros (#124397) This restores the behavior before llvmorg-20-init. Fixes #94184. Fixes #117477. Fixes #122690. Fixes #123142. Added: Modified: clang/lib/Format/UnwrappedLineParser.cpp clang/unittests/Format/TokenAnnotatorTest.cpp Removed: ################################################################################ diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp index 42583291363482..906fc11a07d5ee 100644 --- a/clang/lib/Format/UnwrappedLineParser.cpp +++ b/clang/lib/Format/UnwrappedLineParser.cpp @@ -4075,7 +4075,8 @@ void UnwrappedLineParser::parseRecord(bool ParseAsExpr) { break; default: if (!JSPastExtendsOrImplements && !ClassName && - Previous->is(tok::identifier) && Previous->isNot(TT_AttributeMacro)) { + Previous->is(tok::identifier) && Previous->isNot(TT_AttributeMacro) && + Previous->TokenText != Previous->TokenText.upper()) { ClassName = Previous; } } diff --git a/clang/unittests/Format/TokenAnnotatorTest.cpp b/clang/unittests/Format/TokenAnnotatorTest.cpp index 10587449dcea95..585878e0edc5bb 100644 --- a/clang/unittests/Format/TokenAnnotatorTest.cpp +++ b/clang/unittests/Format/TokenAnnotatorTest.cpp @@ -560,9 +560,16 @@ TEST_F(TokenAnnotatorTest, UnderstandsStructs) { ASSERT_EQ(Tokens.size(), 15u) << Tokens; EXPECT_TOKEN(Tokens[11], tok::l_brace, TT_StructLBrace); + constexpr StringRef Code{"struct EXPORT StructName {};"}; + + Tokens = annotate(Code); + ASSERT_EQ(Tokens.size(), 7u) << Tokens; + EXPECT_TOKEN(Tokens[3], tok::l_brace, TT_StructLBrace); + EXPECT_TOKEN(Tokens[4], tok::r_brace, TT_StructRBrace); + auto Style = getLLVMStyle(); Style.AttributeMacros.push_back("EXPORT"); - Tokens = annotate("struct EXPORT StructName {};", Style); + Tokens = annotate(Code, Style); ASSERT_EQ(Tokens.size(), 7u) << Tokens; EXPECT_TOKEN(Tokens[1], tok::identifier, TT_AttributeMacro); EXPECT_TOKEN(Tokens[3], tok::l_brace, TT_StructLBrace); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
