Author: Owen Pan Date: 2024-09-20T18:12:09-07:00 New Revision: 4fd14b9a3afb2ab34dfaa3bc4ed86e82122507be
URL: https://github.com/llvm/llvm-project/commit/4fd14b9a3afb2ab34dfaa3bc4ed86e82122507be DIFF: https://github.com/llvm/llvm-project/commit/4fd14b9a3afb2ab34dfaa3bc4ed86e82122507be.diff LOG: [clang-format] Correctly annotate pointer/reference in range-for loop (#109361) Fixes #109358. 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 6f09835bad3a83..3f7ac6c7776f40 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -1407,6 +1407,12 @@ class AnnotatingParser { } } else if (Contexts.back().ColonIsForRangeExpr) { Tok->setType(TT_RangeBasedForLoopColon); + for (auto *Prev = Tok->Previous; + Prev && !Prev->isOneOf(tok::semi, tok::l_paren); + Prev = Prev->Previous) { + if (Prev->isPointerOrReference()) + Prev->setFinalizedType(TT_PointerOrReference); + } } else if (Contexts.back().ContextType == Context::C11GenericSelection) { Tok->setType(TT_GenericSelectionColon); } else if (CurrentToken && CurrentToken->is(tok::numeric_constant)) { diff --git a/clang/unittests/Format/TokenAnnotatorTest.cpp b/clang/unittests/Format/TokenAnnotatorTest.cpp index 34c03d668a9a0a..dfb6c060d32094 100644 --- a/clang/unittests/Format/TokenAnnotatorTest.cpp +++ b/clang/unittests/Format/TokenAnnotatorTest.cpp @@ -333,6 +333,12 @@ TEST_F(TokenAnnotatorTest, UnderstandsUsesOfStarAndAmp) { ASSERT_EQ(Tokens.size(), 17u) << Tokens; EXPECT_TOKEN(Tokens[11], tok::star, TT_BinaryOperator); + Tokens = annotate("for (int i; Foo *&foo : foos)"); + ASSERT_EQ(Tokens.size(), 13u) << Tokens; + EXPECT_TOKEN(Tokens[6], tok::star, TT_PointerOrReference); + EXPECT_TOKEN(Tokens[7], tok::amp, TT_PointerOrReference); + EXPECT_TOKEN(Tokens[9], tok::colon, TT_RangeBasedForLoopColon); + Tokens = annotate("#define FOO auto Foo = [] { f(a * b); };"); ASSERT_EQ(Tokens.size(), 19u) << Tokens; EXPECT_TOKEN(Tokens[12], tok::star, TT_BinaryOperator); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
