vala: Support static methods in error-domains

Actually generate methods defined inside error-domains and state that
instance methods are not supported yet.

See https://gitlab.gnome.org/GNOME/vala/issues/829

2 files changed, 1 insertions, 34 deletions

diff --git a/valadoc/tests/drivers/api-test.data.vapi b/valadoc/tests/drivers/api-test.data.vapi
index 788a6bab6..37871f012 100644
--- a/valadoc/tests/drivers/api-test.data.vapi
+++ b/valadoc/tests/drivers/api-test.data.vapi
@@ -25,7 +25,6 @@ public errordomain TestErrDomGlobal {
 	ERROR1,
 	ERROR2;
 
-	public void method ();
 	public static void static_method ();
 }
 
diff --git a/valadoc/tests/drivers/generic-api-test.vala b/valadoc/tests/drivers/generic-api-test.vala
index 94f572cfd..5d20405d6 100644
--- a/valadoc/tests/drivers/generic-api-test.vala
+++ b/valadoc/tests/drivers/generic-api-test.vala
@@ -257,45 +257,13 @@ public static void test_erroromain_global (Api.ErrorDomain? err, Api.Package pkg
 	assert (errc2 == true);
 
 
-
-	Vala.List<Api.Node> methods = err.get_children_by_type (Api.NodeType.METHOD, false);
+	Vala.List<Api.Node> methods = err.get_children_by_type (Api.NodeType.STATIC_METHOD, false);
 	assert (methods.size == 1);
 
 	Api.Method method = methods.get (0) as Api.Method;
 	assert (method != null);
 
 	// (.Method check)
-	assert (method.get_cname () == "test_err_dom_global_method");
-	//assert (method.get_dbus_name () == null);
-	//assert (method.get_dbus_result_name () == null);
-	//assert (method.is_dbus_visible == false);
-	assert (method.base_method == null);
-	assert (method.is_yields == false);
-	assert (method.is_abstract == false);
-	assert (method.is_virtual == false);
-	assert (method.is_override == false);
-	assert (method.is_static == false);
-	assert (method.is_constructor == false);
-	assert (method.is_inline == false);
-	// (.Symbol check)
-	assert (method.is_deprecated == false);
-	assert (method.accessibility == Vala.SymbolAccessibility.PUBLIC);
-	// (.Node)
-	assert (method.get_full_name () == "TestErrDomGlobal.method");
-	assert (method.get_filename () == "api-test.data.vapi");
-	assert (method.name == "method");
-	assert (method.nspace == global_ns);
-	assert (method.package == pkg);
-
-
-
-	methods = err.get_children_by_type (Api.NodeType.STATIC_METHOD, false);
-	assert (methods.size == 1);
-
-	method = methods.get (0) as Api.Method;
-	assert (method != null);
-
-	// (.Method check)
 	assert (method.get_cname () == "test_err_dom_global_static_method");
 	//assert (method.get_dbus_name () == null);
 	//assert (method.get_dbus_result_name () == null);