From 7d9f0e4cb3ae8851be3e1a0a57ee6246e81584cc Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Wed, 5 Feb 2014 13:43:04 +0000 Subject: [PATCH] clang-format: Don't indent relative to unary operators. It seems like most people see unary operators more like part of the subsequent identifier and find relative indentation odd. Before: aaaaaaaaaa(!aaaaaaaaaa( // break aaaaa)); After: aaaaaaaaaa(!aaaaaaaaaa( // break aaaaa)); git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@200840 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Format/ContinuationIndenter.cpp | 1 - unittests/Format/FormatTest.cpp | 8 +++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/Format/ContinuationIndenter.cpp b/lib/Format/ContinuationIndenter.cpp index 6db3ca9824..95cb54df9a 100644 --- a/lib/Format/ContinuationIndenter.cpp +++ b/lib/Format/ContinuationIndenter.cpp @@ -296,7 +296,6 @@ void ContinuationIndenter::addTokenOnCurrentLine(LineState &State, bool DryRun, State.Stack.back().LastSpace = State.Column; else if ((Previous.Type == TT_BinaryOperator || Previous.Type == TT_ConditionalExpr || - Previous.Type == TT_UnaryOperator || Previous.Type == TT_CtorInitializerColon) && (Previous.getPrecedence() != prec::Assignment || Current.StartsBinaryExpression)) diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index 5de15e3c2b..0f112a13f1 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -4219,14 +4219,12 @@ TEST_F(FormatTest, UnderstandsUnaryOperators) { verifyFormat("int a = i /* confusing comment */++;"); } -TEST_F(FormatTest, IndentsRelativeToUnaryOperators) { +TEST_F(FormatTest, DoesNotIndentRelativeToUnaryOperators) { verifyFormat("if (!aaaaaaaaaa( // break\n" - " aaaaa)) {\n" + " aaaaa)) {\n" "}"); verifyFormat("aaaaaaaaaa(!aaaaaaaaaa( // break\n" - " aaaaa));"); - - // Only indent relative to unary operators if the expression is nested. + " aaaaa));"); verifyFormat("*aaa = aaaaaaa( // break\n" " bbbbbb);"); } -- 2.40.0