Skip to content

Commit 642d349

Browse files
committed
Break line after paren in multiline function calls
as per ament/ament_lint#148 Signed-off-by: Dan Rose <[email protected]>
1 parent f78dcc9 commit 642d349

21 files changed

+124
-72
lines changed

composition/src/server_component.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ Server::Server(const rclcpp::NodeOptions & options)
3333
std::shared_ptr<example_interfaces::srv::AddTwoInts::Response> response
3434
) -> void
3535
{
36-
RCLCPP_INFO(this->get_logger(), "Incoming request: [a: %" PRId64 ", b: %" PRId64 "]",
36+
RCLCPP_INFO(
37+
this->get_logger(), "Incoming request: [a: %" PRId64 ", b: %" PRId64 "]",
3738
request->a, request->b);
3839
std::flush(std::cout);
3940
response->sum = request->a + request->b;

demo_nodes_cpp/src/parameters/even_parameters_node.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,30 +43,34 @@ class EvenParameterNode : public rclcpp::Node
4343
for (auto parameter : parameters) {
4444
rclcpp::ParameterType parameter_type = parameter.get_type();
4545
if (rclcpp::ParameterType::PARAMETER_NOT_SET == parameter_type) {
46-
RCLCPP_INFO(this->get_logger(),
46+
RCLCPP_INFO(
47+
this->get_logger(),
4748
"parameter '%s' deleted successfully",
4849
parameter.get_name().c_str()
4950
);
5051
result.successful &= true;
5152
} else if (rclcpp::ParameterType::PARAMETER_INTEGER == parameter_type) {
5253
if (parameter.as_int() % 2 != 0) {
53-
RCLCPP_INFO(this->get_logger(),
54+
RCLCPP_INFO(
55+
this->get_logger(),
5456
"Requested value '%d' for parameter '%s' is not an even number:"
5557
" rejecting change...",
5658
parameter.as_int(),
5759
parameter.get_name().c_str()
5860
);
5961
result.successful = false;
6062
} else {
61-
RCLCPP_INFO(this->get_logger(),
63+
RCLCPP_INFO(
64+
this->get_logger(),
6265
"parameter '%s' has changed and is now: %s",
6366
parameter.get_name().c_str(),
6467
parameter.value_to_string().c_str()
6568
);
6669
result.successful &= true;
6770
}
6871
} else {
69-
RCLCPP_INFO(this->get_logger(),
72+
RCLCPP_INFO(
73+
this->get_logger(),
7074
"only integer parameters can be set\n"
7175
"requested value for parameter '%s' is not an even number, rejecting change...",
7276
parameter.get_name().c_str()

demo_nodes_cpp/src/parameters/list_parameters.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ int main(int argc, char ** argv)
4747

4848
RCLCPP_INFO(node->get_logger(), "Setting parameters...");
4949
// Set several different types of parameters.
50-
auto set_parameters_results = parameters_client->set_parameters({
50+
auto set_parameters_results = parameters_client->set_parameters(
51+
{
5152
rclcpp::Parameter("foo", 2),
5253
rclcpp::Parameter("bar", "hello"),
5354
rclcpp::Parameter("baz", 1.45),

demo_nodes_cpp/src/parameters/list_parameters_async.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ int main(int argc, char ** argv)
4848

4949
RCLCPP_INFO(node->get_logger(), "Setting parameters...");
5050
// Set several differnet types of parameters.
51-
auto results = parameters_client->set_parameters({
51+
auto results = parameters_client->set_parameters(
52+
{
5253
rclcpp::Parameter("foo", 2),
5354
rclcpp::Parameter("bar", "hello"),
5455
rclcpp::Parameter("baz", 1.45),

demo_nodes_cpp/src/parameters/parameter_blackboard.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ class ParameterBlackboard : public rclcpp::Node
3131
))
3232
: rclcpp::Node(name, namespace_, options)
3333
{
34-
RCLCPP_INFO(this->get_logger(),
34+
RCLCPP_INFO(
35+
this->get_logger(),
3536
"Parameter blackboard node named '%s' ready, and serving '%zu' parameters already!",
3637
this->get_fully_qualified_name(), this->list_parameters(
3738
{}, rcl_interfaces::srv::ListParameters::Request::DEPTH_RECURSIVE).names.size());

demo_nodes_cpp/src/parameters/parameter_events.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,17 @@ int main(int argc, char ** argv)
7373
node->declare_parameter("foobar");
7474

7575
// Set several different types of parameters.
76-
auto set_parameters_results = parameters_client->set_parameters({
76+
auto set_parameters_results = parameters_client->set_parameters(
77+
{
7778
rclcpp::Parameter("foo", 2),
7879
rclcpp::Parameter("bar", "hello"),
7980
rclcpp::Parameter("baz", 1.45),
8081
rclcpp::Parameter("foobar", true),
8182
});
8283

8384
// Change the value of some of them.
84-
set_parameters_results = parameters_client->set_parameters({
85+
set_parameters_results = parameters_client->set_parameters(
86+
{
8587
rclcpp::Parameter("foo", 3),
8688
rclcpp::Parameter("bar", "world"),
8789
});

demo_nodes_cpp/src/parameters/parameter_events_async.cpp

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,11 @@ class ParameterEventsAsyncNode : public rclcpp::Node
6565

6666
// Queue a `set_parameters` request as soon as `spin` is called on this node.
6767
// TODO(dhood): consider adding a "call soon" notion to Node to not require a timer for this.
68-
timer_ = create_wall_timer(200ms,
69-
[this]() {
70-
this->queue_first_set_parameter_request();
71-
});
68+
timer_ = create_wall_timer(
69+
200ms,
70+
[this]() {
71+
this->queue_first_set_parameter_request();
72+
});
7273
}
7374

7475
// Set several different types of parameters.
@@ -93,7 +94,8 @@ class ParameterEventsAsyncNode : public rclcpp::Node
9394
this->queue_second_set_parameter_request();
9495
};
9596

96-
parameters_client_->set_parameters({
97+
parameters_client_->set_parameters(
98+
{
9799
rclcpp::Parameter("foo", 2),
98100
rclcpp::Parameter("bar", "hello"),
99101
rclcpp::Parameter("baz", 1.45),
@@ -114,12 +116,14 @@ class ParameterEventsAsyncNode : public rclcpp::Node
114116
// TODO(wjwwood): Create and use delete_parameter
115117

116118
// Give time for all of the ParameterEvent callbacks to be received.
117-
timer_ = create_wall_timer(100ms,
118-
[]() {
119-
rclcpp::shutdown();
120-
});
119+
timer_ = create_wall_timer(
120+
100ms,
121+
[]() {
122+
rclcpp::shutdown();
123+
});
121124
};
122-
parameters_client_->set_parameters({
125+
parameters_client_->set_parameters(
126+
{
123127
rclcpp::Parameter("foo", 3),
124128
rclcpp::Parameter("bar", "world"),
125129
}, response_received_callback);

demo_nodes_cpp/src/parameters/set_and_get_parameters.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ int main(int argc, char ** argv)
4747
}
4848

4949
// Set several different types of parameters.
50-
auto set_parameters_results = parameters_client->set_parameters({
50+
auto set_parameters_results = parameters_client->set_parameters(
51+
{
5152
rclcpp::Parameter("foo", 2),
5253
rclcpp::Parameter("bar", "hello"),
5354
rclcpp::Parameter("baz", 1.45),

demo_nodes_cpp/src/parameters/set_and_get_parameters_async.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ int main(int argc, char ** argv)
4747
}
4848

4949
// Set several different types of parameters.
50-
auto results = parameters_client->set_parameters({
50+
auto results = parameters_client->set_parameters(
51+
{
5152
rclcpp::Parameter("foo", 2),
5253
rclcpp::Parameter("bar", "hello"),
5354
rclcpp::Parameter("baz", 1.45),

demo_nodes_cpp/src/services/add_two_ints_server.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ class ServerNode : public rclcpp::Node
4545
std::shared_ptr<example_interfaces::srv::AddTwoInts::Response> response) -> void
4646
{
4747
(void)request_header;
48-
RCLCPP_INFO(this->get_logger(), "Incoming request\na: %" PRId64 " b: %" PRId64,
48+
RCLCPP_INFO(
49+
this->get_logger(), "Incoming request\na: %" PRId64 " b: %" PRId64,
4950
request->a, request->b);
5051
response->sum = request->a + request->b;
5152
};

0 commit comments

Comments
 (0)