Update clang-format

Author: foonathan

.clang-format

@@ -2,10 +2,10 @@ AccessModifierOffset: -4
 AlignAfterOpenBracket: Align
 AlignConsecutiveAssignments: true
 AlignConsecutiveDeclarations: true
-AlignEscapedNewlinesLeft: false
+AlignEscapedNewlinesLeft: Right
 AlignOperands: true
 AlignTrailingComments: true
-AllowAllParametersOfDeclarationOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: false
 AllowShortBlocksOnASingleLine: false
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: Empty
@@ -16,28 +16,50 @@ AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: true
 BinPackArguments: true
 BinPackParameters: true
-BreakBeforeBinaryOperators: NonAssignment
-BreakBeforeBraces: Allman
-BreakBeforeTernaryOperators: false
-BreakConstructorInitializersBeforeComma: false
-ConstructorInitializerAllOnOneLineOrOnePerLine: true
+BreakBeforeBraces: Custom
+BraceWrapping:
+    AfterClass: true
+    AfterControlStatement: true
+    AfterEnum: true
+    AfterFunction: true
+    AfterNamespace: true
+    AfterStruct: true
+    AfterUnion: true
+    AfterExternBlock: true
+    BeforeCatch: true
+    BeforeElse: true
+    SplitEmptyFunction: false
+    SplitEmptyRecord: false
+    SplitEmptyNamespace: false
+BreakBeforeBinaryOperators: All
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeColon
+BreakStringLiterals: false
+ColumnLimit: 100
+CompactNamespaces: true
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: 0
 ContinuationIndentWidth: 4
-ColumnLimit: 100
 Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+FixNamespaceComments: true
+IncludeBlocks: Preserve
 IndentCaseLabels: false
+IndentPPDirectives: AfterHash
 IndentWidth: 4
 IndentWrappedFunctionNames: true
-Language: Cpp
 KeepEmptyLinesAtTheStartOfBlocks: false
+Language: Cpp
 MaxEmptyLinesToKeep: 1
-NamespaceIndentation: All
+NamespaceIndentation: Inner
 PenaltyBreakBeforeFirstCallParameter: 19937
 PenaltyReturnTypeOnItsOwnLine: 19937
 PointerAlignment: Left
-ReflowComments: false
-SortIncludes: false
+ReflowComments: true
+SortIncludes: true
+SortUsingDeclarations: true
 SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: true
 SpaceBeforeAssignmentOperators: true
 SpaceBeforeParens: ControlStatements
 SpaceInEmptyParentheses: false

example/comparison.cpp

@@ -5,7 +5,8 @@
 /// \file
 /// Generate equality comparisons.
 ///
-/// Given an input file, it will generate comparison operators for each class that has the [[generate::comparison]] attribute.
+/// Given an input file, it will generate comparison operators for each class that has the
+/// [[generate::comparison]] attribute.
 
 #include <algorithm>
 #include <iostream>
@@ -94,8 +95,8 @@ void generate_comparison(const cppast::cpp_file& file)
                       {
                           // it is a new class
                           auto& class_ = static_cast<const cppast::cpp_class&>(e);
-                          auto& attribute =
-                              cppast::has_attribute(e, "generate::comparison").value();
+                          auto& attribute
+                              = cppast::has_attribute(e, "generate::comparison").value();
 
                           // generate requested operators
                           if (attribute.arguments())

example/enum_category.cpp

@@ -5,8 +5,9 @@
 /// \file
 /// Generates enum category functions.
 ///
-/// Given an input file, it will generate definitions for functions marked with [[generate::enum_category(name)]].
-/// The function takes an enumerator and will return true if it is marked with the same category.
+/// Given an input file, it will generate definitions for functions marked with
+/// [[generate::enum_category(name)]]. The function takes an enumerator and will return true if it
+/// is marked with the same category.
 
 #include <algorithm>
 #include <cassert>
@@ -24,10 +25,10 @@ bool is_category(const cppast::cpp_enum_value& e, const std::string& name)
     if (auto attr = cppast::has_attribute(e, "generate::enum_category"))
     {
         // ... by looking for the token
-        auto iter =
-            std::find_if(attr.value().arguments().value().begin(),
-                         attr.value().arguments().value().end(),
-                         [&](const cppast::cpp_token& tok) { return tok.spelling == name; });
+        auto iter
+            = std::find_if(attr.value().arguments().value().begin(),
+                           attr.value().arguments().value().end(),
+                           [&](const cppast::cpp_token& tok) { return tok.spelling == name; });
         return iter != attr.value().arguments().value().end();
     }
     else
@@ -42,8 +43,10 @@ const cppast::cpp_enum& get_enum(const cppast::cpp_entity_index&       index,
     // it is an enum
     assert(param_type.kind() == cppast::cpp_type_kind::user_defined_t);
     // lookup definition
-    auto& definition =
-        static_cast<const cppast::cpp_user_defined_type&>(param_type).entity().get(index)[0u].get();
+    auto& definition = static_cast<const cppast::cpp_user_defined_type&>(param_type)
+                           .entity()
+                           .get(index)[0u]
+                           .get();
 
     assert(definition.kind() == cppast::cpp_entity_kind::enum_t);
     return static_cast<const cppast::cpp_enum&>(definition);

example/enum_to_string.cpp

@@ -5,7 +5,8 @@
 /// \file
 /// Generates enum `to_string()` code.
 ///
-/// Given an input file, it will generate a to_string() function for all enums marked with [[generate::to_string]].
+/// Given an input file, it will generate a to_string() function for all enums marked with
+/// [[generate::to_string]].
 
 #include <iostream>
 
@@ -43,8 +44,8 @@ void generate_to_string(const cppast::cpp_file& file)
                                         << ":\n";
 
                               // attribute can be used to override the string
-                              if (auto attr =
-                                      cppast::has_attribute(enumerator, "generate::to_string"))
+                              if (auto attr
+                                  = cppast::has_attribute(enumerator, "generate::to_string"))
                                   std::cout << "    return "
                                             << attr.value().arguments().value().as_string()
                                             << ";\n";

example/serialization.cpp

@@ -5,7 +5,8 @@
 /// \file
 /// Serialization code generation.
 ///
-/// Given an input file, it will generate a serialize() function for each class marked with [[generate::serialize]].
+/// Given an input file, it will generate a serialize() function for each class marked with
+/// [[generate::serialize]].
 
 #include <iostream>