godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Suggest scene unique nodes in get_node autocompletion

Browse Source
This commit is contained in:
HolonProduction
2023-11-26 15:41:29 +01:00
parent fa4a65387e
commit 8cc85515af
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/gdscript/gdscript_editor.cpp
View File

@@ -3112,6 +3112,11 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
List<String> opts; List<String> opts;
p_owner->get_argument_options("get_node", 0, &opts); p_owner->get_argument_options("get_node", 0, &opts);
bool for_unique_name = false;
if (completion_context.node != nullptr && completion_context.node->type == GDScriptParser::Node::GET_NODE && !static_cast<GDScriptParser::GetNodeNode *>(completion_context.node)->use_dollar) {
for_unique_name = true;
}
for (const String &E : opts) { for (const String &E : opts) {
r_forced = true; r_forced = true;
String opt = E.strip_edges(); String opt = E.strip_edges();
@@ -3120,6 +3125,14 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
// or handle NodePaths which are valid identifiers and don't need quotes. // or handle NodePaths which are valid identifiers and don't need quotes.
opt = opt.unquote(); opt = opt.unquote();
} }
if (for_unique_name) {
if (!opt.begins_with("%")) {
continue;
}
opt = opt.substr(1);
}
// The path needs quotes if it's not a valid identifier (with an exception // The path needs quotes if it's not a valid identifier (with an exception
// for "/" as path separator, which also doesn't require quotes). // for "/" as path separator, which also doesn't require quotes).
if (!opt.replace("/", "_").is_valid_identifier()) { if (!opt.replace("/", "_").is_valid_identifier()) {
@@ -3131,6 +3144,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
options.insert(option.display, option); options.insert(option.display, option);
} }
if (!for_unique_name) {
// Get autoloads. // Get autoloads.
for (const KeyValue<StringName, ProjectSettings::AutoloadInfo> &E : ProjectSettings::get_singleton()->get_autoload_list()) { for (const KeyValue<StringName, ProjectSettings::AutoloadInfo> &E : ProjectSettings::get_singleton()->get_autoload_list()) {
String path = "/root/" + E.key; String path = "/root/" + E.key;
@@ -3138,6 +3152,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
options.insert(option.display, option); options.insert(option.display, option);
} }
} }
}
} break; } break;
case GDScriptParser::COMPLETION_SUPER_METHOD: { case GDScriptParser::COMPLETION_SUPER_METHOD: {
if (!completion_context.current_class) { if (!completion_context.current_class) {

4
scene/main/node.cpp
View File

@@ -3029,6 +3029,10 @@ static void _add_nodes_to_options(const Node *p_base, const Node *p_node, List<S
if (p_node != p_base && !p_node->get_owner()) { if (p_node != p_base && !p_node->get_owner()) {
return; return;
} }
if (p_node->is_unique_name_in_owner() && p_node->get_owner() == p_base) {
String n = "%" + p_node->get_name();
r_options->push_back(n.quote());
}
String n = p_base->get_path_to(p_node); String n = p_base->get_path_to(p_node);
r_options->push_back(n.quote()); r_options->push_back(n.quote());
for (int i = 0; i < p_node->get_child_count(); i++) { for (int i = 0; i < p_node->get_child_count(); i++) {