summaryrefslogtreecommitdiffstats
path: root/clang
diff options
context:
space:
mode:
Diffstat (limited to 'clang')
-rw-r--r--clang/lib/Format/Format.cpp2
-rw-r--r--clang/unittests/Format/FormatTest.cpp3
2 files changed, 4 insertions, 1 deletions
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp
index 77fba1fbf1c..5140639d009 100644
--- a/clang/lib/Format/Format.cpp
+++ b/clang/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/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp
index 061ac5710d6..9106a1fc7f3 100644
--- a/clang/unittests/Format/FormatTest.cpp
+++ b/clang/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) {
OpenPOWER on IntegriCloud