From f13f2d512f0439a29804182cee756dce62add857 Mon Sep 17 00:00:00 2001
From: Ben Rog-Wilhelm <zorba-githubdesktop20180420@pavlovian.net>
Date: Thu, 1 Nov 2018 08:35:16 -0700
Subject: [PATCH 1/2] Implement CSharpScript::get_script_method_list and
 related functionality.

---
 editor/property_selector.cpp            |  3 +++
 modules/mono/csharp_script.cpp          | 30 +++++++++++++++++++++++++
 modules/mono/csharp_script.h            |  4 ++--
 modules/mono/mono_gd/gd_mono_class.cpp  | 27 ++++++++++++++++++++++
 modules/mono/mono_gd/gd_mono_class.h    |  9 ++++++++
 modules/mono/mono_gd/gd_mono_method.cpp | 27 ++++++++++++++++++++++
 modules/mono/mono_gd/gd_mono_method.h   |  5 +++++
 7 files changed, 103 insertions(+), 2 deletions(-)

diff --git a/editor/property_selector.cpp b/editor/property_selector.cpp
index a8c97be9367..ff3fc649071 100644
--- a/editor/property_selector.cpp
+++ b/editor/property_selector.cpp
@@ -210,6 +210,9 @@ void PropertySelector::_update_search() {
 
 				methods.push_back(MethodInfo("*Script Methods"));
 				Object::cast_to<Script>(obj)->get_script_method_list(&methods);
+				// TODO: Filter out things unsuitable for explicit calls, like constructors.
+
+				// TODO: We should handle script class hierarchies somehow. Right now we don't; it's unclear where this functionality should live.
 			}
 
 			StringName base = base_type;
diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp
index 3c818898e64..ba31f12d374 100644
--- a/modules/mono/csharp_script.cpp
+++ b/modules/mono/csharp_script.cpp
@@ -2474,6 +2474,17 @@ void CSharpScript::set_source_code(const String &p_code) {
 #endif
 }
 
