@@ -165,9 +165,9 @@ struct Sections {
165
165
if (outer_type == OuterType::NAMED_ARG) return ; // Nothing more to do for non-recursive types on first recursion
166
166
auto left = indent;
167
167
if (arg.m_type_str .size () != 0 && outer_type == OuterType::OBJ) {
168
- left += " \" " + arg.m_name + " \" :" + arg.m_type_str .at (0 );
168
+ left += " \" " + arg.m_name + " \" : " + arg.m_type_str .at (0 );
169
169
} else {
170
- left += outer_type == OuterType::OBJ ? arg.ToStringObj () : arg.ToString ();
170
+ left += outer_type == OuterType::OBJ ? arg.ToStringObj (/* oneline */ false ) : arg.ToString (/* oneline */ false );
171
171
}
172
172
left += " ," ;
173
173
PushSection ({left, arg.ToDescriptionString (/* implicitly_required */ outer_type == OuterType::ARR)});
@@ -188,7 +188,7 @@ struct Sections {
188
188
}
189
189
case RPCArg::Type::ARR: {
190
190
auto left = indent;
191
- left += outer_type == OuterType::OBJ ? " \" " + arg.m_name + " \" :" : " " ;
191
+ left += outer_type == OuterType::OBJ ? " \" " + arg.m_name + " \" : " : " " ;
192
192
left += " [" ;
193
193
const auto right = outer_type == OuterType::NAMED_ARG ? " " : arg.ToDescriptionString (/* implicitly_required */ outer_type == OuterType::ARR);
194
194
PushSection ({left, right});
@@ -345,9 +345,16 @@ std::string RPCArg::ToDescriptionString(const bool implicitly_required) const
345
345
return ret;
346
346
}
347
347
348
- std::string RPCArg::ToStringObj () const
348
+ std::string RPCArg::ToStringObj (const bool oneline ) const
349
349
{
350
- std::string res = " \" " + m_name + " \" :" ;
350
+ std::string res;
351
+ res += " \" " ;
352
+ res += m_name;
353
+ if (oneline) {
354
+ res += " \" :" ;
355
+ } else {
356
+ res += " \" : " ;
357
+ }
351
358
switch (m_type) {
352
359
case Type::STR:
353
360
return res + " \" str\" " ;
@@ -362,7 +369,7 @@ std::string RPCArg::ToStringObj() const
362
369
case Type::ARR:
363
370
res += " [" ;
364
371
for (const auto & i : m_inner) {
365
- res += i.ToString () + " ," ;
372
+ res += i.ToString (oneline ) + " ," ;
366
373
}
367
374
return res + " ...]" ;
368
375
case Type::OBJ:
@@ -393,7 +400,7 @@ std::string RPCArg::ToString(const bool oneline) const
393
400
case Type::OBJ_USER_KEYS: {
394
401
std::string res;
395
402
for (size_t i = 0 ; i < m_inner.size ();) {
396
- res += m_inner[i].ToStringObj ();
403
+ res += m_inner[i].ToStringObj (oneline );
397
404
if (++i < m_inner.size ()) res += " ," ;
398
405
}
399
406
if (m_type == Type::OBJ) {
0 commit comments