[clang] [clang-format] Improve attribute (macro) handling for enums (PR #227461)

Björn Schäpers via cfe-commits cfe-commits at lists.llvm.org
Mon Nov 9 12:05:44 PST 2026


================
@@ -692,6 +692,38 @@ TEST_F(TokenAnnotatorTest, UnderstandsEnums) {
   ASSERT_EQ(Tokens.size(), 6u) << Tokens;
   EXPECT_TOKEN(Tokens[2], tok::l_brace, TT_EnumLBrace);
   EXPECT_TOKEN(Tokens[3], tok::r_brace, TT_EnumRBrace);
+
+  auto Style = getLLVMStyle();
+  Style.AttributeMacros = {"AttributeA", "AttributeB"};
+  Tokens = annotate("enum class AttributeA AttributeB Enum {};", Style);
+  ASSERT_EQ(Tokens.size(), 9u) << Tokens;
+  EXPECT_TOKEN(Tokens[5], tok::l_brace, TT_EnumLBrace);
+  EXPECT_TOKEN(Tokens[6], tok::r_brace, TT_EnumRBrace);
+
+  Tokens = annotate("enum class AttributeA [[nodiscard]] AttributeB Enum {};",
+                    Style);
+  ASSERT_EQ(Tokens.size(), 14u) << Tokens;
+  EXPECT_TOKEN(Tokens[3], tok::l_square, TT_AttributeLSquare);
+  EXPECT_TOKEN(Tokens[10], tok::l_brace, TT_EnumLBrace);
+  EXPECT_TOKEN(Tokens[11], tok::r_brace, TT_EnumRBrace);
+
+  Tokens = annotate(
+      "enum class AttributeA __attribute__((nodiscard)) AttributeB Enum {};",
+      Style);
+  ASSERT_EQ(Tokens.size(), 15u) << Tokens;
+  EXPECT_TOKEN(Tokens[4], tok::l_paren, TT_AttributeLParen);
----------------
HazardyKnusperkeks wrote:

```suggestion
```

https://github.com/llvm/llvm-project/pull/227461


More information about the cfe-commits mailing list