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

GDScript: Support % in shorthand for get_node

Browse Source 
The `%` is used in scene unique nodes. Now `%` can also be used instead
of `$` for the shorthand, besides being allowed generally anywhere in
the path as the prefix for a node name.
This commit is contained in:
George Marques
2022-05-26 12:56:39 -03:00
parent d81c5eab8c
commit eba3e0a9fc
11 changed files with 182 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
editor/plugins/script_text_editor.cpp
View File

@@ -1568,9 +1568,11 @@ void ScriptTextEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data
continue;
}
bool is_unique = false;
String path;
if (node->is_unique_name_in_owner()) {
path = "%" + node->get_name();
path = node->get_name();
is_unique = true;
} else {
path = sn->get_path_to(node);
}
@@ -1583,9 +1585,9 @@ void ScriptTextEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data
String variable_name = String(node->get_name()).camelcase_to_underscore(true).validate_identifier();
if (use_type) {
text_to_drop += vformat("@onready var %s: %s = $%s\n", variable_name, node->get_class_name(), path);
text_to_drop += vformat("@onready var %s: %s = %s%s\n", variable_name, node->get_class_name(), is_unique ? "%" : "$", path);
} else {
text_to_drop += vformat("@onready var %s = $%s\n", variable_name, path);
text_to_drop += vformat("@onready var %s = %s%s\n", variable_name, is_unique ? "%" : "$", path);
}
}
} else {
@@ -1600,19 +1602,22 @@ void ScriptTextEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data
continue;
}
bool is_unique = false;
String path;
if (node->is_unique_name_in_owner()) {
path = "%" + node->get_name();
path = node->get_name();
is_unique = true;
} else {
path = sn->get_path_to(node);
}
for (const String &segment : path.split("/")) {
if (!segment.is_valid_identifier()) {
path = path.c_escape().quote(quote_style);
break;
}
}
text_to_drop += "$" + path;
text_to_drop += (is_unique ? "%" : "$") + path;
}
}