Apply clang-format

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

Author: BrickPi

.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]

clang-format.sh

@@ -240,10 +240,7 @@ static bool run_headless(fs::path const& root, memory::vector<memory::string>& m
 
 	SPDLOG_INFO("===== Setting up instance... =====");
 	ret &= game_manager.setup_instance(
-		game_manager.get_definition_manager()
-			.get_history_manager()
-			.get_bookmark_manager()
-			.get_front_bookmark()
+		game_manager.get_definition_manager().get_history_manager().get_bookmark_manager().get_front_bookmark()
 	);
 
 	print_memory_usage("Instance Setup");
@@ -267,17 +264,19 @@ 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_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);
 		};
 
-		CountryInstanceManager const& country_instance_manager = game_manager.get_instance_manager()->get_country_instance_manager();
+		CountryInstanceManager const& country_instance_manager =
+			game_manager.get_instance_manager()->get_country_instance_manager();
 
-		OpenVic::forwardable_span<const std::reference_wrapper<CountryInstance>> great_powers = country_instance_manager.get_great_powers();
+		OpenVic::forwardable_span<const std::reference_wrapper<CountryInstance>> great_powers =
+			country_instance_manager.get_great_powers();
 		print_ranking_list("Great Powers", great_powers);
 		print_ranking_list("Secondary Powers", country_instance_manager.get_secondary_powers());
 		print_ranking_list("All countries", country_instance_manager.get_total_ranking());

src/headless/main.cpp

@@ -19,7 +19,6 @@
 #include "openvic-simulation/population/PopManager.hpp"
 #include "openvic-simulation/research/ResearchManager.hpp"
 #include "openvic-simulation/scripts/ScriptManager.hpp"
-#include "openvic-simulation/interface/UI.hpp"
 
 namespace OpenVic {
 	struct DefinitionManager {

src/openvic-simulation/DefinitionManager.hpp

@@ -29,11 +29,10 @@ GameManager::elapsed_time_getter_func_t GameManager::get_elapsed_msec_time_callb
 
 GameManager::GameManager(
 	InstanceManager::gamestate_updated_func_t new_gamestate_updated_callback,
-	elapsed_time_getter_func_t new_get_elapsed_usec_callback,
-	elapsed_time_getter_func_t new_get_elapsed_msec_callback
-) : gamestate_updated_callback {
-		new_gamestate_updated_callback ? std::move(new_gamestate_updated_callback) : []() {}
-	}, definitions_loaded { false }, mod_descriptors_loaded { false } {
+	elapsed_time_getter_func_t new_get_elapsed_usec_callback, elapsed_time_getter_func_t new_get_elapsed_msec_callback
+)
+	: gamestate_updated_callback { new_gamestate_updated_callback ? std::move(new_gamestate_updated_callback) : []() {} },
+	  definitions_loaded { false }, mod_descriptors_loaded { false } {
 	if (new_get_elapsed_usec_callback) {
 		get_elapsed_usec_time_callback = { std::move(new_get_elapsed_usec_callback) };
 	}
@@ -83,11 +82,10 @@ bool GameManager::load_mods(memory::vector<memory::string> const& mods_to_find)
 	 * (Historical Project Mod 0.4.6 or HPM both valid, for example), and load them plus their dependencies.
 	 */
 	for (std::string_view requested_mod : mods_to_find) {
-		memory::vector<Mod>::const_iterator it = ranges::find_if(mod_manager.get_mods(),
-			[&requested_mod](Mod const& mod) -> bool {
+		memory::vector<Mod>::const_iterator it =
+			ranges::find_if(mod_manager.get_mods(), [&requested_mod](Mod const& mod) -> bool {
 				return mod.get_identifier() == requested_mod || mod.get_user_dir() == requested_mod;
-			}
-		);
+			});
 
 		if (it == mod_manager.get_mods().end()) {
 			spdlog::warn_s("Requested mod \"{}\" does not exist!", requested_mod);
@@ -97,7 +95,7 @@ bool GameManager::load_mods(memory::vector<memory::string> const& mods_to_find)
 
 		Mod const& mod = *it;
 		vector_ordered_set<std::reference_wrapper<const Mod>> dependencies = mod.generate_dependency_list(&ret);
-		if(!ret) {
+		if (!ret) {
 			continue;
 		}
 
@@ -177,11 +175,7 @@ bool GameManager::setup_instance(Bookmark const& bookmark) {
 
 	SPDLOG_INFO("Initialising new game instance.");
 
-	instance_manager.emplace(
-		game_rules_manager,
-		definition_manager,
-		gamestate_updated_callback
-	);
+	instance_manager.emplace(game_rules_manager, definition_manager, gamestate_updated_callback);
 
 	SPDLOG_INFO("Setting up new game instance.");
 

src/openvic-simulation/GameManager.cpp

@@ -3,16 +3,16 @@
 #include <optional>
 #include <string_view>
 
+#include <function2/function2.hpp>
+
 #include "openvic-simulation/DefinitionManager.hpp"
 #include "openvic-simulation/InstanceManager.hpp"
-#include "openvic-simulation/dataloader/ModManager.hpp"
 #include "openvic-simulation/dataloader/Dataloader.hpp"
-#include "openvic-simulation/misc/GameRulesManager.hpp"
+#include "openvic-simulation/dataloader/ModManager.hpp"
 #include "openvic-simulation/gen/commit_info.gen.hpp"
+#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>;
@@ -34,8 +34,7 @@ namespace OpenVic {
 	public:
 		GameManager(
 			InstanceManager::gamestate_updated_func_t new_gamestate_updated_callback,
-			elapsed_time_getter_func_t new_get_elapsed_usec_callback,
-			elapsed_time_getter_func_t new_get_elapsed_msec_callback
+			elapsed_time_getter_func_t new_get_elapsed_usec_callback, elapsed_time_getter_func_t new_get_elapsed_msec_callback
 		);
 		~GameManager();