From 837629fbf68a6e2e2f13a87a89cc8c40e2158e07 Mon Sep 17 00:00:00 2001
From: proller <proller@github.com>
Date: Thu, 29 Nov 2018 15:44:57 +0300
Subject: [PATCH] Better .clang-format and uncrustify.cfg

---
 .clang-format  |  2 ++
 uncrustify.cfg | 10 ++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.clang-format b/.clang-format
index 7ddeba81288d..988c91c8c769 100644
--- a/.clang-format
+++ b/.clang-format
@@ -29,7 +29,9 @@ AllowShortFunctionsOnASingleLine: InlineOnly
 AlwaysBreakTemplateDeclarations: true
 IndentCaseLabels: true
 SpaceAfterTemplateKeyword: true
+SpaceBeforeCpp11BracedList: false
 SortIncludes: true
+IndentPPDirectives: AfterHash
 IncludeCategories:
   - Regex: '^<[a-z_]+>'
     Priority: 1
diff --git a/uncrustify.cfg b/uncrustify.cfg
index 702775788540..9fefc1270de1 100644
--- a/uncrustify.cfg
+++ b/uncrustify.cfg
@@ -19,6 +19,7 @@ utf8_force                      = true
 sp_arith                        = force
 sp_assign                       = force
 sp_cpp_lambda_assign            = remove
+sp_cpp_lambda_paren             = remove
 sp_assign_default               = force
 sp_enum_assign                  = force
 sp_enum_colon                   = force
@@ -129,7 +130,7 @@ sp_inside_newop_paren           = remove
 sp_before_tr_emb_cmt            = force
 indent_columns                  = 4
 indent_with_tabs                = 0
-indent_namespace                = true
+indent_namespace                = false
 indent_namespace_limit          = 100
 indent_class                    = true
 indent_ctor_init_leading        = 1
@@ -159,6 +160,7 @@ nl_enum_leave_one_liners        = true
 nl_getset_leave_one_liners      = true
 nl_func_leave_one_liners        = true
 nl_cpp_lambda_leave_one_liners  = true
+nl_cpp_ldef_brace               = add
 nl_if_leave_one_liners          = true
 nl_start_of_file                = remove
 nl_end_of_file                  = force
@@ -230,7 +232,7 @@ eat_blanks_after_open_brace     = true
 eat_blanks_before_close_brace   = true
 nl_remove_extra_newlines        = 1
 nl_after_return                 = true
-pos_constr_comma                = trail_force
+pos_constr_comma                = lead_break
 pos_constr_colon                = lead_force
 code_width                      = 160
 ls_func_split_full              = true
@@ -244,3 +246,7 @@ mod_full_brace_while            = remove
 mod_paren_on_return             = remove
 mod_remove_extra_semicolon      = true
 mod_remove_empty_return         = true
+align_func_params               = true
+align_func_params_thresh        = 140
+sp_inside_type_brace_init_lst   = remove
+nl_constr_init_args             = add