[build] Use clang-format's include sorting

Author: calcmogul

.clang-format

@@ -104,25 +104,52 @@ ForEachMacros:
   - BOOST_FOREACH
 IfMacros:
   - KJ_IF_MAYBE
-IncludeBlocks:   Regroup
+IncludeBlocks: Regroup
 IncludeCategories:
-  - Regex:           '^<ext/.*\.h>'
-    Priority:        2
-    SortPriority:    0
-    CaseSensitive:   false
-  - Regex:           '^<.*\.h>'
-    Priority:        1
-    SortPriority:    0
-    CaseSensitive:   false
-  - Regex:           '^<.*'
-    Priority:        2
-    SortPriority:    0
-    CaseSensitive:   false
-  - Regex:           '.*'
-    Priority:        3
-    SortPriority:    0
-    CaseSensitive:   false
-IncludeIsMainRegex: '([-_](test|unittest))?$'
+  # C standard library headers
+  #
+  # https://en.cppreference.com/w/cpp/header:
+  #  * C compatibility headers
+  #  * Special C compatibility headers
+  #  * Empty C headers
+  #  * Meaningless C headers
+  #  * Unsupported C headers
+  - Regex:        '^<(assert\.h|ctype\.h|errno\.h|fenv\.h|float\.h|inttypes\.h|limits\.h|locale\.h|math\.h|setjmp\.h|signal\.h|stdarg\.h|stddef\.h|stdint\.h|stdio\.h|stdlib\.h|string\.h|time\.h|uchar\.h|wchar\.h|wctype\.h|stdatomic\.h|ccomplex|complex\.h|ctgmath|tgmath\.h|ciso646|cstdalign|cstdbool|iso646\.h|stdalign\.h|stdbool\.h|stdatomic\.h|stdnoreturn\.h|threads\.h)>'
+    Priority:     1
+    SortPriority: 0
+  # Linux system headers
+  - Regex:        '^<((arpa\/|linux\/|net/|netinet\/|sys\/).*|arm_neon\.h|dirent\.h|dlfcn\.h|fcntl\.h|ifaddrs\.h|jni\.h|libgen\.h|poll\.h|spawn\.h|termios\.h|unistd\.h)>'
+    Priority:     1
+    SortPriority: 1
+  # winsock2.h
+  - Regex:        '^<winsock2\.h>'
+    Priority:     1
+    SortPriority: 2
+  # windows.h
+  - Regex:        '^<windows.\h>'
+    Priority:     1
+    SortPriority: 3
+  # Windows def.h headers
+  - Regex:        '^<(comdef\.h|ws2def\.h|ws2ipdef\.h)>'
+    Priority:     1
+    SortPriority: 4
+  # Windows system headers
+  - Regex:        '^<(dbghelp\.h|dbt\.h|delayimp\.h|dshow\.h|io\.h|iphlpapi\.h|ks\.h|ksmedia\.h|memoryapi\.h|mfapi\.h|mferror\.h|mfidl\.h|mfreadwrite\.h|netioapi\.h|shellapi\.h|shlwapi\.h|sysinfoapi\.h|windns\.h|windowsx\.h|ws2tcpip\.h)>'
+    Priority:     1
+    SortPriority: 5
+  # C++ standard library headers (lowercase and underscores with no .h suffix)
+  - Regex:        '^<([a-z_]+|cxxabi\.h)>'
+    Priority:     2
+    SortPriority: 6
+  # Other library headers (angle brackets)
+  - Regex:        '^<.*'
+    Priority:     3
+    SortPriority: 7
+  # Project headers (double quotes)
+  - Regex:        '^".*'
+    Priority:     4
+    SortPriority: 8
+IncludeIsMainRegex: '(Test|_bench|_test)?$'
 IncludeIsMainSourceRegex: ''
 IndentAccessModifiers: false
 IndentCaseBlocks: false
@@ -213,7 +240,7 @@ RequiresClausePosition: OwnLine
 RequiresExpressionIndentation: OuterScope
 SeparateDefinitionBlocks: Leave
 ShortNamespaceLines: 1
-SortIncludes:    false
+SortIncludes: true
 SortJavaStaticImport: Before
 SortUsingDeclarations: LexicographicNumeric
 SpaceAfterCStyleCast: false

