Update clang-format.

.clang-format

@@ -11,7 +11,7 @@ AllowAllParametersOfDeclarationOnNextLine: false
 AllowShortBlocksOnASingleLine: true
 AllowShortCaseLabelsOnASingleLine: true
 AllowShortFunctionsOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: true
+AllowShortIfStatementsOnASingleLine: Always
 AllowShortLoopsOnASingleLine: true
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
@@ -58,12 +58,24 @@ ForEachMacros:
     - BOOST_FOREACH
 IncludeBlocks:   Regroup
 IncludeCategories:
-  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
-    Priority:        2
-  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
-    Priority:        3
-  - Regex:           '.*'
+    - Regex:           '^(<winsock2.h>)'
+      Priority:        -3
+      SortPriority:    -4
+    - Regex:           '^(<windows.h>)'
+      Priority:        -3
+      SortPriority:    -3
+    - Regex:           '^(<aaruformat.h>)'
       Priority:        1
+      SortPriority:    -1
+    - Regex:           '^(<.*)'
+      Priority:        -2
+      SortPriority:    -2
+    - Regex:           '^("(win32|windows))'
+      Priority:        1
+      SortPriority:    -1
+    - Regex:           '.*'
+      Priority:        0
+      SortPriority:    0
 IncludeIsMainRegex: '(Test)?$'
 IndentCaseLabels: true
 IndentPPDirectives: None