Merge pull request #533 from openmultiplayer/amir/fix-formatting

AmyrAhmady · web-flow · commit 3fb39da73224 · 2022-12-14T19:27:53.000+03:30
Fix formatting so CI passes now
diff --git a/.clang-format b/.clang-format
@@ -8,7 +8,7 @@ AlignConsecutiveAssignments: false
 AlignConsecutiveBitFields: false
 AlignConsecutiveDeclarations: false
 AlignEscapedNewlines: Right
-AlignOperands:   DontAlign
+AlignOperands: DontAlign
 AlignTrailingComments: false
 AllowAllArgumentsOnNextLine: true
 AllowAllConstructorInitializersOnNextLine: true
@@ -17,7 +17,7 @@ AllowShortEnumsOnASingleLine: true
 AllowShortBlocksOnASingleLine: Empty
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: All
-AllowShortLambdasOnASingleLine: All
+AllowShortLambdasOnASingleLine: None
 AllowShortIfStatementsOnASingleLine: Never
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterDefinitionReturnType: None
diff --git a/SDK/include/Impl/events_impl.hpp b/SDK/include/Impl/events_impl.hpp
@@ -152,7 +152,9 @@ struct DefaultEventDispatcher final : public IEventDispatcher<EventHandlerType>,
 		// `anyTrue` should still CALL them call, don't short-circuit.
 		bool ret = false;
 		std::for_each(handlers.begin(), handlers.end(), typename Storage::template Func<bool, Fn>([&fn, &ret]()
-															{ ret = fn() || ret; }));
+															{
+																ret = fn() || ret;
+															}));
 		return ret;
 	}
 
@@ -167,7 +169,9 @@ struct DefaultEventDispatcher final : public IEventDispatcher<EventHandlerType>,
 	{
 		bool ret = true;
 		std::for_each(handlers.begin(), handlers.end(), typename Storage::template Func<bool, Fn>([&fn, &ret]()
-															{ ret = fn() && ret; }));
+															{
+																ret = fn() && ret;
+															}));
 		return ret;
 	}
 
