Include ordering bug

Author: calcmogul

wpiformat/wpiformat/includeorder.py

@@ -263,6 +263,7 @@ def header_sort(self, config_file, lines_list, file_name, start, end, ifdef_leve
 
         i = start
         while i < end:
+            print("lines_list[i]=", lines_list[i])
             if "#ifdef" in lines_list[i]:
                 ifdef_count = 1
                 for j in range(i + 1, end):

wpiformat/wpiformat/test/test_includeorder.py

@@ -950,4 +950,38 @@ def test_includeorder():
     )
     test.add_latest_input_as_output(True)
 
+    test.add_input(
+        "./Test.h",
+        "#ifdef __cplusplus1"
+        + os.linesep
+        + '#include "cscore_oo.h"'
+        + os.linesep
+        + "#endif"
+        + os.linesep
+        + os.linesep
+        + "#ifdef __cplusplus2"
+        + os.linesep
+        + 'extern "C" {'
+        + os.linesep
+        + "#endif"
+        + os.linesep,
+    )
+    test.add_output(
+        "#ifdef __cplusplus1"
+        + os.linesep
+        + 'extern "C" {'
+        + os.linesep
+        + "#endif"
+        + os.linesep
+        + os.linesep
+        + "#ifdef __cplusplus2"
+        + os.linesep
+        + '#include "cscore_oo.h"'
+        + os.linesep
+        + "#endif"
+        + os.linesep,
+        True,
+        True,
+    )
+
     test.run(OutputType.FILE)