diff options
| author | Owen Pan <owenpiano@gmail.com> | 2024-09-20 18:12:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-20 18:12:09 -0700 |
| commit | 4fd14b9a3afb2ab34dfaa3bc4ed86e82122507be (patch) | |
| tree | ac058d11b921c77a26837be207f96c1ec0680cf7 | |
| parent | 2e89e6b59a32450f43416bfdfb65748ea4606875 (diff) | |
| download | llvm-4fd14b9a3afb2ab34dfaa3bc4ed86e82122507be.zip llvm-4fd14b9a3afb2ab34dfaa3bc4ed86e82122507be.tar.gz llvm-4fd14b9a3afb2ab34dfaa3bc4ed86e82122507be.tar.bz2 | |
[clang-format] Correctly annotate pointer/reference in range-for loop (#109361)
Fixes #109358.
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 6 | ||||
| -rw-r--r-- | clang/unittests/Format/TokenAnnotatorTest.cpp | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 6f09835b..3f7ac6c 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -1407,6 +1407,12 @@ private: } } 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 34c03d6..dfb6c06 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); |