diff --git a/SDK/include/anim.hpp b/SDK/include/anim.hpp
@@ -2005,15 +2005,19 @@ inline bool animationNameValid(StringView lib, StringView name)
 	Impl::String fullName(lib);
 	fullName += ':' + Impl::String(name);
 	std::transform(fullName.begin(), fullName.end(), fullName.begin(), [](unsigned char c)
-		{ return std::toupper(c); });
+		{
+			return std::toupper(c);
+		});
 	return AnimationNamesLookup.valid.find(fullName) != AnimationNamesLookup.valid.end();
 }
 
 inline bool animationLibraryValid(StringView lib, bool v1_0 = true)
 {
 	Impl::String fullName(lib);
 	std::transform(fullName.begin(), fullName.end(), fullName.begin(), [](unsigned char c)
-		{ return std::toupper(c); });
+		{
+			return std::toupper(c);
+		});
 	if (AnimationLibraryLookup.valid.find(fullName) != AnimationLibraryLookup.valid.end())
 	{
 		return true;
diff --git a/Server/Components/Console/commands.cpp b/Server/Components/Console/commands.cpp
@@ -336,7 +336,9 @@ ADD_CONSOLE_CMD(rcon_password, [](const String& params, const ConsoleCommandSend
 	});
 
 ADD_CONSOLE_CMD(echo, [](const String& params, const ConsoleCommandSenderData& sender, ConsoleComponent& console, ICore* core)
-	{ console.sendMessage(sender, params); });
+	{
+		console.sendMessage(sender, params);
+	});
 
 ADD_CONSOLE_CMD(messageslimit, [](const String& params, const ConsoleCommandSenderData& sender, ConsoleComponent& console, ICore* core)
 	{
diff --git a/Server/Components/CustomModels/models.cpp b/Server/Components/CustomModels/models.cpp
@@ -684,7 +684,9 @@ class CustomModelsComponent final : public ICustomModelsComponent, public Player
 	bool getCustomModelPath(int32_t modelId, StringView& dffPath, StringView& txdPath) const override
 	{
 		auto model = std::find_if(storage.begin(), storage.end(), [&](const auto& model)
-			{ return model->getId() == modelId; });
+			{
+				return model->getId() == modelId;
+			});
 
 		if (model != storage.end())
 		{
diff --git a/Server/Components/LegacyConfig/config_main.cpp b/Server/Components/LegacyConfig/config_main.cpp
@@ -216,7 +216,9 @@ class LegacyConfigComponent final : public ILegacyConfigComponent, public Consol
 		// Try all variants from most specific to least specific.
 		Impl::String lower(right);
 		std::transform(lower.begin(), lower.end(), lower.begin(), [](unsigned char c)
-			{ return std::tolower(c); });
+			{
+				return std::tolower(c);
+			});
 		if (lower == "true")
 		{
 			config.setBool(name, true);
@@ -334,7 +336,9 @@ class LegacyConfigComponent final : public ILegacyConfigComponent, public Consol
 			{
 				Impl::String lower(right);
 				std::transform(lower.begin(), lower.end(), lower.begin(), [](unsigned char c)
-					{ return std::tolower(c); });
+					{
+						return std::tolower(c);
+					});
 				if (lower == "true" || lower == "1")
 				{
 					config.setBool(dictIt->second, true);
diff --git a/Server/Components/Pawn/Manager/Manager.hpp b/Server/Components/Pawn/Manager/Manager.hpp
@@ -102,7 +102,9 @@ class PawnManager : public Singleton<PawnManager>
 	DynamicArray<Pair<String, std::unique_ptr<PawnScript>>>::const_iterator const findScript(String const& name) const
 	{
 		return std::find_if(scripts_.begin(), scripts_.end(), [name](Pair<String, std::unique_ptr<PawnScript>> const& it)
-			{ return it.first == name; });
+			{
+				return it.first == name;
+			});
 	}
 
 public:
diff --git a/Server/Components/Pawn/Scripting/Types.hpp b/Server/Components/Pawn/Scripting/Types.hpp
@@ -853,7 +853,7 @@ class ParamCast<DynamicArray<T> const&>
 	ParamCast(ParamCast<DynamicArray<T> const&> const&) = delete;
 	ParamCast(ParamCast<DynamicArray<T> const&>&&) = delete;
 
-	operator DynamicArray<T> const &()
+	operator DynamicArray<T> const&()
 	{
 		return value_;
 	}
diff --git a/Server/Components/Pawn/Scripting/Vehicle/Natives.cpp b/Server/Components/Pawn/Scripting/Vehicle/Natives.cpp
@@ -416,7 +416,9 @@ SCRIPT_API(GetVehicleModelsUsed, int())
 	auto& vehicle_models = PawnManager::Get()->vehicles->models();
 
 	return std::count_if(vehicle_models.begin(), vehicle_models.end(), [](uint8_t model_instances)
-		{ return model_instances > 0; });
+		{
+			return model_instances > 0;
+		});
 }
 
 SCRIPT_API(GetVehiclePaintjob, int(IVehicle& vehicle))
diff --git a/Server/Components/Vehicles/vehicle.cpp b/Server/Components/Vehicles/vehicle.cpp
@@ -190,7 +190,9 @@ bool Vehicle::updateFromDriverSync(const VehicleDriverSyncPacket& vehicleSync, I
 		sirenState = vehicleSync.Siren;
 		params.siren = sirenState != 0;
 		static_cast<DefaultEventDispatcher<VehicleEventHandler>&>(pool->getEventDispatcher()).stopAtFalse([&player, this](VehicleEventHandler* handler)
-			{ return handler->onVehicleSirenStateChange(player, *this, sirenState); });
+			{
+				return handler->onVehicleSirenStateChange(player, *this, sirenState);
+			});
 	}
 
 	if (driver != &player)
@@ -254,7 +256,9 @@ bool Vehicle::updateFromUnoccupied(const VehicleUnoccupiedSyncPacket& unoccupied
 
 	UnoccupiedVehicleUpdate data = UnoccupiedVehicleUpdate { unoccupiedSync.SeatID, unoccupiedSync.Position, unoccupiedSync.Velocity };
 	bool allowed = static_cast<DefaultEventDispatcher<VehicleEventHandler>&>(pool->getEventDispatcher()).stopAtFalse([&player, this, &data](VehicleEventHandler* handler)
-		{ return handler->onUnoccupiedVehicleUpdate(*this, player, data); });
+		{
+			return handler->onUnoccupiedVehicleUpdate(*this, player, data);
+		});
 
 	if (cab && !towing)
 	{
@@ -325,7 +329,9 @@ bool Vehicle::updateFromTrailerSync(const VehicleTrailerSyncPacket& trailerSync,
 	*/
 
 	bool allowed = static_cast<DefaultEventDispatcher<VehicleEventHandler>&>(pool->getEventDispatcher()).stopAtFalse([&player, this](VehicleEventHandler* handler)
-		{ return handler->onTrailerUpdate(player, *this); });
+		{
+			return handler->onTrailerUpdate(player, *this);
+		});
 	return allowed;
 }
 
