Codeformat from new pre-commit config (#1433)

(cherry picked from commit 591b06c)

# Conflicts:
#	rqt_controller_manager/rqt_controller_manager/controller_manager.py

controller_manager/test/test_controller_manager_srvs.cpp

@@ -781,8 +781,7 @@ TEST_F(TestControllerManagerSrvs, list_sorted_complex_chained_controllers)
   auto get_ctrl_pos = [result](const std::string & controller_name) -> int64_t
   {
     auto it = std::find_if(
-      result->controller.begin(), result->controller.end(),
-      [controller_name](auto itf)
+      result->controller.begin(), result->controller.end(), [controller_name](auto itf)
       { return (itf.name.find(controller_name) != std::string::npos); });
     return std::distance(result->controller.begin(), it);
   };
@@ -993,8 +992,7 @@ TEST_F(TestControllerManagerSrvs, list_sorted_independent_chained_controllers)
   auto get_ctrl_pos = [result](const std::string & controller_name) -> int64_t
   {
     auto it = std::find_if(
-      result->controller.begin(), result->controller.end(),
-      [controller_name](auto itf)
+      result->controller.begin(), result->controller.end(), [controller_name](auto itf)
       { return (itf.name.find(controller_name) != std::string::npos); });
     return std::distance(result->controller.begin(), it);
   };
@@ -1270,8 +1268,7 @@ TEST_F(TestControllerManagerSrvs, list_large_number_of_controllers_with_chains)
   auto get_ctrl_pos = [result](const std::string & controller_name) -> int64_t
   {
     auto it = std::find_if(
-      result->controller.begin(), result->controller.end(),
-      [controller_name](auto itf)
+      result->controller.begin(), result->controller.end(), [controller_name](auto itf)
       { return (itf.name.find(controller_name) != std::string::npos); });
     return std::distance(result->controller.begin(), it);
   };
@@ -1495,8 +1492,7 @@ TEST_F(TestControllerManagerSrvs, list_sorted_large_chained_controller_tree)
   auto get_ctrl_pos = [result](const std::string & controller_name) -> int64_t
   {
     auto it = std::find_if(
-      result->controller.begin(), result->controller.end(),
-      [controller_name](auto itf)
+      result->controller.begin(), result->controller.end(), [controller_name](auto itf)
       { return (itf.name.find(controller_name) != std::string::npos); });
     return std::distance(result->controller.begin(), it);
   };

controller_manager/test/test_spawner_unspawner.cpp

@@ -264,8 +264,7 @@ TEST_F(TestLoadController, unload_on_kill)
   // Launch spawner with unload on kill
   // timeout command will kill it after the specified time with signal SIGINT
   std::stringstream ss;
-  ss << "timeout --signal=INT 5 "
-     << "ros2 run controller_manager spawner "
+  ss << "timeout --signal=INT 5 " << "ros2 run controller_manager spawner "
      << "ctrl_3 -c test_controller_manager -t "
      << std::string(test_controller::TEST_CONTROLLER_CLASS_NAME) << " --unload-on-kill";
 

hardware_interface/test/test_hardware_components/test_force_torque_sensor.cpp

@@ -43,8 +43,7 @@ class TestForceTorqueSensor : public SensorInterface
     {
       if (
         std::find_if(
-          state_interfaces.begin(), state_interfaces.end(),
-          [&ft_key](const auto & interface_info)
+          state_interfaces.begin(), state_interfaces.end(), [&ft_key](const auto & interface_info)
           { return interface_info.name == ft_key; }) == state_interfaces.end())
       {
         return CallbackReturn::ERROR;

joint_limits/include/joint_limits/joint_limits.hpp

@@ -128,14 +128,11 @@ struct SoftJointLimits
   {
     std::stringstream ss_output;
 
-    ss_output << "  soft position limits: "
-              << "[" << min_position << ", " << max_position << "]\n";
+    ss_output << "  soft position limits: " << "[" << min_position << ", " << max_position << "]\n";
 
-    ss_output << "  k-position: "
-              << "[" << k_position << "]\n";
+    ss_output << "  k-position: " << "[" << k_position << "]\n";
 
-    ss_output << "  k-velocity: "
-              << "[" << k_velocity << "]\n";
+    ss_output << "  k-velocity: " << "[" << k_velocity << "]\n";
 
     return ss_output.str();
   }

rqt_controller_manager/rqt_controller_manager/controller_manager.py

@@ -414,4 +414,15 @@ def _get_parameter_controller_names(node, node_name):
     """Get list of ROS parameter names that potentially represent a controller configuration."""
     parameter_names = call_list_parameters(node=node, node_name=node_name)
     suffix = ".type"
+<<<<<<< HEAD
     return [n[: -len(suffix)] for n in parameter_names.result().result.names if n.endswith(suffix)]
+=======
+    # @note: The versions conditioning is added here to support the source-compatibility with Humble
+    try:
+        return [
+            n[: -len(suffix)] for n in parameter_names.result().result.names if n.endswith(suffix)
+        ]
+    finally:
+        # for humble, ros2param < 0.20.0
+        return [n[: -len(suffix)] for n in parameter_names if n.endswith(suffix)]
+>>>>>>> 591b06c (Codeformat from new pre-commit config (#1433))