[PATCH] D64775: [Format/ObjC] Avoid breaking between unary operators and operands
Ben Hamilton via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Fri Jul 19 09:50:48 PDT 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rL366592: [Format/ObjC] Avoid breaking between unary operators and operands (authored by benhamilton, committed by ).
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.
Changed prior to commit:
https://reviews.llvm.org/D64775?vs=210095&id=210859#toc
Repository:
rL LLVM
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D64775/new/
https://reviews.llvm.org/D64775
Files:
cfe/trunk/lib/Format/TokenAnnotator.cpp
cfe/trunk/unittests/Format/FormatTestObjC.cpp
Index: cfe/trunk/lib/Format/TokenAnnotator.cpp
===================================================================
--- cfe/trunk/lib/Format/TokenAnnotator.cpp
+++ cfe/trunk/lib/Format/TokenAnnotator.cpp
@@ -2429,6 +2429,8 @@
if (Left.is(TT_JavaAnnotation))
return 50;
+ if (Left.is(TT_UnaryOperator))
+ return 60;
if (Left.isOneOf(tok::plus, tok::comma) && Left.Previous &&
Left.Previous->isLabelString() &&
(Left.NextOperator || Left.OperatorIndex != 0))
Index: cfe/trunk/unittests/Format/FormatTestObjC.cpp
===================================================================
--- cfe/trunk/unittests/Format/FormatTestObjC.cpp
+++ cfe/trunk/unittests/Format/FormatTestObjC.cpp
@@ -886,6 +886,18 @@
" bb:42\n"
" cc:42];");
+ // Avoid breaking between unary operators and ObjC method expressions.
+ Style.ColumnLimit = 45;
+ verifyFormat("if (a012345678901234567890123 &&\n"
+ " ![foo bar]) {\n"
+ "}");
+ verifyFormat("if (a012345678901234567890123 &&\n"
+ " +[foo bar]) {\n"
+ "}");
+ verifyFormat("if (a012345678901234567890123 &&\n"
+ " -[foo bar]) {\n"
+ "}");
+
Style.ColumnLimit = 70;
verifyFormat(
"void f() {\n"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D64775.210859.patch
Type: text/x-patch
Size: 1327 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20190719/1ecdfac9/attachment.bin>
More information about the cfe-commits
mailing list