diff --git a/Server/Components/Vehicles/vehicles_impl.hpp b/Server/Components/Vehicles/vehicles_impl.hpp
@@ -231,7 +231,9 @@ class VehiclesComponent final : public IVehiclesComponent, public CoreEventHandl
 				}
 
 				self.eventDispatcher.all([&peer, scmEvent](VehicleEventHandler* handler)
-					{ handler->onEnterExitModShop(peer, scmEvent.Arg1, scmEvent.Arg2); });
+					{
+						handler->onEnterExitModShop(peer, scmEvent.Arg1, scmEvent.Arg2);
+					});
 
 				NetCode::RPC::SCMEvent enterExitRPC;
 				enterExitRPC.PlayerID = peer.getID();
diff --git a/Server/Source/core_impl.hpp b/Server/Source/core_impl.hpp
@@ -134,7 +134,9 @@ struct adl_serializer<std::variant<Args...>>
 	static void to_json(ordered_json& j, std::variant<Args...> const& v)
 	{
 		std::visit([&](auto&& value)
-			{ j = std::forward<decltype(value)>(value); },
+			{
+				j = std::forward<decltype(value)>(value);
+			},
 			v);
 	}
 };
@@ -468,7 +470,9 @@ class Config final : public IEarlyConfig
 	void removeBan(const BanEntry& entry) override
 	{
 		auto ban_itr = std::find_if(bans.begin(), bans.end(), [&](const BanEntry& ban)
-			{ return ban.address == entry.address; });
+			{
+				return ban.address == entry.address;
+			});
 
 		if (ban_itr != bans.end())
 		{
@@ -532,7 +536,9 @@ class Config final : public IEarlyConfig
 	bool isBanned(const BanEntry& entry) const override
 	{
 		return std::any_of(bans.begin(), bans.end(), [&](const BanEntry& ban)
-			{ return entry.address == ban.address; });
+			{
+				return entry.address == ban.address;
+			});
 	}
 
 	size_t getBansCount() const override
diff --git a/Server/Source/player_pool.hpp b/Server/Source/player_pool.hpp
@@ -584,7 +584,9 @@ struct PlayerPool final : public IPlayerPool, public NetworkEventHandler, public
 			if (filteredMessage.size() > 1)
 			{
 				bool send = self.eventDispatcher.stopAtTrue([&peer, filteredMessage](PlayerEventHandler* handler)
-					{ return handler->onPlayerCommandText(peer, filteredMessage); });
+					{
+						return handler->onPlayerCommandText(peer, filteredMessage);
+					});
 
 				if (!send)
 				{
@@ -707,7 +709,9 @@ struct PlayerPool final : public IPlayerPool, public NetworkEventHandler, public
 				const uint32_t oldKeys = player.keys_.keys;
 				player.keys_.keys = newKeys;
 				self.eventDispatcher.all([&peer, oldKeys, newKeys](PlayerEventHandler* handler)
-					{ handler->onPlayerKeyStateChange(peer, newKeys, oldKeys); });
+					{
+						handler->onPlayerKeyStateChange(peer, newKeys, oldKeys);
+					});
 			}
 
 			player.setState(PlayerState_OnFoot);
@@ -778,13 +782,17 @@ struct PlayerPool final : public IPlayerPool, public NetworkEventHandler, public
 				const uint32_t oldKeys = player.keys_.keys;
 				player.keys_.keys = newKeys;
 				self.eventDispatcher.all([&peer, oldKeys, newKeys](PlayerEventHandler* handler)
-					{ handler->onPlayerKeyStateChange(peer, newKeys, oldKeys); });
+					{
+						handler->onPlayerKeyStateChange(peer, newKeys, oldKeys);
+					});
 			}
 			player.setState(PlayerState_Spectating);
 
 			TimePoint now = Time::now();
 			if (self.playerUpdateDispatcher.stopAtFalse([&peer, now](PlayerUpdateEventHandler* handler)
-					{ return handler->onUpdate(peer, now); }))
+					{
+						return handler->onUpdate(peer, now);
+					}))
 			{
 			}
 			return true;
@@ -1098,7 +1106,9 @@ struct PlayerPool final : public IPlayerPool, public NetworkEventHandler, public
 				const uint32_t oldKeys = player.keys_.keys;
 				player.keys_.keys = newKeys;
 				self.eventDispatcher.all([&peer, oldKeys, newKeys](PlayerEventHandler* handler)
-					{ handler->onPlayerKeyStateChange(peer, newKeys, oldKeys); });
+					{
+						handler->onPlayerKeyStateChange(peer, newKeys, oldKeys);
+					});
 			}
 			player.setState(PlayerState_Driver);
 
