[clang] [clang-format] Add support for additional C++ declaration specifiers in QualifierOrder (PR #160853)

Björn Schäpers via cfe-commits cfe-commits at lists.llvm.org
Fri Sep 26 12:41:32 PDT 2025


================
@@ -1057,48 +1081,37 @@ TEST_F(QualifierFixerTest, IsQualifierType) {
   ConfiguredTokens.push_back(tok::kw_restrict);
   ConfiguredTokens.push_back(tok::kw_constexpr);
   ConfiguredTokens.push_back(tok::kw_friend);
+  ConfiguredTokens.push_back(tok::kw_typedef);
+  ConfiguredTokens.push_back(tok::kw_consteval);
+  ConfiguredTokens.push_back(tok::kw_constinit);
+  ConfiguredTokens.push_back(tok::kw_thread_local);
+  ConfiguredTokens.push_back(tok::kw_extern);
+  ConfiguredTokens.push_back(tok::kw_mutable);
+  ConfiguredTokens.push_back(tok::kw_signed);
+  ConfiguredTokens.push_back(tok::kw_unsigned);
+  ConfiguredTokens.push_back(tok::kw_long);
+  ConfiguredTokens.push_back(tok::kw_short);
+  ConfiguredTokens.push_back(tok::kw_decltype);
+  ConfiguredTokens.push_back(tok::kw_explicit);
 
   TestLexer lexer{Allocator, Buffers};
   const auto LangOpts = getFormattingLangOpts();
 
   auto Tokens = lexer.lex(
-      "const static inline auto restrict int double long constexpr friend");
-  ASSERT_EQ(Tokens.size(), 11u) << Tokens;
-
-  EXPECT_TRUE(
-      isConfiguredQualifierOrType(Tokens[0], ConfiguredTokens, LangOpts));
-  EXPECT_TRUE(
-      isConfiguredQualifierOrType(Tokens[1], ConfiguredTokens, LangOpts));
-  EXPECT_TRUE(
-      isConfiguredQualifierOrType(Tokens[2], ConfiguredTokens, LangOpts));
-  EXPECT_TRUE(
-      isConfiguredQualifierOrType(Tokens[3], ConfiguredTokens, LangOpts));
-  EXPECT_TRUE(
-      isConfiguredQualifierOrType(Tokens[4], ConfiguredTokens, LangOpts));
-  EXPECT_TRUE(
-      isConfiguredQualifierOrType(Tokens[5], ConfiguredTokens, LangOpts));
-  EXPECT_TRUE(
-      isConfiguredQualifierOrType(Tokens[6], ConfiguredTokens, LangOpts));
-  EXPECT_TRUE(
-      isConfiguredQualifierOrType(Tokens[7], ConfiguredTokens, LangOpts));
-  EXPECT_TRUE(
-      isConfiguredQualifierOrType(Tokens[8], ConfiguredTokens, LangOpts));
-  EXPECT_TRUE(
-      isConfiguredQualifierOrType(Tokens[9], ConfiguredTokens, LangOpts));
-
-  EXPECT_TRUE(isQualifierOrType(Tokens[0], LangOpts));
-  EXPECT_TRUE(isQualifierOrType(Tokens[1], LangOpts));
-  EXPECT_TRUE(isQualifierOrType(Tokens[2], LangOpts));
-  EXPECT_TRUE(isQualifierOrType(Tokens[3], LangOpts));
-  EXPECT_TRUE(isQualifierOrType(Tokens[4], LangOpts));
-  EXPECT_TRUE(isQualifierOrType(Tokens[5], LangOpts));
-  EXPECT_TRUE(isQualifierOrType(Tokens[6], LangOpts));
-  EXPECT_TRUE(isQualifierOrType(Tokens[7], LangOpts));
-  EXPECT_TRUE(isQualifierOrType(Tokens[8], LangOpts));
-  EXPECT_TRUE(isQualifierOrType(Tokens[9], LangOpts));
+      "const static inline restrict int double long constexpr friend "
+      "typedef consteval constinit thread_local extern mutable signed unsigned short decltype explicit");
+  ASSERT_EQ(Tokens.size(), 20u) << Tokens;
+
+  // Test that all tokens are recognized
----------------
HazardyKnusperkeks wrote:

Drop.

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


More information about the cfe-commits mailing list