Add clang-format to pre-commit

Add type_safe to clang-format include category
Add function2 to clang-format include category

Author: Spartan322

.clang-format

@@ -90,7 +90,11 @@ IncludeCategories:
     Priority: 8
   - Regex: ^<spdlog/
     Priority: 9
-  - Regex: ^"openvic-simulation/
+  - Regex: ^<function2/
     Priority: 10
-  - Regex: .*
+  - Regex: ^<type_safe/
     Priority: 11
+  - Regex: ^"openvic-simulation/
+    Priority: 12
+  - Regex: .*
+    Priority: 13

.pre-commit-config.yaml

@@ -3,15 +3,15 @@ default_language_version:
 
 repos:
   # Waiting on Hop311 to approve clang-format
-  # - repo: https://github.com/pre-commit/mirrors-clang-format
-  #   rev: v19.1.3
-  #   hooks:
-  #     - id: clang-format
-  #       files: \.(c|h|cpp|hpp|inc)$
-  #       types_or: [text]
-  #       # exclude: |
-  #       #   (?x)^(
-  #       #   )
+  - repo: https://github.com/pre-commit/mirrors-clang-format
+    rev: v22.1.1
+    hooks:
+      - id: clang-format
+        files: \.(c|h|cpp|hpp|inc)$
+        types_or: [text]
+        # exclude: |
+        #   (?x)^(
+        #   )
 
   - repo: https://github.com/pocc/pre-commit-hooks
     rev: v1.3.5
@@ -49,4 +49,4 @@ repos:
         # exclude: |
         #   (?x)^(
         #   )
-        additional_dependencies: [tomli]
+        additional_dependencies: [tomli]

src/headless/main.cpp

@@ -264,9 +264,9 @@ static bool run_headless(fs::path const& root, memory::vector<memory::string>& m
 					"\n\t{} - Total #{} ({}), Prestige #{} ({}), Industry #{} ({}), Military #{} ({})", //
 					country, //
 					country.get_total_rank(), country.total_score.get_untracked().to_string(1), //
-					country.get_prestige_rank(), country.get_prestige_untracked().to_string(1), country.get_industrial_rank(),
-					country.get_industrial_power_untracked().to_string(1), country.get_military_rank(),
-					country.military_power.get_untracked().to_string(1)
+					country.get_prestige_rank(), country.get_prestige_untracked().to_string(1), //
+					country.get_industrial_rank(), country.get_industrial_power_untracked().to_string(1),
+					country.get_military_rank(), country.military_power.get_untracked().to_string(1)
 				);
 			}
 			SPDLOG_INFO("{}:{}", title, countries_str);

src/openvic-simulation/GameManager.hpp

@@ -3,6 +3,8 @@
 #include <optional>
 #include <string_view>
 
+#include <function2/function2.hpp>
+
 #include "openvic-simulation/DefinitionManager.hpp"
 #include "openvic-simulation/InstanceManager.hpp"
 #include "openvic-simulation/dataloader/Dataloader.hpp"
@@ -11,8 +13,6 @@
 #include "openvic-simulation/misc/GameRulesManager.hpp"
 #include "openvic-simulation/utility/Containers.hpp"
 
-#include <function2/function2.hpp>
-
 namespace OpenVic {
 	struct GameManager {
 		using elapsed_time_getter_func_t = fu2::function_base<true, true, fu2::capacity_none, false, false, uint64_t() const>;

src/openvic-simulation/InstanceManager.hpp

@@ -2,6 +2,8 @@
 
 #include <utility>
 
+#include <function2/function2.hpp>
+
 #include "openvic-simulation/console/ConsoleInstance.hpp"
 #include "openvic-simulation/country/CountryInstanceDeps.hpp"
 #include "openvic-simulation/country/CountryInstanceManager.hpp"
@@ -23,8 +25,6 @@
 #include "openvic-simulation/utility/Containers.hpp"
 #include "openvic-simulation/utility/ThreadPool.hpp"
 
-#include <function2/function2.hpp>
-
 namespace OpenVic {
 
 	struct DefinitionManager;

src/openvic-simulation/console/ConsoleInstance.cpp

@@ -188,8 +188,10 @@ std::optional<bool> ConsoleInstance::validate_boolean(std::string_view value_str
 	if (value_string == TRUE_VALUE || value_string == YES_VALUE || //
 		value_string == ONE_VALUE || value_string == ON_VALUE) {
 		return true;
-	} else if (value_string == FALSE_VALUE || value_string == NO_VALUE || //
-			   value_string == ZERO_VALUE || value_string == OFF_VALUE) {
+	} else if (
+		value_string == FALSE_VALUE || value_string == NO_VALUE || //
+		value_string == ZERO_VALUE || value_string == OFF_VALUE
+	) {
 		return false;
 	}
 

src/openvic-simulation/console/ConsoleInstance.hpp

@@ -7,14 +7,14 @@
 #include <fmt/color.h>
 #include <fmt/core.h>
 
+#include <function2/function2.hpp>
+
 #include "openvic-simulation/types/Colour.hpp"
 #include "openvic-simulation/types/Date.hpp"
 #include "openvic-simulation/types/OrderedContainers.hpp"
 #include "openvic-simulation/utility/Containers.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
 
-#include <function2/function2.hpp>
-
 namespace OpenVic {
 	struct ProvinceInstance;
 	struct CountryInstance;

src/openvic-simulation/core/Hash.hpp

@@ -53,7 +53,7 @@ namespace OpenVic {
 					}
 					s |= std::hash<Args> {}(args);
 				}(),
-				...
+				... //
 			);
 		}
 	}

src/openvic-simulation/country/CountryInstance.cpp

@@ -6,6 +6,8 @@
 #include <functional>
 #include <limits>
 
+#include <type_safe/strong_typedef.hpp>
+
 #include "openvic-simulation/core/Typedefs.hpp"
 #include "openvic-simulation/core/error/ErrorMacros.hpp"
 #include "openvic-simulation/country/CountryDefinition.hpp"
@@ -51,7 +53,6 @@
 
 #include "CountryInstanceDeps.hpp"
 #include "CountryInstanceManager.hpp"
-#include <type_safe/strong_typedef.hpp>
 
 using namespace OpenVic;
 

src/openvic-simulation/dataloader/Dataloader.hpp

@@ -6,13 +6,13 @@
 #include <openvic-dataloader/csv/Parser.hpp>
 #include <openvic-dataloader/v2script/Parser.hpp>
 
+#include <function2/function2.hpp>
+
 #include "openvic-simulation/core/template/Concepts.hpp"
 #include "openvic-simulation/dataloader/ModManager.hpp"
 #include "openvic-simulation/dataloader/NodeTools.hpp"
 #include "openvic-simulation/utility/Containers.hpp"
 
-#include <function2/function2.hpp>
-
 namespace OpenVic {
 	namespace fs = std::filesystem;