summaryrefslogtreecommitdiffstats
path: root/modules/gdscript/editor/gdscript_translation_parser_plugin.cpp
diff options
context:
space:
mode:
authorDanil Alexeev <danil@alexeev.xyz>2023-12-23 17:09:12 +0300
committerDanil Alexeev <danil@alexeev.xyz>2023-12-23 20:55:16 +0300
commite07ec89bdf186844494142a56dd764ad712e4cdb (patch)
tree23c65dc1968e7c4677c477469077c6deb3543f8c /modules/gdscript/editor/gdscript_translation_parser_plugin.cpp
parent13a0d6e9b253654f5cc2a44f3d0b3cae10440443 (diff)
downloadredot-engine-e07ec89bdf186844494142a56dd764ad712e4cdb.tar.gz
GDScript: Fix POT generator skips some nodes (part 2)
Diffstat (limited to 'modules/gdscript/editor/gdscript_translation_parser_plugin.cpp')
-rw-r--r--modules/gdscript/editor/gdscript_translation_parser_plugin.cpp104
1 files changed, 48 insertions, 56 deletions
diff --git a/modules/gdscript/editor/gdscript_translation_parser_plugin.cpp b/modules/gdscript/editor/gdscript_translation_parser_plugin.cpp
index f55b00ebe1..316281209a 100644
--- a/modules/gdscript/editor/gdscript_translation_parser_plugin.cpp
+++ b/modules/gdscript/editor/gdscript_translation_parser_plugin.cpp
@@ -47,10 +47,7 @@ Error GDScriptEditorTranslationParserPlugin::parse_file(const String &p_path, Ve
Error err;
Ref<Resource> loaded_res = ResourceLoader::load(p_path, "", ResourceFormatLoader::CACHE_MODE_REUSE, &err);
- if (err) {
- ERR_PRINT("Failed to load " + p_path);
- return err;
- }
+ ERR_FAIL_COND_V_MSG(err, err, "Failed to load " + p_path);
ids = r_ids;
ids_ctx_plural = r_ids_ctx_plural;
@@ -59,11 +56,11 @@ Error GDScriptEditorTranslationParserPlugin::parse_file(const String &p_path, Ve
GDScriptParser parser;
err = parser.parse(source_code, p_path, false);
- ERR_FAIL_COND_V_MSG(err != OK, err, "Failed to parse GDScript with GDScriptParser.");
+ ERR_FAIL_COND_V_MSG(err, err, "Failed to parse GDScript with GDScriptParser.");
GDScriptAnalyzer analyzer(&parser);
err = analyzer.analyze();
- ERR_FAIL_COND_V_MSG(err != OK, err, "Failed to analyze GDScript with GDScriptAnalyzer.");
+ ERR_FAIL_COND_V_MSG(err, err, "Failed to analyze GDScript with GDScriptAnalyzer.");
// Traverse through the parsed tree from GDScriptParser.
GDScriptParser::ClassNode *c = parser.get_tree();
@@ -197,11 +194,7 @@ void GDScriptEditorTranslationParserPlugin::_assess_expression(const GDScriptPar
_assess_expression(binary_op_node->right_operand);
} break;
case GDScriptParser::Node::CALL: {
- const GDScriptParser::CallNode *call_node = static_cast<const GDScriptParser::CallNode *>(p_expression);
- _extract_from_call(call_node);
- for (int i = 0; i < call_node->arguments.size(); i++) {
- _assess_expression(call_node->arguments[i]);
- }
+ _assess_call(static_cast<const GDScriptParser::CallNode *>(p_expression));
} break;
case GDScriptParser::Node::CAST: {
_assess_expression(static_cast<const GDScriptParser::CastNode *>(p_expression)->operand);
@@ -241,6 +234,9 @@ void GDScriptEditorTranslationParserPlugin::_assess_expression(const GDScriptPar
}
void GDScriptEditorTranslationParserPlugin::_assess_assignment(const GDScriptParser::AssignmentNode *p_assignment) {
+ _assess_expression(p_assignment->assignee);
+ _assess_expression(p_assignment->assigned_value);
+
// Extract the translatable strings coming from assignments. For example, get_node("Label").text = "____"
StringName assignee_name;
@@ -258,26 +254,18 @@ void GDScriptEditorTranslationParserPlugin::_assess_assignment(const GDScriptPar
if (assignee_name != StringName() && assignment_patterns.has(assignee_name) && _is_constant_string(p_assignment->assigned_value)) {
// If the assignment is towards one of the extract patterns (text, tooltip_text etc.), and the value is a constant string, we collect the string.
ids->push_back(p_assignment->assigned_value->reduced_value);
- } else if (assignee_name == fd_filters && p_assignment->assigned_value->type == GDScriptParser::Node::CALL) {
- // FileDialog.filters accepts assignment in the form of PackedStringArray. For example,
- // get_node("FileDialog").filters = PackedStringArray(["*.png ; PNG Images","*.gd ; GDScript Files"]).
-
- const GDScriptParser::CallNode *call_node = static_cast<const GDScriptParser::CallNode *>(p_assignment->assigned_value);
- if (!call_node->arguments.is_empty() && call_node->arguments[0]->type == GDScriptParser::Node::ARRAY) {
- const GDScriptParser::ArrayNode *array_node = static_cast<const GDScriptParser::ArrayNode *>(call_node->arguments[0]);
-
- // Extract the name in "extension ; name" of PackedStringArray.
- for (int i = 0; i < array_node->elements.size(); i++) {
- _extract_fd_constant_strings(array_node->elements[i]);
- }
- }
- } else {
- // If the assignee is not in extract patterns or the assigned_value is not a constant string, try to see if the assigned_value contains tr().
- _assess_expression(p_assignment->assigned_value);
+ } else if (assignee_name == fd_filters) {
+ // Extract from `get_node("FileDialog").filters = <filter array>`.
+ _extract_fd_filter_array(p_assignment->assigned_value);
}
}
-void GDScriptEditorTranslationParserPlugin::_extract_from_call(const GDScriptParser::CallNode *p_call) {
+void GDScriptEditorTranslationParserPlugin::_assess_call(const GDScriptParser::CallNode *p_call) {
+ _assess_expression(p_call->callee);
+ for (int i = 0; i < p_call->arguments.size(); i++) {
+ _assess_expression(p_call->arguments[i]);
+ }
+
// Extract the translatable strings coming from function calls. For example:
// tr("___"), get_node("Label").set_text("____"), get_node("LineEdit").set_placeholder("____").
@@ -322,52 +310,56 @@ void GDScriptEditorTranslationParserPlugin::_extract_from_call(const GDScriptPar
ids_ctx_plural->push_back(id_ctx_plural);
}
} else if (first_arg_patterns.has(function_name)) {
- if (_is_constant_string(p_call->arguments[0])) {
+ if (!p_call->arguments.is_empty() && _is_constant_string(p_call->arguments[0])) {
ids->push_back(p_call->arguments[0]->reduced_value);
}
} else if (second_arg_patterns.has(function_name)) {
- if (_is_constant_string(p_call->arguments[1])) {
+ if (p_call->arguments.size() > 1 && _is_constant_string(p_call->arguments[1])) {
ids->push_back(p_call->arguments[1]->reduced_value);
}
} else if (function_name == fd_add_filter) {
// Extract the 'JPE Images' in this example - get_node("FileDialog").add_filter("*.jpg; JPE Images").
- _extract_fd_constant_strings(p_call->arguments[0]);
- } else if (function_name == fd_set_filter && p_call->arguments[0]->type == GDScriptParser::Node::CALL) {
- // FileDialog.set_filters() accepts assignment in the form of PackedStringArray. For example,
- // get_node("FileDialog").set_filters( PackedStringArray(["*.png ; PNG Images","*.gd ; GDScript Files"])).
-
- const GDScriptParser::CallNode *call_node = static_cast<const GDScriptParser::CallNode *>(p_call->arguments[0]);
- if (call_node->arguments[0]->type == GDScriptParser::Node::ARRAY) {
- const GDScriptParser::ArrayNode *array_node = static_cast<const GDScriptParser::ArrayNode *>(call_node->arguments[0]);
- for (int i = 0; i < array_node->elements.size(); i++) {
- _extract_fd_constant_strings(array_node->elements[i]);
- }
+ if (!p_call->arguments.is_empty()) {
+ _extract_fd_filter_string(p_call->arguments[0]);
}
- }
-
- if (p_call->callee && p_call->callee->type == GDScriptParser::Node::SUBSCRIPT) {
- const GDScriptParser::SubscriptNode *subscript_node = static_cast<const GDScriptParser::SubscriptNode *>(p_call->callee);
- if (subscript_node->base && subscript_node->base->type == GDScriptParser::Node::CALL) {
- const GDScriptParser::CallNode *call_node = static_cast<const GDScriptParser::CallNode *>(subscript_node->base);
- _extract_from_call(call_node);
+ } else if (function_name == fd_set_filter) {
+ // Extract from `get_node("FileDialog").set_filters(<filter array>)`.
+ if (!p_call->arguments.is_empty()) {
+ _extract_fd_filter_array(p_call->arguments[0]);
}
}
}
-void GDScriptEditorTranslationParserPlugin::_extract_fd_constant_strings(const GDScriptParser::ExpressionNode *p_expression) {
+void GDScriptEditorTranslationParserPlugin::_extract_fd_filter_string(const GDScriptParser::ExpressionNode *p_expression) {
// Extract the name in "extension ; name".
-
if (_is_constant_string(p_expression)) {
- String arg_val = p_expression->reduced_value;
- PackedStringArray arr = arg_val.split(";", true);
- if (arr.size() != 2) {
- ERR_PRINT("Argument for setting FileDialog has bad format.");
- return;
- }
+ PackedStringArray arr = p_expression->reduced_value.operator String().split(";", true);
+ ERR_FAIL_COND_MSG(arr.size() != 2, "Argument for setting FileDialog has bad format.");
ids->push_back(arr[1].strip_edges());
}
}
+void GDScriptEditorTranslationParserPlugin::_extract_fd_filter_array(const GDScriptParser::ExpressionNode *p_expression) {
+ const GDScriptParser::ArrayNode *array_node = nullptr;
+
+ if (p_expression->type == GDScriptParser::Node::ARRAY) {
+ // Extract from `["*.png ; PNG Images","*.gd ; GDScript Files"]` (implicit cast to `PackedStringArray`).
+ array_node = static_cast<const GDScriptParser::ArrayNode *>(p_expression);
+ } else if (p_expression->type == GDScriptParser::Node::CALL) {
+ // Extract from `PackedStringArray(["*.png ; PNG Images","*.gd ; GDScript Files"])`.
+ const GDScriptParser::CallNode *call_node = static_cast<const GDScriptParser::CallNode *>(p_expression);
+ if (call_node->get_callee_type() == GDScriptParser::Node::IDENTIFIER && call_node->function_name == SNAME("PackedStringArray") && !call_node->arguments.is_empty() && call_node->arguments[0]->type == GDScriptParser::Node::ARRAY) {
+ array_node = static_cast<const GDScriptParser::ArrayNode *>(call_node->arguments[0]);
+ }
+ }
+
+ if (array_node) {
+ for (int i = 0; i < array_node->elements.size(); i++) {
+ _extract_fd_filter_string(array_node->elements[i]);
+ }
+ }
+}
+
GDScriptEditorTranslationParserPlugin::GDScriptEditorTranslationParserPlugin() {
assignment_patterns.insert("text");
assignment_patterns.insert("placeholder_text");