diff options
-rw-r--r-- | lib/Format/Format.cpp | 2 | ||||
-rw-r--r-- | unittests/Format/FormatTest.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp index 77fba1fbf1..5140639d00 100644 --- a/lib/Format/Format.cpp +++ b/lib/Format/Format.cpp @@ -994,7 +994,7 @@ private: Tok.Parent->is(tok::comma) || Tok.Parent->is(tok::l_square) || Tok.Parent->is(tok::question) || Tok.Parent->is(tok::colon) || Tok.Parent->is(tok::kw_return) || Tok.Parent->is(tok::kw_case) || - Tok.Parent->is(tok::at)) + Tok.Parent->is(tok::at) || Tok.Parent->is(tok::l_brace)) return TT_UnaryOperator; // There can't be to consecutive binary operators. diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index 061ac5710d..9106a1fc7f 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -956,6 +956,9 @@ TEST_F(FormatTest, UnderstandsUnaryOperators) { "case -1:\n" " break;\n" "}"); + + verifyFormat("const NSPoint kBrowserFrameViewPatternOffset = { -5, +3 };"); + verifyFormat("const NSPoint kBrowserFrameViewPatternOffset = { +5, -3 };"); } TEST_F(FormatTest, UndestandsOverloadedOperators) { |