From 8c72920b3a18a2c07ab5c060ac9d8e94cb53caaa Mon Sep 17 00:00:00 2001
From: Nathan Hjelm <hjelmn@cs.unm.edu>
Date: Thu, 18 Mar 2021 21:04:29 -0600
Subject: [PATCH] clang-format: tweaks

This commit makes the following changes:

 - Disallow single-line functions. This matches the dominant style used
   in Open MPI.

 - Increase the penalty for breaking on assigment slightly lower than
   breaking before first argument. That will ensure that long assignments
   of the form foo = bar(baz) will break after the = before trying to
   break after the open-paren.

 - Break before binary operators. This is a change in style that I will
   revert if there is any push back. This causes long statements to break
   before the binary operator not after it. This is the currently
   recommended practice.

 - Don't allow all arguments on the next line. This may cause a break
   after an open paren which is not desired.

 - Change AlignOperands to true (synonym for Align in v11+) to support
   clang-format v10.

Signed-off-by: Nathan Hjelm <hjelmn@google.com>
---
 .clang-format | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/.clang-format b/.clang-format
index 5a90a82b42a..e242ba7c113 100644
--- a/.clang-format
+++ b/.clang-format
@@ -36,15 +36,15 @@ AlignConsecutiveAssignments: false
 AlignConsecutiveBitFields: false
 AlignConsecutiveDeclarations: false
 AlignEscapedNewlines: Left
-AlignOperands:   Align
+AlignOperands: true
 AlignTrailingComments: true
-AllowAllArgumentsOnNextLine: true
+AllowAllArgumentsOnNextLine: false
 AllowAllConstructorInitializersOnNextLine: true
 AllowAllParametersOfDeclarationOnNextLine: true
 AllowShortEnumsOnASingleLine: true
 AllowShortBlocksOnASingleLine: Never
 AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: All
+AllowShortFunctionsOnASingleLine: None
 AllowShortLambdasOnASingleLine: All
 AllowShortIfStatementsOnASingleLine: Never
 AllowShortLoopsOnASingleLine: false
@@ -73,7 +73,7 @@ BraceWrapping:
   SplitEmptyFunction: true
   SplitEmptyRecord: true
   SplitEmptyNamespace: true
-BreakBeforeBinaryOperators: None
+BreakBeforeBinaryOperators: true
 BreakBeforeBraces: Custom
 BreakBeforeInheritanceComma: false
 BreakInheritanceList: BeforeColon
@@ -92,7 +92,6 @@ Cpp11BracedListStyle: true
 DeriveLineEnding: true
 DerivePointerAlignment: false
 DisableFormat:   false
-ExperimentalAutoDetectBinPacking: false
 FixNamespaceComments: true
 ForEachMacros:
   - foreach
@@ -139,8 +138,8 @@ ObjCBlockIndentWidth: 4
 ObjCBreakBeforeNestedBlockParam: true
 ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true
-PenaltyBreakAssignment: 300
-PenaltyBreakBeforeFirstCallParameter: 300
+PenaltyBreakAssignment: 250
+PenaltyBreakBeforeFirstCallParameter: 301
 PenaltyBreakComment: 300
 PenaltyBreakFirstLessLess: 120
 PenaltyBreakString: 1000