+void CSharpScript::get_script_method_list(List<MethodInfo> *p_list) const {
+
+	if (!script_class)
+		return;
+
+	const Vector<GDMonoMethod *> &methods = script_class->get_all_methods();
+	for (int i = 0; i < methods.size(); ++i) {
+		p_list->push_back(methods[i]->get_method_info());
+	}
+}
+
 bool CSharpScript::has_method(const StringName &p_method) const {
 
 	if (!script_class)
@@ -2482,6 +2493,25 @@ bool CSharpScript::has_method(const StringName &p_method) const {
 	return script_class->has_fetched_method_unknown_params(p_method);
 }
 
+MethodInfo CSharpScript::get_method_info(const StringName &p_method) const {
+
+	if (!script_class)
+		return MethodInfo();
+
+	GDMonoClass *top = script_class;
+
+	while (top && top != native) {
+		GDMonoMethod *params = top->get_fetched_method_unknown_params(p_method);
+		if (params) {
+			return params->get_method_info();
+		}
+
+		top = top->get_parent_class();
+	}
+
+	return MethodInfo();
+}
+
 Error CSharpScript::reload(bool p_keep_state) {
 
 	bool has_instances;
diff --git a/modules/mono/csharp_script.h b/modules/mono/csharp_script.h
index 501e0d9d6d2..08466bae585 100644
--- a/modules/mono/csharp_script.h
+++ b/modules/mono/csharp_script.h
@@ -174,9 +174,9 @@ public:
 	virtual Ref<Script> get_base_script() const;
 	virtual ScriptLanguage *get_language() const;
 
-	/* TODO */ virtual void get_script_method_list(List<MethodInfo> *p_list) const {}
+	virtual void get_script_method_list(List<MethodInfo> *p_list) const;
 	bool has_method(const StringName &p_method) const;
-	/* TODO */ MethodInfo get_method_info(const StringName &p_method) const { return MethodInfo(); }
+	MethodInfo get_method_info(const StringName &p_method) const;
 
 	virtual int get_member_line(const StringName &p_member) const;
 
diff --git a/modules/mono/mono_gd/gd_mono_class.cpp b/modules/mono/mono_gd/gd_mono_class.cpp
index 4e515cde28e..400735bb20b 100644
--- a/modules/mono/mono_gd/gd_mono_class.cpp
+++ b/modules/mono/mono_gd/gd_mono_class.cpp
@@ -139,6 +139,20 @@ void GDMonoClass::fetch_attributes() {
 	attrs_fetched = true;
 }
 
+void GDMonoClass::fetch_method_list() {
+
+	if (method_list_fetched)
+		return;
+
+	void *iter = NULL;
+	MonoMethod *raw_method = NULL;
+	while ((raw_method = mono_class_get_methods(get_mono_ptr(), &iter)) != NULL) {
+		method_list.push_back(memnew(GDMonoMethod(mono_method_get_name(raw_method), raw_method)));
+	}
+
+	method_list_fetched = true;
+}
+
 void GDMonoClass::fetch_methods_with_godot_api_checks(GDMonoClass *p_native_base) {
 
 	CRASH_COND(!CACHED_CLASS(GodotObject)->is_assignable_from(this));
@@ -151,6 +165,7 @@ void GDMonoClass::fetch_methods_with_godot_api_checks(GDMonoClass *p_native_base
 	while ((raw_method = mono_class_get_methods(get_mono_ptr(), &iter)) != NULL) {
 		StringName name = mono_method_get_name(raw_method);
 
+		// get_method implicitly fetches methods and adds them to this->methods
 		GDMonoMethod *method = get_method(raw_method, name);
 		ERR_CONTINUE(!method);
 
@@ -449,6 +464,13 @@ const Vector<GDMonoClass *> &GDMonoClass::get_all_delegates() {
 	return delegates_list;
 }
 
+const Vector<GDMonoMethod *> &GDMonoClass::get_all_methods() {
+	if (!method_list_fetched)
+		fetch_method_list();
+
+	return method_list;
+}
+
 GDMonoClass::GDMonoClass(const StringName &p_namespace, const StringName &p_name, MonoClass *p_class, GDMonoAssembly *p_assembly) {
 
 	namespace_name = p_namespace;
@@ -460,6 +482,7 @@ GDMonoClass::GDMonoClass(const StringName &p_namespace, const StringName &p_name
 	attributes = NULL;
 
 	methods_fetched = false;
+	method_list_fetched = false;
 	fields_fetched = false;
 	properties_fetched = false;
 	delegates_fetched = false;
@@ -512,4 +535,8 @@ GDMonoClass::~GDMonoClass() {
 
 		methods.clear();
 	}
+
+	for (int i = 0; i < method_list.size(); ++i) {
+		memdelete(method_list[i]);
+	}
 }
diff --git a/modules/mono/mono_gd/gd_mono_class.h b/modules/mono/mono_gd/gd_mono_class.h
index 477305d5034..4199eb22c6a 100644
--- a/modules/mono/mono_gd/gd_mono_class.h
+++ b/modules/mono/mono_gd/gd_mono_class.h
@@ -79,9 +79,14 @@ class GDMonoClass {
 	bool attrs_fetched;
 	MonoCustomAttrInfo *attributes;
 
+	// This contains both the original method names and remapped method names from the native Godot identifiers to the C# functions.
+	// Most method-related functions refer to this and it's possible this is unintuitive for outside users; this may be a prime location for refactoring or renaming.
 	bool methods_fetched;
 	HashMap<MethodKey, GDMonoMethod *, MethodKey::Hasher> methods;
 
+	bool method_list_fetched;
+	Vector<GDMonoMethod *> method_list;
+
 	bool fields_fetched;
 	Map<StringName, GDMonoField *> fields;
 	Vector<GDMonoField *> fields_list;
@@ -97,6 +102,8 @@ class GDMonoClass {
 	friend class GDMonoAssembly;
 	GDMonoClass(const StringName &p_namespace, const StringName &p_name, MonoClass *p_class, GDMonoAssembly *p_assembly);
 
+	void fetch_method_list();
+
 public:
 	static String get_full_name(MonoClass *p_mono_class);
 	static MonoType *get_mono_type(MonoClass *p_mono_class);
@@ -143,6 +150,8 @@ public:
 
 	const Vector<GDMonoClass *> &get_all_delegates();
 
+	const Vector<GDMonoMethod *> &get_all_methods();
+
 	~GDMonoClass();
 };
 
diff --git a/modules/mono/mono_gd/gd_mono_method.cpp b/modules/mono/mono_gd/gd_mono_method.cpp
index 630bda8b4e4..6ef6e97f5a1 100644
--- a/modules/mono/mono_gd/gd_mono_method.cpp
+++ b/modules/mono/mono_gd/gd_mono_method.cpp
@@ -68,6 +68,10 @@ void GDMonoMethod::_update_signature(MonoMethodSignature *p_method_sig) {
 
 		param_types.push_back(param_type);
 	}
+
+	// clear the cache
+	method_info_fetched = false;
+	method_info = MethodInfo();
 }
 
 bool GDMonoMethod::is_static() {
@@ -246,11 +250,34 @@ void GDMonoMethod::get_parameter_types(Vector<ManagedType> &types) const {
 	}
 }
 
+const MethodInfo &GDMonoMethod::get_method_info() {
+
+	if (!method_info_fetched) {
+		method_info.name = name;
+		method_info.return_val = PropertyInfo(GDMonoMarshal::managed_to_variant_type(return_type), "");
+
+		Vector<StringName> names;
+		get_parameter_names(names);
+
+		for (int i = 0; i < params_count; ++i) {
+			method_info.arguments.push_back(PropertyInfo(GDMonoMarshal::managed_to_variant_type(param_types[i]), names[i]));
+		}
+
+		// TODO: default arguments
+
+		method_info_fetched = true;
+	}
+
+	return method_info;
+}
+
 GDMonoMethod::GDMonoMethod(StringName p_name, MonoMethod *p_method) {
 	name = p_name;
 
 	mono_method = p_method;
 
+	method_info_fetched = false;
+
 	attrs_fetched = false;
 	attributes = NULL;
 
diff --git a/modules/mono/mono_gd/gd_mono_method.h b/modules/mono/mono_gd/gd_mono_method.h
index 444ec2a67d3..6c3ae5fce0a 100644
--- a/modules/mono/mono_gd/gd_mono_method.h
+++ b/modules/mono/mono_gd/gd_mono_method.h
@@ -43,6 +43,9 @@ class GDMonoMethod : public GDMonoClassMember {
 	ManagedType return_type;
 	Vector<ManagedType> param_types;
 
+	bool method_info_fetched;
+	MethodInfo method_info;
+
 	bool attrs_fetched;
 	MonoCustomAttrInfo *attributes;
 
@@ -83,6 +86,8 @@ public:
 	void get_parameter_names(Vector<StringName> &names) const;
 	void get_parameter_types(Vector<ManagedType> &types) const;
 
+	const MethodInfo &get_method_info();
+
 	GDMonoMethod(StringName p_name, MonoMethod *p_method);
 	~GDMonoMethod();
 };

From b26487a2b46e6a15af2cbbed88755fd33d35e935 Mon Sep 17 00:00:00 2001
From: Ben Rog-Wilhelm <zorba-githubdesktop20180420@pavlovian.net>
Date: Sat, 8 Dec 2018 00:54:12 -0800
Subject: [PATCH 2/2] Tweaks after feedback

---
 editor/property_selector.cpp           |  3 ---
 modules/mono/csharp_script.cpp         |  1 +
 modules/mono/mono_gd/gd_mono_class.cpp | 26 ++++++++++----------------
 modules/mono/mono_gd/gd_mono_class.h   |  2 --
 4 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/editor/property_selector.cpp b/editor/property_selector.cpp
index ff3fc649071..a8c97be9367 100644
--- a/editor/property_selector.cpp
+++ b/editor/property_selector.cpp
@@ -210,9 +210,6 @@ void PropertySelector::_update_search() {
 
 				methods.push_back(MethodInfo("*Script Methods"));
 				Object::cast_to<Script>(obj)->get_script_method_list(&methods);
-				// TODO: Filter out things unsuitable for explicit calls, like constructors.
-
-				// TODO: We should handle script class hierarchies somehow. Right now we don't; it's unclear where this functionality should live.
 			}
 
 			StringName base = base_type;
diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp
index ba31f12d374..943d95bfc94 100644
--- a/modules/mono/csharp_script.cpp
+++ b/modules/mono/csharp_script.cpp
@@ -2479,6 +2479,7 @@ void CSharpScript::get_script_method_list(List<MethodInfo> *p_list) const {
 	if (!script_class)
 		return;
 
+	// TODO: Filter out things unsuitable for explicit calls, like constructors.
 	const Vector<GDMonoMethod *> &methods = script_class->get_all_methods();
 	for (int i = 0; i < methods.size(); ++i) {
 		p_list->push_back(methods[i]->get_method_info());
diff --git a/modules/mono/mono_gd/gd_mono_class.cpp b/modules/mono/mono_gd/gd_mono_class.cpp
index 400735bb20b..c55f9160bd4 100644
--- a/modules/mono/mono_gd/gd_mono_class.cpp
+++ b/modules/mono/mono_gd/gd_mono_class.cpp
@@ -139,20 +139,6 @@ void GDMonoClass::fetch_attributes() {
 	attrs_fetched = true;
 }
 
-void GDMonoClass::fetch_method_list() {
-
-	if (method_list_fetched)
-		return;
-
-	void *iter = NULL;
-	MonoMethod *raw_method = NULL;
-	while ((raw_method = mono_class_get_methods(get_mono_ptr(), &iter)) != NULL) {
-		method_list.push_back(memnew(GDMonoMethod(mono_method_get_name(raw_method), raw_method)));
-	}
-
-	method_list_fetched = true;
-}
-
 void GDMonoClass::fetch_methods_with_godot_api_checks(GDMonoClass *p_native_base) {
 
 	CRASH_COND(!CACHED_CLASS(GodotObject)->is_assignable_from(this));
@@ -465,8 +451,16 @@ const Vector<GDMonoClass *> &GDMonoClass::get_all_delegates() {
 }
 
 const Vector<GDMonoMethod *> &GDMonoClass::get_all_methods() {
-	if (!method_list_fetched)
-		fetch_method_list();
+
+	if (!method_list_fetched) {
+		void *iter = NULL;
+		MonoMethod *raw_method = NULL;
+		while ((raw_method = mono_class_get_methods(get_mono_ptr(), &iter)) != NULL) {
+			method_list.push_back(memnew(GDMonoMethod(mono_method_get_name(raw_method), raw_method)));
+		}
+
+		method_list_fetched = true;
+	}
 
 	return method_list;
 }
diff --git a/modules/mono/mono_gd/gd_mono_class.h b/modules/mono/mono_gd/gd_mono_class.h
index 4199eb22c6a..689001f494a 100644
--- a/modules/mono/mono_gd/gd_mono_class.h
+++ b/modules/mono/mono_gd/gd_mono_class.h
@@ -102,8 +102,6 @@ class GDMonoClass {
 	friend class GDMonoAssembly;
 	GDMonoClass(const StringName &p_namespace, const StringName &p_name, MonoClass *p_class, GDMonoAssembly *p_assembly);
 
-	void fetch_method_list();
-
 public:
 	static String get_full_name(MonoClass *p_mono_class);
 	static MonoType *get_mono_type(MonoClass *p_mono_class);