Update editorconfig and clang-format.

.clang-format

@@ -1,94 +1,92 @@
----
+Language: Cpp
-Language:        Cpp
+# BasedOnStyle:  LLVM
-AccessModifierOffset: -2
+AccessModifierOffset: -4
 AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: true
+AlignArrayOfStructures: Right
-AlignConsecutiveDeclarations: true
+AlignConsecutiveAssignments: AcrossComments
-AlignEscapedNewlines: Right
+AlignConsecutiveBitFields: true
-AlignOperands:   true
+AlignConsecutiveDeclarations: AcrossComments
+AlignConsecutiveMacros: AcrossComments
+AlignConsecutiveShortCaseStatements:
+  Enabled: true
+  AcrossEmptyLines: false
+  AcrossComments: true
+  AlignCaseColons: false
+AlignEscapedNewlines: Left
+AlignOperands: true
 AlignTrailingComments: true
-AllowAllParametersOfDeclarationOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: true
+AllowShortBlocksOnASingleLine: Always
-AllowShortCaseLabelsOnASingleLine: true
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortEnumsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: Always
+AllowShortIfStatementsOnASingleLine: true
 AllowShortLoopsOnASingleLine: true
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
-BinPackArguments: false
+AlwaysBreakTemplateDeclarations: Yes
-BinPackParameters: false
+BinPackArguments: true
+BinPackParameters: true
+BitFieldColonSpacing: Both
 BraceWrapping:
-    AfterClass:      true
+  AfterCaseLabel: true
-    AfterControlStatement: true
+  AfterClass: false
-    AfterEnum:       true
+  AfterControlStatement: true
-    AfterFunction:   true
+  AfterEnum: true
-    AfterNamespace:  true
+  AfterFunction: true
-    AfterObjCDeclaration: true
+  AfterNamespace: true
-    AfterStruct:     true
+  AfterObjCDeclaration: false
-    AfterUnion:      true
+  AfterStruct: true
-    AfterExternBlock: true
+  AfterUnion: true
-    BeforeCatch:     true
+  AfterExternBlock: true
-    BeforeElse:      true
+  BeforeCatch: true
-    IndentBraces:    false
+  BeforeElse: true
-    SplitEmptyFunction: false
+  IndentBraces: false
-    SplitEmptyRecord: false
-    SplitEmptyNamespace: false
 BreakBeforeBinaryOperators: None
 BreakBeforeBraces: Allman
 BreakBeforeInheritanceComma: false
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: false
-BreakConstructorInitializers: BeforeColon
+ColumnLimit: 120
-BreakAfterJavaFieldAnnotations: false
+CommentPragmas: '^ IWYU pragma:'
-BreakStringLiterals: true
-ColumnLimit:     120
 CompactNamespaces: false
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
 DerivePointerAlignment: false
-DisableFormat:   false
+DisableFormat: false
 ExperimentalAutoDetectBinPacking: false
 FixNamespaceComments: true
 ForEachMacros:
-    - foreach
+  - foreach
-    - Q_FOREACH
+  - Q_FOREACH
-    - BOOST_FOREACH
+  - BOOST_FOREACH
-IncludeBlocks:   Regroup
+IncludeBlocks: Preserve
 IncludeCategories:
-    - Regex:           '^(<winsock2.h>)'
+  - Regex: '^<ext/.*\.h>'
-      Priority:        -3
+    Priority: 2
-      SortPriority:    -4
+  - Regex: '^<.*\.h>'
-    - Regex:           '^(<windows.h>)'
+    Priority: 1
-      Priority:        -3
+  - Regex: '^<.*'
-      SortPriority:    -3
+    Priority: 2
-    - Regex:           '^(<aaruformat.h>)'
+  - Regex: 'library\.h'
-      Priority:        1
+    Priority: 2
-      SortPriority:    -1
+  - Regex: '.*'
-    - Regex:           '^(<.*)'
+    Priority: 3
-      Priority:        -2
-      SortPriority:    -2
-    - Regex:           '^("(win32|windows))'
-      Priority:        1
-      SortPriority:    -1
-    - Regex:           '.*'
-      Priority:        0
-      SortPriority:    0
-IncludeIsMainRegex: '(Test)?$'
 IndentCaseLabels: true
-IndentPPDirectives: None
+IndentWidth: 4
-IndentWidth:     4
+IndentWrappedFunctionNames: false
-IndentWrappedFunctionNames: true
+JavaScriptQuotes: Leave
-JavaScriptQuotes: Double
 JavaScriptWrapImports: true
-KeepEmptyLinesAtTheStartOfBlocks: false
+KeepEmptyLinesAtTheStartOfBlocks: true
+LineEnding: LF
 MacroBlockBegin: ''
-MacroBlockEnd:   ''
+MacroBlockEnd: ''
 MaxEmptyLinesToKeep: 1
-NamespaceIndentation: All
+NamespaceIndentation: None
-ObjCBlockIndentWidth: 4
+ObjCBlockIndentWidth: 2
 ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true
 PenaltyBreakAssignment: 2
@@ -98,23 +96,21 @@ PenaltyBreakFirstLessLess: 120
 PenaltyBreakString: 1000
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 60
-PointerAlignment: Left
+PointerAlignment: Right
-ReflowComments:  true
+ReflowComments: true
-SortIncludes:    true
+SeparateDefinitionBlocks: Always
-SortUsingDeclarations: true
+SortIncludes: CaseInsensitive
 SpaceAfterCStyleCast: false
-SpaceAfterTemplateKeyword: false
+SpaceAfterTemplateKeyword: true
 SpaceBeforeAssignmentOperators: true
 SpaceBeforeParens: Never
 SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 1
+SpacesBeforeTrailingComments: 2
-SpacesInAngles:  false
+SpacesInAngles: false
-SpacesInContainerLiterals: false
+SpacesInContainerLiterals: true
 SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
-Standard:        Cpp11
+Standard: Latest
-TabWidth:        8
+TabWidth: 4
-UseTab:          Never
+UseTab: Never
-...
-