Align formatting with incoming support for Clang-Format (#400)

* Sorting of includes and special case handling of preprocessor macros

* Lots of minor formatting ammendmends

* Further formattings

* Further prepratory formatting

Author: Twon

libraries/application/src/morpheus/application/application.hpp

@@ -15,7 +15,8 @@ namespace morpheus::application
 ///
 ///
 // template<typename T>
-class Application {
+class Application
+{
 public:
     ///
     /// \param[in] argc The number of command line arguments.
@@ -34,7 +35,7 @@ class Application {
     }
 
 private:
-    po::Config mConfig; /// Common application configuration
+    po::Config mConfig;             /// Common application configuration
     std::filesystem::path mLogPath; /// Path to application log file.
 };
 

libraries/application/src/morpheus/application/po/adapters/boost/asio.hpp

@@ -6,8 +6,8 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/any.hpp>
 #include <boost/asio/ip/tcp.hpp>
-#include <boost/system/error_code.hpp>
 #include <boost/program_options.hpp>
+#include <boost/system/error_code.hpp>
 
 #include <string>
 #include <vector>

libraries/application/src/morpheus/application/po/adapters/boost/log.hpp

@@ -1,20 +1,21 @@
 #pragma once
 
 // IWYU pragma: always_keep
-#include <boost/any.hpp>
 #include <boost/algorithm/string.hpp>
+#include <boost/any.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/program_options.hpp>
 
 #include <string>
 #include <vector>
 
-
-namespace boost {
+namespace boost
+{
 
 BOOST_LOG_OPEN_NAMESPACE
 
-namespace trivial {
+namespace trivial
+{
 
 template <class CharType>
 void validate(boost::any& v, std::vector<std::basic_string<CharType>> const& values, severity_level*, int)
@@ -40,8 +41,8 @@ void validate(boost::any& v, std::vector<std::basic_string<CharType>> const& val
         throw po::validation_error(po::validation_error::invalid_option_value);
 }
 
-}
+} // namespace trivial
 
 BOOST_LOG_CLOSE_NAMESPACE
 
-} // namespace boost::log::trivial
+} // namespace boost

libraries/application/src/morpheus/application/po/adapters/enum.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "morpheus/core/meta/concepts/enum.hpp"
 #include "morpheus/core/conversion/adapters/enum.hpp"
+#include "morpheus/core/meta/concepts/enum.hpp"
 
 #include <boost/any.hpp>
 #include <boost/program_options.hpp>

libraries/application/src/morpheus/application/po/adapters/scannable.hpp

@@ -14,7 +14,7 @@ namespace boost
 {
 
 template <class CharType, typename S>
-requires  morpheus::meta::concepts::Scannable<S, CharType>
+requires morpheus::meta::concepts::Scannable<S, CharType>
 void validate(boost::any& v, std::vector<std::basic_string<CharType>> const& values, S*, int)
 {
     namespace po = boost::program_options;

libraries/application/src/morpheus/application/po/options.hpp

@@ -18,8 +18,8 @@
     #pragma GCC diagnostic pop
 #endif // (MORPHEUS_COMPILER == MORPHEUS_GNUC_COMPILER)
 
-#include <iostream>
 #include <filesystem>
+#include <iostream>
 #include <optional>
 #include <span>
 
@@ -38,17 +38,17 @@ concept CustomProgramOptions = requires(T& t, boost::program_options::options_de
 ///     Holds common help documentation information for applications.
 struct HelpDocumentation
 {
-    std::string_view name; ///< The name of the application, typically the executable name.
-    std::string_view synopsis; ///< A brief synopsis of the application, typically a one-liner describing its purpose.
+    std::string_view name;          ///< The name of the application, typically the executable name.
+    std::string_view synopsis;      ///< A brief synopsis of the application, typically a one-liner describing its purpose.
     std::optional<Version> version; ///< The version of the application, if available.
 };
 
 std::optional<int> parseProgramOptions(int argc, char const* const* argv, HelpDocumentation const& msgDetails, CustomProgramOptions auto&... options)
 {
-    return parseProgramOptions(std::span<char const * const>{argv, static_cast<std::size_t>(argc)}, msgDetails, options...);
+    return parseProgramOptions(std::span<char const* const>{argv, static_cast<std::size_t>(argc)}, msgDetails, options...);
 }
 
-std::optional<int> parseProgramOptions(std::span<char const * const> parameters, HelpDocumentation const& msgDetails, CustomProgramOptions auto&... options)
+std::optional<int> parseProgramOptions(std::span<char const* const> parameters, HelpDocumentation const& msgDetails, CustomProgramOptions auto&... options)
 {
     namespace po = boost::program_options;
     try
@@ -94,5 +94,4 @@ std::optional<int> parseProgramOptions(std::span<char const * const> parameters,
     return std::nullopt;
 }
 
-
 } // namespace morpheus::application::po

libraries/application/tests/po/adapters/scannable.tests.cpp

@@ -1,5 +1,5 @@
-#include "morpheus/application/po/options.hpp"
 #include "morpheus/application/po/adapters/scannable.hpp"
+#include "morpheus/application/po/options.hpp"
 #include "morpheus/application/version.hpp"
 #include "morpheus/core/conformance/scan.hpp"
 #include "morpheus/logging.hpp"
@@ -70,7 +70,7 @@ TEST_CASE_METHOD(LoggingFixture, "Test parsing of scannable as options", "[morph
             return location.coordinates;
         };
 
-        REQUIRE(getCoordinates("[1, 97]") == Coordinates {1.0, 97.0});
+        REQUIRE(getCoordinates("[1, 97]") == Coordinates{1.0, 97.0});
     }
     SECTION("Ensure invalid value parse correctly")
     {

libraries/application/tests/po/adapters/std/chrono.tests.cpp

@@ -1,5 +1,5 @@
-#include "morpheus/application/po/options.hpp"
 #include "morpheus/application/po/adapters/std/chrono.hpp"
+#include "morpheus/application/po/options.hpp"
 #include "morpheus/application/version.hpp"
 #include "morpheus/core/conformance/date.hpp"
 #include "morpheus/core/serialisation/adapters/std/chrono.hpp"
@@ -14,8 +14,8 @@
 #include <functional>
 #include <optional>
 #include <ostream>
-#include <string_view>
 #include <string>
+#include <string_view>
 
 namespace morpheus::application::po
 {

libraries/application/tests/po/adapters/std/optional.tests.cpp

@@ -1,5 +1,5 @@
-#include "morpheus/application/po/options.hpp"
 #include "morpheus/application/po/adapters/std/optional.hpp" // IWYU pragma: keep
+#include "morpheus/application/po/options.hpp"
 #include "morpheus/application/version.hpp"
 #include "morpheus/logging.hpp"
 

libraries/core/mocking/morpheus/core/serialisation/mock/reader.hpp

@@ -4,12 +4,12 @@
 
 #include <gmock/gmock.h>
 
-#include <cstdint>
 #include <cstddef>
+#include <cstdint>
 #include <optional>
 #include <span>
-#include <string_view>
 #include <string>
+#include <string_view>
 #include <vector>
 
 namespace morpheus::serialisation::mock
@@ -70,14 +70,15 @@ class Reader
     /// Reads a std::string type from the serialisation.
     MOCK_METHOD(std::string, read, (std::string), ());
     /// Reads a string literal type from the serialisation.
-    MOCK_METHOD(std::string, read, (char const * const), ());
+    MOCK_METHOD(std::string, read, (char const* const), ());
     /// Reads a blob of bytes from the serialisation.
     MOCK_METHOD(std::vector<std::byte>, read, (std::vector<std::byte>), ());
     ///@}
 
     /// Template wrapper around read which dispatches to the correct concrete read method based on the type T.
-    template<typename T>
-    T read() requires requires(Reader r) { r.read(T{}); }
+    template <typename T>
+    T read()
+    requires requires(Reader r) { r.read(T{}); }
     {
         return read(T{});
     }