1 files changed, 47 insertions, 21 deletions

diff --git a/editor/doc/doc_data.cpp b/editor/doc/doc_data.cpp
index 7d2159d365..a8ba54d4f8 100644
--- a/editor/doc/doc_data.cpp
+++ b/editor/doc/doc_data.cpp
@@ -248,6 +248,28 @@ void DocData::generate(bool p_basic_types) {
 			prop.setter = setter;
 			prop.getter = getter;
 
+			Variant default_value = Variant();
+			bool default_value_valid = false;
+
+			if (ClassDB::can_instance(name)) {
+				default_value = ClassDB::class_get_default_property_value(name, E->get().name, &default_value_valid);
+			} else {
+				// Cannot get default value of classes that can't be instanced
+				List<StringName> inheriting_classes;
+				ClassDB::get_direct_inheriters_from_class(name, &inheriting_classes);
+				for (List<StringName>::Element *E2 = inheriting_classes.front(); E2; E2 = E2->next()) {
+					if (ClassDB::can_instance(E2->get())) {
+						default_value = ClassDB::class_get_default_property_value(E2->get(), E->get().name, &default_value_valid);
+						if (default_value_valid)
+							break;
+					}
+				}
+			}
+
+			if (default_value_valid) {
+				prop.default_value = default_value.get_construct_string();
+			}
+
 			bool found_type = false;
 			if (getter != StringName()) {
 				MethodBind *mb = ClassDB::get_method(name, getter);
@@ -301,8 +323,14 @@ void DocData::generate(bool p_basic_types) {
 			if (E->get().name == "" || (E->get().name[0] == '_' && !(E->get().flags & METHOD_FLAG_VIRTUAL)))
 				continue; //hidden, don't count
 
-			if (skip_setter_getter_methods && setters_getters.has(E->get().name) && E->get().name.find("/") == -1)
-				continue;
+			if (skip_setter_getter_methods && setters_getters.has(E->get().name)) {
+				// Don't skip parametric setters and getters, i.e. method which require
+				// one or more parameters to define what property should be set or retrieved.
+				// E.g. CPUParticles::set_param(Parameter param, float value).
+				if (E->get().arguments.size() == 0 /* getter */ || (E->get().arguments.size() == 1 && E->get().return_val.type == Variant::NIL /* setter */)) {
+					continue;
+				}
+			}
 
 			MethodDoc method;
 
@@ -344,21 +372,6 @@ void DocData::generate(bool p_basic_types) {
 
 					method.arguments.push_back(argument);
 				}
-
-				/*
-				String hint;
-				switch(arginfo.hint) {
-					case PROPERTY_HINT_DIR: hint="A directory."; break;
-					case PROPERTY_HINT_RANGE: hint="Range - min: "+arginfo.hint_string.get_slice(",",0)+" max: "+arginfo.hint_string.get_slice(",",1)+" step: "+arginfo.hint_string.get_slice(",",2); break;
-					case PROPERTY_HINT_ENUM: hint="Values: "; for(int j=0;j<arginfo.hint_string.get_slice_count(",");j++) { if (j>0) hint+=", "; hint+=arginfo.hint_string.get_slice(",",j)+"="+itos(j); } break;
-					case PROPERTY_HINT_LENGTH: hint="Length: "+arginfo.hint_string; break;
-					case PROPERTY_HINT_FLAGS: hint="Values: "; for(int j=0;j<arginfo.hint_string.get_slice_count(",");j++) { if (j>0) hint+=", "; hint+=arginfo.hint_string.get_slice(",",j)+"="+itos(1<<j); } break;
-					case PROPERTY_HINT_FILE: hint="A file:"; break;
-					//case PROPERTY_HINT_RESOURCE_TYPE: hint="Type: "+arginfo.hint_string; break;
-				};
-				if (hint!="")
-					_write_string(f,4,hint);
-*/
 			}
 
 			c.methods.push_back(method);
@@ -412,6 +425,7 @@ void DocData::generate(bool p_basic_types) {
 				PropertyDoc pd;
 				pd.name = E->get();
 				pd.type = "int";
+				pd.default_value = itos(Theme::get_default()->get_constant(E->get(), cname));
 				c.theme_properties.push_back(pd);
 			}
 
@@ -422,6 +436,7 @@ void DocData::generate(bool p_basic_types) {
 				PropertyDoc pd;
 				pd.name = E->get();
 				pd.type = "Color";
+				pd.default_value = Variant(Theme::get_default()->get_color(E->get(), cname)).get_construct_string();
 				c.theme_properties.push_back(pd);
 			}
 
@@ -530,6 +545,7 @@ void DocData::generate(bool p_basic_types) {
 			PropertyDoc property;
 			property.name = pi.name;
 			property.type = Variant::get_type_name(pi.type);
+			property.default_value = v.get(pi.name).get_construct_string();
 
 			c.properties.push_back(property);
 		}
@@ -1063,12 +1079,15 @@ Error DocData::save_classes(const String &p_default_path, const Map<String, Stri
 
 			for (int i = 0; i < c.properties.size(); i++) {
 
-				String enum_text;
+				String additional_attributes;
 				if (c.properties[i].enumeration != String()) {
-					enum_text = " enum=\"" + c.properties[i].enumeration + "\"";
+					additional_attributes += " enum=\"" + c.properties[i].enumeration + "\"";
+				}
+				if (c.properties[i].default_value != String()) {
+					additional_attributes += " default=\"" + c.properties[i].default_value.xml_escape(true) + "\"";
 				}
 				const PropertyDoc &p = c.properties[i];
-				_write_string(f, 2, "<member name=\"" + p.name + "\" type=\"" + p.type + "\" setter=\"" + p.setter + "\" getter=\"" + p.getter + "\"" + enum_text + ">");
+				_write_string(f, 2, "<member name=\"" + p.name + "\" type=\"" + p.type + "\" setter=\"" + p.setter + "\" getter=\"" + p.getter + "\"" + additional_attributes + ">");
 				_write_string(f, 3, p.description.strip_edges().xml_escape());
 				_write_string(f, 2, "</member>");
 			}
@@ -1125,7 +1144,14 @@ Error DocData::save_classes(const String &p_default_path, const Map<String, Stri
 			for (int i = 0; i < c.theme_properties.size(); i++) {
 
 				const PropertyDoc &p = c.theme_properties[i];
-				_write_string(f, 2, "<theme_item name=\"" + p.name + "\" type=\"" + p.type + "\">");
+
+				if (p.default_value != "")
+					_write_string(f, 2, "<theme_item name=\"" + p.name + "\" type=\"" + p.type + "\" default=\"" + p.default_value.xml_escape(true) + "\">");
+				else
+					_write_string(f, 2, "<theme_item name=\"" + p.name + "\" type=\"" + p.type + "\">");
+
+				_write_string(f, 3, p.description.strip_edges().xml_escape());
+
 				_write_string(f, 2, "</theme_item>");
 			}
 			_write_string(f, 1, "</theme_items>");