@@ -1346,7 +1356,9 @@ struct PlayerPool final : public IPlayerPool, public NetworkEventHandler, public
 				const uint32_t oldKeys = player.keys_.keys;
 				player.keys_.keys = newKeys;
 				self.eventDispatcher.all([&peer, oldKeys, newKeys](PlayerEventHandler* handler)
-					{ handler->onPlayerKeyStateChange(peer, newKeys, oldKeys); });
+					{
+						handler->onPlayerKeyStateChange(peer, newKeys, oldKeys);
+					});
 			}
 			player.setState(PlayerState_Passenger);
 

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,9 @@ struct DefaultEventDispatcher final : public IEventDispatcher<EventHandlerType>,`
`152`	`152`	// `anyTrue` should still CALL them call, don't short-circuit.
`153`	`153`	`bool ret = false;`
`154`	`154`	`std::for_each(handlers.begin(), handlers.end(), typename Storage::template Func<bool, Fn>([&fn, &ret]()`
`155`		`- { ret = fn() \|\| ret; }));`
	`155`	`+ {`
	`156`	`+ ret = fn() \|\| ret;`
	`157`	`+ }));`
`156`	`158`	`return ret;`
`157`	`159`	`}`
`158`	`160`
`@@ -167,7 +169,9 @@ struct DefaultEventDispatcher final : public IEventDispatcher<EventHandlerType>,`
`167`	`169`	`{`
`168`	`170`	`bool ret = true;`
`169`	`171`	`std::for_each(handlers.begin(), handlers.end(), typename Storage::template Func<bool, Fn>([&fn, &ret]()`
`170`		`- { ret = fn() && ret; }));`
	`172`	`+ {`
	`173`	`+ ret = fn() && ret;`
	`174`	`+ }));`
`171`	`175`	`return ret;`
`172`	`176`	`}`
`173`	`177`
Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,9 @@ ADD_CONSOLE_CMD(rcon_password, [](const String& params, const ConsoleCommandSend`
`336`	`336`	`});`
`337`	`337`
`338`	`338`	`ADD_CONSOLE_CMD(echo, [](const String& params, const ConsoleCommandSenderData& sender, ConsoleComponent& console, ICore* core)`
`339`		`- { console.sendMessage(sender, params); });`
	`339`	`+ {`
	`340`	`+ console.sendMessage(sender, params);`
	`341`	`+ });`
`340`	`342`
`341`	`343`	`ADD_CONSOLE_CMD(messageslimit, [](const String& params, const ConsoleCommandSenderData& sender, ConsoleComponent& console, ICore* core)`
`342`	`344`	`{`
Original file line number	Diff line number	Diff line change
`@@ -684,7 +684,9 @@ class CustomModelsComponent final : public ICustomModelsComponent, public Player`
`684`	`684`	`bool getCustomModelPath(int32_t modelId, StringView& dffPath, StringView& txdPath) const override`
`685`	`685`	`{`
`686`	`686`	`auto model = std::find_if(storage.begin(), storage.end(), [&](const auto& model)`
`687`		`- { return model->getId() == modelId; });`
	`687`	`+ {`
	`688`	`+ return model->getId() == modelId;`
	`689`	`+ });`
`688`	`690`
`689`	`691`	`if (model != storage.end())`
`690`	`692`	`{`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,9 @@ class PawnManager : public Singleton<PawnManager>`
`102`	`102`	`DynamicArray<Pair<String, std::unique_ptr<PawnScript>>>::const_iterator const findScript(String const& name) const`
`103`	`103`	`{`
`104`	`104`	`return std::find_if(scripts_.begin(), scripts_.end(), [name](Pair<String, std::unique_ptr<PawnScript>> const& it)`
`105`		`- { return it.first == name; });`
	`105`	`+ {`
	`106`	`+ return it.first == name;`
	`107`	`+ });`
`106`	`108`	`}`
`107`	`109`
`108`	`110`	`public:`
Original file line number	Diff line number	Diff line change
`@@ -853,7 +853,7 @@ class ParamCast<DynamicArray<T> const&>`
`853`	`853`	`ParamCast(ParamCast<DynamicArray<T> const&> const&) = delete;`
`854`	`854`	`ParamCast(ParamCast<DynamicArray<T> const&>&&) = delete;`
`855`	`855`
`856`		`- operator DynamicArray<T> const &()`
	`856`	`+ operator DynamicArray<T> const&()`
`857`	`857`	`{`
`858`	`858`	`return value_;`
`859`	`859`	`}`
Original file line number	Diff line number	Diff line change
`@@ -416,7 +416,9 @@ SCRIPT_API(GetVehicleModelsUsed, int())`
`416`	`416`	`auto& vehicle_models = PawnManager::Get()->vehicles->models();`
`417`	`417`
`418`	`418`	`return std::count_if(vehicle_models.begin(), vehicle_models.end(), [](uint8_t model_instances)`
`419`		`- { return model_instances > 0; });`
	`419`	`+ {`
	`420`	`+ return model_instances > 0;`
	`421`	`+ });`
`420`	`422`	`}`
`421`	`423`
`422`	`424`	`SCRIPT_API(GetVehiclePaintjob, int(IVehicle& vehicle))`