1 files changed, 30 insertions, 24 deletions

diff --git a/core/object/script_language_extension.h b/core/object/script_language_extension.h
index 2c53139ec2..c32fb9d85b 100644
--- a/core/object/script_language_extension.h
+++ b/core/object/script_language_extension.h
@@ -82,9 +82,10 @@ public:
 		GDVIRTUAL_REQUIRED_CALL(_get_documentation, doc);
 
 		Vector<DocData::ClassDoc> class_doc;
-#ifndef _MSC_VER
-#warning missing conversion from documentation to ClassDoc
-#endif
+		for (int i = 0; i < doc.size(); i++) {
+			class_doc.append(DocData::ClassDoc::from_dict(doc[i]));
+		}
+
 		return class_doc;
 	}
 #endif // TOOLS_ENABLED
@@ -173,28 +174,12 @@ public:
 
 	EXBIND0RC(bool, is_placeholder_fallback_enabled)
 
-	GDVIRTUAL0RC(TypedArray<Dictionary>, _get_rpc_methods)
+	GDVIRTUAL0RC(Variant, _get_rpc_config)
 
-	virtual const Vector<Multiplayer::RPCConfig> get_rpc_methods() const override {
-		TypedArray<Dictionary> ret;
-		GDVIRTUAL_REQUIRED_CALL(_get_rpc_methods, ret);
-		Vector<Multiplayer::RPCConfig> rpcret;
-		for (int i = 0; i < ret.size(); i++) {
-			Dictionary d = ret[i];
-			Multiplayer::RPCConfig rpc;
-			ERR_CONTINUE(!d.has("name"));
-			rpc.name = d["name"];
-			ERR_CONTINUE(!d.has("rpc_mode"));
-			rpc.rpc_mode = Multiplayer::RPCMode(int(d["rpc_mode"]));
-			ERR_CONTINUE(!d.has("call_local"));
-			rpc.call_local = d["call_local"];
-			ERR_CONTINUE(!d.has("transfer_mode"));
-			rpc.transfer_mode = Multiplayer::TransferMode(int(d["transfer_mode"]));
-			ERR_CONTINUE(!d.has("channel"));
-			rpc.channel = d["channel"];
-			rpcret.push_back(rpc);
-		}
-		return rpcret;
+	virtual const Variant get_rpc_config() const override {
+		Variant ret;
+		GDVIRTUAL_REQUIRED_CALL(_get_rpc_config, ret);
+		return ret;
 	}
 
 	ScriptExtension() {}
@@ -679,6 +664,14 @@ public:
 		if (native_info->get_property_list_func) {
 			uint32_t pcount;
 			const GDNativePropertyInfo *pinfo = native_info->get_property_list_func(instance, &pcount);
+
+#ifdef TOOLS_ENABLED
+			Ref<Script> script = get_script();
+			if (script->is_valid() && pcount > 0) {
+				p_list->push_back(script->get_class_category());
+			}
+#endif // TOOLS_ENABLED
+
 			for (uint32_t i = 0; i < pcount; i++) {
 				p_list->push_back(PropertyInfo(pinfo[i]));
 			}
@@ -700,6 +693,19 @@ public:
 		return Variant::NIL;
 	}
 
+	virtual bool property_can_revert(const StringName &p_name) const override {
+		if (native_info->property_can_revert_func) {
+			return native_info->property_can_revert_func(instance, (const GDNativeStringNamePtr)&p_name);
+		}
+		return false;
+	}
+	virtual bool property_get_revert(const StringName &p_name, Variant &r_ret) const override {
+		if (native_info->property_get_revert_func) {
+			return native_info->property_get_revert_func(instance, (const GDNativeStringNamePtr)&p_name, (GDNativeVariantPtr)&r_ret);
+		}
+		return false;
+	}
+
 	virtual Object *get_owner() override {
 		if (native_info->get_owner_func) {
 			return (Object *)native_info->get_owner_func(instance);