summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Forbis <bforbis@athenahealth.com>2017-10-07 19:57:40 -0400
committerJames E. King, III <jking@apache.org>2017-10-10 08:46:46 -0700
commit8b8a8efea13d1c97f856053af0a5c0e6a8a76354 (patch)
tree59e8c7af0d776054c03d427b7bd71b2b0ec182f7
parentb62873686f631e157accd5d5c925421e1ea3f932 (diff)
downloadthrift-8b8a8efea13d1c97f856053af0a5c0e6a8a76354.tar.gz
THRIFT-4355 Fix javascript indentation of default values
Client: js This closes #1388
-rw-r--r--compiler/cpp/src/thrift/generate/t_js_generator.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/compiler/cpp/src/thrift/generate/t_js_generator.cc b/compiler/cpp/src/thrift/generate/t_js_generator.cc
index c146da71b..f45ef5736 100644
--- a/compiler/cpp/src/thrift/generate/t_js_generator.cc
+++ b/compiler/cpp/src/thrift/generate/t_js_generator.cc
@@ -558,7 +558,7 @@ string t_js_generator::render_const_value(t_type* type, t_const_value* value) {
} else if (type->is_enum()) {
out << value->get_integer();
} else if (type->is_struct() || type->is_xception()) {
- out << "new " << js_type_namespace(type->get_program()) << type->get_name() << "({" << endl;
+ out << "new " << js_type_namespace(type->get_program()) << type->get_name() << "({";
indent_up();
const vector<t_field*>& fields = ((t_struct*)type)->get_members();
vector<t_field*>::const_iterator f_iter;
@@ -576,12 +576,12 @@ string t_js_generator::render_const_value(t_type* type, t_const_value* value) {
}
if (v_iter != val.begin())
out << ",";
- out << render_const_value(g_type_string, v_iter->first);
+ out << endl << indent() << render_const_value(g_type_string, v_iter->first);
out << " : ";
out << render_const_value(field_type, v_iter->second);
}
-
- out << "})";
+ indent_down();
+ out << endl << indent() << "})";
} else if (type->is_map()) {
t_type* ktype = ((t_map*)type)->get_key_type();
@@ -600,9 +600,8 @@ string t_js_generator::render_const_value(t_type* type, t_const_value* value) {
out << " : ";
out << render_const_value(vtype, v_iter->second);
}
-
indent_down();
- out << endl << "}";
+ out << endl << indent() << "}";
} else if (type->is_list() || type->is_set()) {
t_type* etype;
if (type->is_list()) {