llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang-format Author: None (llvmbot) <details> <summary>Changes</summary> Backport 037657de7e5ccd4a37054829874a209b82fb8be7 Requested by: @<!-- -->owenca --- Full diff: https://github.com/llvm/llvm-project/pull/136808.diff 2 Files Affected: - (modified) clang/lib/Format/TokenAnnotator.cpp (+4-2) - (modified) clang/unittests/Format/TokenAnnotatorTest.cpp (+5) ``````````diff diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 44580d8624684..11b941c5a0411 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -3961,8 +3961,10 @@ void TokenAnnotator::calculateFormattingInformation(AnnotatedLine &Line) const { FormatToken *AfterLastAttribute = nullptr; FormatToken *ClosingParen = nullptr; - for (auto *Tok = FirstNonComment ? FirstNonComment->Next : nullptr; Tok; - Tok = Tok->Next) { + for (auto *Tok = FirstNonComment && FirstNonComment->isNot(tok::kw_using) + ? FirstNonComment->Next + : nullptr; + Tok; Tok = Tok->Next) { if (Tok->is(TT_StartOfName)) SeenName = true; if (Tok->Previous->EndsCppAttributeGroup) diff --git a/clang/unittests/Format/TokenAnnotatorTest.cpp b/clang/unittests/Format/TokenAnnotatorTest.cpp index b7b8a21b726b6..757db66c3e298 100644 --- a/clang/unittests/Format/TokenAnnotatorTest.cpp +++ b/clang/unittests/Format/TokenAnnotatorTest.cpp @@ -1073,6 +1073,11 @@ TEST_F(TokenAnnotatorTest, UnderstandsOverloadedOperators) { ASSERT_EQ(Tokens.size(), 11u) << Tokens; EXPECT_TOKEN(Tokens[3], tok::identifier, TT_FunctionDeclarationName); EXPECT_TOKEN(Tokens[7], tok::l_paren, TT_OverloadedOperatorLParen); + + Tokens = annotate("using std::operator==;"); + ASSERT_EQ(Tokens.size(), 7u) << Tokens; + // Not TT_FunctionDeclarationName. + EXPECT_TOKEN(Tokens[3], tok::kw_operator, TT_Unknown); } TEST_F(TokenAnnotatorTest, OverloadedOperatorInTemplate) { `````````` </details> https://github.com/llvm/llvm-project/pull/136808 _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
