[clang-format] Fix a bug in FormatToken::isObjCAccessSpecifier() (llvm#136109)

Fix llvm#136092

Author: owenca

clang/lib/Format/FormatToken.h

@@ -706,8 +706,9 @@ struct FormatToken {
   [[nodiscard]] bool isTypeOrIdentifier(const LangOptions &LangOpts) const;
 
   bool isObjCAccessSpecifier() const {
-    return Next && Next->isOneOf(tok::objc_public, tok::objc_protected,
-                                 tok::objc_package, tok::objc_private);
+    return is(tok::at) && Next &&
+           Next->isOneOf(tok::objc_public, tok::objc_protected,
+                         tok::objc_package, tok::objc_private);
   }
 
   /// Returns whether \p Tok is ([{ or an opening < of a template or in

clang/unittests/Format/TokenAnnotatorTest.cpp

@@ -3963,6 +3963,12 @@ TEST_F(TokenAnnotatorTest, UTF8StringLiteral) {
   EXPECT_TOKEN(Tokens[1], tok::utf8_string_literal, TT_Unknown);
 }
 
+TEST_F(TokenAnnotatorTest, IdentifierPackage) {
+  auto Tokens = annotate("auto package;");
+  ASSERT_EQ(Tokens.size(), 4u) << Tokens;
+  EXPECT_FALSE(Tokens[0]->isObjCAccessSpecifier());
+}
+
 } // namespace
 } // namespace format
 } // namespace clang