Author: Owen Pan Date: 2023-11-15T14:31:30-08:00 New Revision: eaff083035c86e32bd220fef5a2fab47117b70c1
URL: https://github.com/llvm/llvm-project/commit/eaff083035c86e32bd220fef5a2fab47117b70c1 DIFF: https://github.com/llvm/llvm-project/commit/eaff083035c86e32bd220fef5a2fab47117b70c1.diff LOG: [clang-format] Fix more bugs in isStartOfName() (#72336) Fixed #72264. 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 aebea9d8695ffc3..1d376cd8b5794dd 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -2018,10 +2018,6 @@ class AnnotatingParser { (!Line.MightBeFunctionDecl || Current.NestingLevel != 0)) { Contexts.back().FirstStartOfName = &Current; Current.setType(TT_StartOfName); - if (auto *PrevNonComment = Current.getPreviousNonComment(); - PrevNonComment && PrevNonComment->is(TT_StartOfName)) { - PrevNonComment->setType(TT_Unknown); - } } else if (Current.is(tok::semi)) { // Reset FirstStartOfName after finding a semicolon so that a for loop // with multiple increment statements is not confused with a for loop @@ -2210,7 +2206,8 @@ class AnnotatingParser { return false; if (const auto *NextNonComment = Tok.getNextNonComment(); - !NextNonComment || NextNonComment->isPointerOrReference()) { + !NextNonComment || NextNonComment->isPointerOrReference() || + NextNonComment->isOneOf(tok::identifier, tok::string_literal)) { return false; } diff --git a/clang/unittests/Format/TokenAnnotatorTest.cpp b/clang/unittests/Format/TokenAnnotatorTest.cpp index b4b42fc82238f8a..a986806b7a44069 100644 --- a/clang/unittests/Format/TokenAnnotatorTest.cpp +++ b/clang/unittests/Format/TokenAnnotatorTest.cpp @@ -2390,6 +2390,20 @@ TEST_F(TokenAnnotatorTest, UnderstandsDoWhile) { EXPECT_TOKEN(Tokens[4], tok::kw_while, TT_DoWhile); } +TEST_F(TokenAnnotatorTest, NotStartOfName) { + auto Tokens = annotate("#pragma clang diagnostic push"); + ASSERT_EQ(Tokens.size(), 6u) << Tokens; + EXPECT_TOKEN(Tokens[2], tok::identifier, TT_Unknown); + EXPECT_TOKEN(Tokens[3], tok::identifier, TT_Unknown); + EXPECT_TOKEN(Tokens[4], tok::identifier, TT_Unknown); + + Tokens = annotate("#pragma clang diagnostic ignored \"-Wzero-length-array\""); + ASSERT_EQ(Tokens.size(), 7u) << Tokens; + EXPECT_TOKEN(Tokens[2], tok::identifier, TT_Unknown); + EXPECT_TOKEN(Tokens[3], tok::identifier, TT_Unknown); + EXPECT_TOKEN(Tokens[4], tok::identifier, TT_Unknown); +} + } // namespace } // namespace format } // namespace clang _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
