diff options
| -rw-r--r-- | lib/Format/Format.cpp | 3 | ||||
| -rw-r--r-- | unittests/Format/FormatTest.cpp | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp index 56bb6ec426..38d39bca63 100644 --- a/lib/Format/Format.cpp +++ b/lib/Format/Format.cpp @@ -1063,7 +1063,8 @@ private: return CurrentLineType == LT_ObjCDecl || Left.is(tok::kw_if) || Left.is(tok::kw_for) || Left.is(tok::kw_while) || Left.is(tok::kw_switch) || Left.is(tok::kw_return) || - Left.is(tok::kw_catch); + Left.is(tok::kw_catch) || Left.is(tok::kw_new) || + Left.is(tok::kw_delete); } if (Left.is(tok::at) && Right.FormatTok.Tok.getObjCKeywordID() != tok::objc_not_keyword) diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index 47e6bdd114..cb634fc7e1 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -980,6 +980,13 @@ TEST_F(FormatTest, UndestandsOverloadedOperators) { verifyFormat("void operator delete[](void *ptr);"); } +TEST_F(FormatTest, UnderstandsNewAndDelete) { + verifyFormat("A *a = new A;"); + verifyFormat("A *a = new (placement) A;"); + verifyFormat("delete a;"); + verifyFormat("delete (A *)a;"); +} + TEST_F(FormatTest, UnderstandsUsesOfStarAndAmp) { verifyFormat("int *f(int *a) {}"); verifyFormat("f(a, *a);"); |