[llvm-branch-commits] [clang] 94b97d1 - [clang-format] Fix annotation of Java/JavaScript keyword extends (#125038)

[Tom Stellard via llvm-branch-commits]

Author: Owen Pan
Date: 2025-02-14T14:29:57-08:00
New Revision: 94b97d19b7fa0fd1b5959e788bac104a017e6755

URL: https://github.com/llvm/llvm-project/commit/94b97d19b7fa0fd1b5959e788bac104a017e6755
DIFF: https://github.com/llvm/llvm-project/commit/94b97d19b7fa0fd1b5959e788bac104a017e6755.diff

LOG: [clang-format] Fix annotation of Java/JavaScript keyword extends (#125038)

Uncovered in #124891.

(cherry picked from commit ea84474966f19af4f1f4a1250ec258af1c6e2571)

Added: 
    

Modified: 
    clang/lib/Format/TokenAnnotator.cpp
    clang/unittests/Format/TokenAnnotatorTest.cpp

Removed: 
    


################################################################################
diff  --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
index 4246ade6e19be..d0724f35b1542 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -2586,6 +2586,11 @@ class AnnotatingParser {
     if (Tok.isNot(tok::identifier) || !Tok.Previous)
       return false;
 
+    if ((Style.isJavaScript() || Style.Language == FormatStyle::LK_Java) &&
+        Tok.is(Keywords.kw_extends)) {
+      return false;
+    }
+
     if (const auto *NextNonComment = Tok.getNextNonComment();
         (!NextNonComment && !Line.InMacroBody) ||
         (NextNonComment &&

diff  --git a/clang/unittests/Format/TokenAnnotatorTest.cpp b/clang/unittests/Format/TokenAnnotatorTest.cpp
index 2147a1b950dd1..479c34e6c9c11 100644
--- a/clang/unittests/Format/TokenAnnotatorTest.cpp
+++ b/clang/unittests/Format/TokenAnnotatorTest.cpp
@@ -3464,6 +3464,7 @@ TEST_F(TokenAnnotatorTest, BraceKind) {
   Tokens = annotate("a = class Foo extends goog.a {};",
                     getGoogleStyle(FormatStyle::LK_JavaScript));
   ASSERT_EQ(Tokens.size(), 12u) << Tokens;
+  EXPECT_TOKEN(Tokens[4], tok::identifier, TT_Unknown); // Not TT_StartOfName
   EXPECT_TOKEN(Tokens[8], tok::l_brace, TT_ClassLBrace);
   EXPECT_BRACE_KIND(Tokens[8], BK_Block);
   EXPECT_TOKEN(Tokens[9], tok::r_brace, TT_ClassRBrace);