diff --git a/doc/classes/@GlobalScope.xml b/doc/classes/@GlobalScope.xml index 11c1c57a436..a9f922e7e99 100644 --- a/doc/classes/@GlobalScope.xml +++ b/doc/classes/@GlobalScope.xml @@ -30,6 +30,9 @@ The [Geometry] singleton. + + The [GodotSharp] singleton. + The [IP] singleton. diff --git a/editor/doc/doc_data.cpp b/editor/doc/doc_data.cpp index fe3eba593e9..34765c0c100 100644 --- a/editor/doc/doc_data.cpp +++ b/editor/doc/doc_data.cpp @@ -643,7 +643,9 @@ void DocData::generate(bool p_basic_types) { } } - //built in script reference + // Built-in script reference. + // We only add a doc entry for languages which actually define any built-in + // methods or constants. { @@ -651,12 +653,11 @@ void DocData::generate(bool p_basic_types) { ScriptLanguage *lang = ScriptServer::get_language(i); String cname = "@" + lang->get_name(); - class_list[cname] = ClassDoc(); - ClassDoc &c = class_list[cname]; + ClassDoc c; c.name = cname; + // Get functions. List minfo; - lang->get_public_functions(&minfo); for (List::Element *E = minfo.front(); E; E = E->next()) { @@ -690,6 +691,7 @@ void DocData::generate(bool p_basic_types) { c.methods.push_back(md); } + // Get constants. List > cinfo; lang->get_public_constants(&cinfo); @@ -700,6 +702,13 @@ void DocData::generate(bool p_basic_types) { cd.value = E->get().second; c.constants.push_back(cd); } + + // Skip adding the lang if it doesn't expose anything (e.g. C#). + if (c.methods.empty() && c.constants.empty()) { + continue; + } + + class_list[cname] = c; } } } diff --git a/modules/gdnative/config.py b/modules/gdnative/config.py index 37e25a46d4b..bf371ed95b1 100644 --- a/modules/gdnative/config.py +++ b/modules/gdnative/config.py @@ -8,7 +8,6 @@ def configure(env): def get_doc_classes(): return [ - "@NativeScript", "ARVRInterfaceGDNative", "GDNative", "GDNativeLibrary", diff --git a/modules/gdnative/doc_classes/@NativeScript.xml b/modules/gdnative/doc_classes/@NativeScript.xml deleted file mode 100644 index 7c881c689db..00000000000 --- a/modules/gdnative/doc_classes/@NativeScript.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/modules/mono/config.py b/modules/mono/config.py index 775307e2c97..bd0c129489f 100644 --- a/modules/mono/config.py +++ b/modules/mono/config.py @@ -57,7 +57,6 @@ def configure(env): def get_doc_classes(): return [ - "@C#", "CSharpScript", "GodotSharp", ] diff --git a/modules/mono/doc_classes/@C#.xml b/modules/mono/doc_classes/@C#.xml deleted file mode 100644 index 826c106d7e3..00000000000 --- a/modules/mono/doc_classes/@C#.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/modules/visual_script/config.py b/modules/visual_script/config.py index bd459ca3449..b15479797c1 100644 --- a/modules/visual_script/config.py +++ b/modules/visual_script/config.py @@ -8,7 +8,6 @@ def configure(env): def get_doc_classes(): return [ - "@VisualScript", "VisualScriptBasicTypeConstant", "VisualScriptBuiltinFunc", "VisualScriptClassConstant", diff --git a/modules/visual_script/doc_classes/@VisualScript.xml b/modules/visual_script/doc_classes/@VisualScript.xml deleted file mode 100644 index 5acbb80fd52..00000000000 --- a/modules/visual_script/doc_classes/@VisualScript.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - Built-in visual script functions. - - - A list of built-in visual script functions, see [VisualScriptBuiltinFunc] and [VisualScript]. - - - - - - - -