diff options
| -rw-r--r-- | lib/Format/UnwrappedLineParser.cpp | 4 | ||||
| -rw-r--r-- | unittests/Format/FormatTest.cpp | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/lib/Format/UnwrappedLineParser.cpp b/lib/Format/UnwrappedLineParser.cpp index 047074135c..c21fa0d74e 100644 --- a/lib/Format/UnwrappedLineParser.cpp +++ b/lib/Format/UnwrappedLineParser.cpp @@ -33,12 +33,12 @@ public: ScopedDeclarationState(UnwrappedLine &Line, std::vector<bool> &Stack, bool MustBeDeclaration) : Line(Line), Stack(Stack) { - Stack.push_back(MustBeDeclaration); Line.MustBeDeclaration = MustBeDeclaration; + Stack.push_back(MustBeDeclaration); } ~ScopedDeclarationState() { - Line.MustBeDeclaration = Stack.back(); Stack.pop_back(); + Line.MustBeDeclaration = Stack.back(); } private: UnwrappedLine &Line; diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index fb5221ee24..114359d04d 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -1682,6 +1682,16 @@ TEST_F(FormatTest, BlockComments) { TEST_F(FormatTest, FormatStarDependingOnContext) { verifyFormat("void f(int *a);"); verifyFormat("void f() { f(fint * b); }"); + verifyFormat("class A {\n void f(int *a);\n};"); + verifyFormat("class A {\n int *a;\n};"); + verifyFormat("namespace a {\n" + "namespace b {\n" + "class A {\n" + " void f() {}\n" + " int *a;\n" + "};\n" + "}\n" + "}"); } TEST_F(FormatTest, SpecialTokensAtEndOfLine) { |