From 70b428041b88e30c0451e2b64aad7a936020c166 Mon Sep 17 00:00:00 2001 From: Micky Date: Wed, 3 Jan 2024 22:41:52 +0100 Subject: [PATCH] Add autocompletion for InputMap's methods --- core/input/input_map.cpp | 29 +++++++++++++++++++++++++++++ core/input/input_map.h | 4 ++++ 2 files changed, 33 insertions(+) diff --git a/core/input/input_map.cpp b/core/input/input_map.cpp index 70041ecfd66..5d6de1ad9a3 100644 --- a/core/input/input_map.cpp +++ b/core/input/input_map.cpp @@ -85,6 +85,35 @@ String InputMap::suggest_actions(const StringName &p_action) const { return error_message; } +#ifdef TOOLS_ENABLED +void InputMap::get_argument_options(const StringName &p_function, int p_idx, List *r_options) const { + const String pf = p_function; + bool first_argument_is_action = false; + if (p_idx == 0) { + first_argument_is_action = (pf == "has_action" || pf == "erase_action" || + pf == "action_set_deadzone" || pf == "action_get_deadzone" || + pf == "action_has_event" || pf == "action_add_event" || pf == "action_get_events" || + pf == "action_erase_event" || pf == "action_erase_events"); + } + if (first_argument_is_action || (p_idx == 1 && pf == "event_is_action")) { + // Cannot rely on `get_actions()`, otherwise the actions would be in the context of the Editor (no user-defined actions). + List pinfo; + ProjectSettings::get_singleton()->get_property_list(&pinfo); + + for (const PropertyInfo &pi : pinfo) { + if (!pi.name.begins_with("input/")) { + continue; + } + + String name = pi.name.substr(pi.name.find("/") + 1, pi.name.length()); + r_options->push_back(name.quote()); + } + } + + Object::get_argument_options(p_function, p_idx, r_options); +} +#endif + void InputMap::add_action(const StringName &p_action, float p_deadzone) { ERR_FAIL_COND_MSG(input_map.has(p_action), "InputMap already has action \"" + String(p_action) + "\"."); input_map[p_action] = Action(); diff --git a/core/input/input_map.h b/core/input/input_map.h index 6407ea489ed..3774a131e6f 100644 --- a/core/input/input_map.h +++ b/core/input/input_map.h @@ -95,6 +95,10 @@ public: String suggest_actions(const StringName &p_action) const; +#ifdef TOOLS_ENABLED + virtual void get_argument_options(const StringName &p_function, int p_idx, List *r_options) const override; +#endif + String get_builtin_display_name(const String &p_name) const; // Use an Ordered Map so insertion order is preserved. We want the elements to be 'grouped' somewhat. const HashMap>> &get_builtins();