godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-25 15:37:42 +00:00
Code Releases Wiki Activity

Merge pull request #111878 from mu3657/master

Browse Source 
Fix: Add Variant to type autocompletion
This commit is contained in:
Thaddeus Crews
2025-11-21 14:46:44 -06:00
parent b51320f22e f428358c69
commit e873576d71
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/gdscript/gdscript_editor.cpp
View File

@@ -1027,16 +1027,14 @@ static void _find_annotation_arguments(const GDScriptParser::AnnotationNode *p_a
} }
} }
static void _find_built_in_variants(HashMap<String, ScriptLanguage::CodeCompletionOption> &r_result, bool exclude_nil = false) { static void _find_built_in_variants(HashMap<String, ScriptLanguage::CodeCompletionOption> &r_result) {
for (int i = 0; i < Variant::VARIANT_MAX; i++) { for (int i = 0; i < Variant::VARIANT_MAX; i++) {
if (!exclude_nil && Variant::Type(i) == Variant::Type::NIL) { if (Variant::Type(i) == Variant::Type::NIL) {
ScriptLanguage::CodeCompletionOption option("null", ScriptLanguage::CODE_COMPLETION_KIND_CLASS); continue;
r_result.insert(option.display, option); }
} else {
ScriptLanguage::CodeCompletionOption option(Variant::get_type_name(Variant::Type(i)), ScriptLanguage::CODE_COMPLETION_KIND_CLASS); ScriptLanguage::CodeCompletionOption option(Variant::get_type_name(Variant::Type(i)), ScriptLanguage::CODE_COMPLETION_KIND_CLASS);
r_result.insert(option.display, option); r_result.insert(option.display, option);
} }
}
} }
static void _find_global_enums(HashMap<String, ScriptLanguage::CodeCompletionOption> &r_result) { static void _find_global_enums(HashMap<String, ScriptLanguage::CodeCompletionOption> &r_result) {
@@ -1050,7 +1048,13 @@ static void _find_global_enums(HashMap<String, ScriptLanguage::CodeCompletionOpt
static void _list_available_types(bool p_inherit_only, GDScriptParser::CompletionContext &p_context, HashMap<String, ScriptLanguage::CodeCompletionOption> &r_result) { static void _list_available_types(bool p_inherit_only, GDScriptParser::CompletionContext &p_context, HashMap<String, ScriptLanguage::CodeCompletionOption> &r_result) {
// Built-in Variant Types // Built-in Variant Types
_find_built_in_variants(r_result, true); _find_built_in_variants(r_result);
// Variant meta-type
if (!p_inherit_only) {
ScriptLanguage::CodeCompletionOption variant_option("Variant", ScriptLanguage::CODE_COMPLETION_KIND_CLASS);
r_result.insert(variant_option.display, variant_option);
}
LocalVector<StringName> native_types; LocalVector<StringName> native_types;
ClassDB::get_class_list(native_types); ClassDB::get_class_list(native_types);