diff options
| -rw-r--r-- | lib/Format/TokenAnnotator.cpp | 8 | ||||
| -rw-r--r-- | unittests/Format/FormatTest.cpp | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp index 25b3a24704..19582f2ed2 100644 --- a/lib/Format/TokenAnnotator.cpp +++ b/lib/Format/TokenAnnotator.cpp @@ -503,6 +503,11 @@ private: CurrentToken = &CurrentToken->Children[0]; else CurrentToken = NULL; + + // Reset token type in case we have already looked at it and then recovered + // from an error (e.g. failure to find the matching >). + if (CurrentToken != NULL) + CurrentToken->Type = TT_Unknown; } /// \brief A struct to hold information valid in a specific context, e.g. @@ -558,6 +563,9 @@ private: Previous && (Previous->is(tok::star) || Previous->is(tok::amp)); Previous = Previous->Parent) Previous->Type = TT_PointerOrReference; + } else if (Current.Parent && + Current.Parent->Type == TT_CtorInitializerColon) { + Contexts.back().IsExpression = true; } if (Current.Type == TT_Unknown) { diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index 19e34df681..c63d7566a9 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -1666,6 +1666,7 @@ TEST_F(FormatTest, UnderstandsNewAndDelete) { TEST_F(FormatTest, UnderstandsUsesOfStarAndAmp) { verifyFormat("int *f(int *a) {}"); verifyFormat("int main(int argc, char **argv) {}"); + verifyFormat("Test::Test(int b) : a(b * b) {}"); verifyIndependentOfContext("f(a, *a);"); verifyIndependentOfContext("f(*a);"); verifyIndependentOfContext("int a = b * 10;"); @@ -1758,6 +1759,8 @@ TEST_F(FormatTest, UnderstandsUsesOfStarAndAmp) { " for (const int &v : Values) {\n" " }\n" "}"); + verifyFormat("for (int i = a * a; i < 10; ++i) {\n}"); + verifyFormat("for (int i = 0; i < a * a; ++i) {\n}"); verifyIndependentOfContext("A = new SomeType *[Length]();"); verifyGoogleFormat("A = new SomeType* [Length]();"); |