Formatter: Don't put a space in ObjC number literals like @+50
Before:
@ -4.5
Now:
@-4.5
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@172095 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
index 406daac..4d28104 100644
--- a/lib/Format/Format.cpp
+++ b/lib/Format/Format.cpp
@@ -946,7 +946,8 @@
if (Tok.Parent->is(tok::equal) || Tok.Parent->is(tok::l_paren) ||
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::kw_return) || Tok.Parent->is(tok::kw_case) ||
+ Tok.Parent->is(tok::at))
return TT_UnaryOperator;
// There can't be to consecutive binary operators.
@@ -1054,7 +1055,8 @@
return false;
if (Tok.Type == TT_UnaryOperator)
return Tok.Parent->isNot(tok::l_paren) &&
- Tok.Parent->isNot(tok::l_square);
+ Tok.Parent->isNot(tok::l_square) &&
+ Tok.Parent->isNot(tok::at);
if (Tok.Parent->is(tok::greater) && Tok.is(tok::greater)) {
return Tok.Type == TT_TemplateCloser && Tok.Parent->Type ==
TT_TemplateCloser && Style.SplitTemplateClosingGreater;
diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
index 077c358..b55cad7 100644
--- a/unittests/Format/FormatTest.cpp
+++ b/unittests/Format/FormatTest.cpp
@@ -1402,11 +1402,10 @@
verifyFormat("@throw");
verifyFormat("@try");
- // FIXME: Make the uncommented lines below pass.
verifyFormat("@\"String\"");
verifyFormat("@1");
- //verifyFormat("@+4.8");
- //verifyFormat("@-4");
+ verifyFormat("@+4.8");
+ verifyFormat("@-4");
verifyFormat("@1LL");
verifyFormat("@.5");
verifyFormat("@'c'");