.styleguide

@@ -35,21 +35,3 @@ generatedFileExclude {
 repoRootNameOverride {
   wpilib
 }
-
-includeOtherLibs {
-  ^Eigen/
-  ^cameraserver/
-  ^cscore
-  ^fmt/
-  ^glass/
-  ^gtest/
-  ^imgui
-  ^implot
-  ^mockdata/
-  ^opencv2/
-  ^support/
-  ^units/
-  ^unsupported/
-  ^upb/
-  ^vision/
-}

apriltag/src/main/native/cpp/jni/AprilTagJNI.cpp

@@ -8,13 +8,12 @@
 #include <cstring>
 
 #define WPI_RAWFRAME_JNI
-#include "wpi/util/RawFrame.h"
-#include "wpi/util/jni_util.hpp"
-
 #include "org_wpilib_vision_apriltag_jni_AprilTagJNI.h"
 #include "wpi/apriltag/AprilTag.hpp"
 #include "wpi/apriltag/AprilTagDetector.hpp"
 #include "wpi/apriltag/AprilTagPoseEstimator.hpp"
+#include "wpi/util/RawFrame.h"
+#include "wpi/util/jni_util.hpp"
 
 using namespace wpi::apriltag;
 using namespace wpi::util::java;

apriltag/src/test/native/cpp/AprilTagDetectorTest.cpp

@@ -2,10 +2,10 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include <gtest/gtest.h>
-
 #include "wpi/apriltag/AprilTagDetector.hpp"
 
+#include <gtest/gtest.h>
+
 using namespace wpi::apriltag;
 
 TEST(AprilTagDetectorTest, ConfigDefaults) {

cameraserver/.styleguide

@@ -12,13 +12,6 @@ repoRootNameOverride {
   cameraserver
 }
 
-includeOtherLibs {
-  ^fmt/
-  ^gtest/
-  ^opencv2/
-  ^support/
-}
-
 includeGuardRoots {
   cameraserver/src/main/native/include/
 }

commandsv2/.styleguide

@@ -15,14 +15,3 @@ repoRootNameOverride {
 generatedFileExclude {
   commandsv2/src/generated/
 }
-
-includeOtherLibs {
-  ^gtest/
-  ^imgui
-  ^mockdata/
-  ^networktables/
-  ^opencv2/
-  ^support/
-  ^units/
-  ^vision/
-}

commandsv2/src/main/native/cpp/frc2/command/ProxyCommand.cpp

@@ -4,11 +4,11 @@
 
 #include "wpi/commands2/ProxyCommand.hpp"
 
-#include <fmt/format.h>
-
 #include <string>
 #include <utility>
 
+#include <fmt/format.h>
+
 #include "wpi/util/deprecated.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
 

commandsv2/src/test/native/cpp/wpi/command/CommandPtrTest.cpp

@@ -2,10 +2,11 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include "wpi/commands2/CommandPtr.hpp"
+
 #include <utility>
 
 #include "CommandTestBase.hpp"
-#include "wpi/commands2/CommandPtr.hpp"
 #include "wpi/commands2/CommandScheduler.hpp"
 #include "wpi/commands2/Commands.hpp"
 #include "wpi/system/Errors.hpp"

commandsv2/src/test/native/cpp/wpi/command/ConditionalCommandTest.cpp

@@ -2,12 +2,13 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include "wpi/commands2/ConditionalCommand.hpp"
+
 #include <memory>
 #include <utility>
 
 #include "CommandTestBase.hpp"
 #include "wpi/commands2/Commands.hpp"
-#include "wpi/commands2/ConditionalCommand.hpp"
 #include "wpi/commands2/InstantCommand.hpp"
 
 using namespace wpi::cmd;

commandsv2/src/test/native/cpp/wpi/command/DeferredCommandTest.cpp

@@ -2,9 +2,10 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include "wpi/commands2/DeferredCommand.hpp"
+
 #include "CommandTestBase.hpp"
 #include "wpi/commands2/Commands.hpp"
-#include "wpi/commands2/DeferredCommand.hpp"
 #include "wpi/commands2/FunctionalCommand.hpp"
 
 using namespace wpi::cmd;