Author: Owen Pan Date: 2025-01-30T18:03:42-08:00 New Revision: ea84474966f19af4f1f4a1250ec258af1c6e2571
URL: https://github.com/llvm/llvm-project/commit/ea84474966f19af4f1f4a1250ec258af1c6e2571 DIFF: https://github.com/llvm/llvm-project/commit/ea84474966f19af4f1f4a1250ec258af1c6e2571.diff LOG: [clang-format] Fix annotation of Java/JavaScript keyword extends (#125038) Uncovered in #124891. 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 43e983f8d0979f..c1714a19e2d182 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -2584,6 +2584,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 7ad7e7fc529f79..81512d6116110e 100644 --- a/clang/unittests/Format/TokenAnnotatorTest.cpp +++ b/clang/unittests/Format/TokenAnnotatorTest.cpp @@ -3462,6 +3462,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); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
