Fixup format file for hopefully the last time in a while and re-format code

Summary: Fixup format file for hopefully the last time in a while and re-format code

Reviewed By: gkassabli

Differential Revision: D4044545

fbshipit-source-id: 60ebb73cfdd9dbc9b5fae62ddebf37e9b1e6eecf

format.sh

@@ -2,6 +2,7 @@
 
 clang-format \
   -style="{ \
+    AlignAfterOpenBracket: Align, \
     AlignEscapedNewlinesLeft: true, \
     AlignOperands: true, \
     AllowAllParametersOfDeclarationOnNextLine: false, \
@@ -20,8 +21,9 @@ clang-format \
     KeepEmptyLinesAtTheStartOfBlocks: false, \
     Language: Cpp, \
     PenaltyBreakBeforeFirstCallParameter: 100, \
-    PenaltyBreakString: 100, \
+    PenaltyBreakString: 1000, \
     PenaltyExcessCharacter: 100, \
+    PenaltyReturnTypeOnItsOwnLine: 100, \
     PointerAlignment: Right, \
     SortIncludes: true, \
     SpaceAfterCStyleCast: true, \