gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-16 01:59:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
godot/editor/project_converter_3_to_4.cpp

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

2960 lines
157 KiB
C++
Raw Normal View History

One Copyright Update to rule them all As many open source projects have started doing it, we're removing the current year from the copyright notice, so that we don't need to bump it every year. It seems like only the first year of publication is technically relevant for copyright notices, and even that seems to be something that many companies stopped listing altogether (in a version controlled codebase, the commits are a much better source of date of publication than a hardcoded copyright statement). We also now list Godot Engine contributors first as we're collectively the current maintainers of the project, and we clarify that the "exclusive" copyright of the co-founders covers the timespan before opensourcing (their further contributions are included as part of Godot Engine contributors). Also fixed "cf." Frenchism - it's meant as "refer to / see".
2023-01-05 12:25:55 +00:00
/**************************************************************************/
/* project_converter_3_to_4.cpp */
/**************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/**************************************************************************/
/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
#include "project_converter_3_to_4.h"
Add hint for identifiers renamed since Godot 3
2022-03-23 17:54:41 +00:00
#ifndef DISABLE_DEPRECATED
Move definition of const int ERROR_CODE to be reachable by all functions.
2022-06-19 12:52:04 +00:00
Fix no-regex build for ProjectConverter3to4 Fixes #72649.
2023-02-03 14:25:54 +00:00
#include "modules/modules_enabled.gen.h" // For regex.
#ifdef MODULE_REGEX_ENABLED
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
#include "core/error/error_macros.h"
Replace File/Directory with FileAccess/DirAccess
2022-09-05 11:01:31 +00:00
#include "core/io/dir_access.h"
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
#include "core/io/file_access.h"
#include "core/object/ref_counted.h"
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
#include "core/os/time.h"
#include "core/templates/hash_map.h"
#include "core/templates/list.h"
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
#include "editor/renames_map_3_to_4.h"
#include "modules/regex/regex.h"
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Add missed OS window settings to project converter, fix fullscreen indents. Add conversion for OS.window_maximized, vsync_enabled, window_resizable, window_borderless, get_screen_count and set_current_screen. Fix OS.window_fullscreen conversion corrupted line indents.
2023-01-08 15:13:23 +00:00
// Find "OS.set_property(x)", capturing x into $1.
static String make_regex_gds_os_property_set(String name_set) {
return String("\\bOS\\.") + name_set + "\\s*\\((.*)\\)";
}
// Find "OS.property = x", capturing x into $1 or $2.
static String make_regex_gds_os_property_assign(String name) {
return String("\\bOS\\.") + name + "\\s*=\\s*([^#]+)";
}
// Find "OS.property" OR "OS.get_property()" / "OS.is_property()".
static String make_regex_gds_os_property_get(String name, String get) {
return String("\\bOS\\.(") + get + "_)?" + name + "(\\s*\\(\\s*\\))?";
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
class ProjectConverter3To4::RegExContainer {
public:
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Custom GDScript.
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
RegEx reg_is_empty = RegEx("\\bempty\\(");
RegEx reg_super = RegEx("([\t ])\\.([a-zA-Z_])");
RegEx reg_json_to = RegEx("\\bto_json\\b");
3to4: Fix handling of arrays in connect() and JSON alignment
2022-08-15 17:48:04 +00:00
RegEx reg_json_parse = RegEx("([\t ]{0,})([^\n]+)parse_json\\(([^\n]+)");
RegEx reg_json_non_new = RegEx("([\t ]{0,})([^\n]+)JSON\\.parse\\(([^\n]+)");
Project converter: JSON.print -> JSON.stringify
2022-09-30 02:30:42 +00:00
RegEx reg_json_print = RegEx("\\bJSON\\b\\.print\\(");
Fix exported variables declaring or inferring the type were not converted correctly.
2023-04-10 16:19:26 +00:00
RegEx reg_export_simple = RegEx("export\\(([a-zA-Z0-9_]+)\\)[ ]+var[ ]+([a-zA-Z0-9_]+)");
RegEx reg_export_typed = RegEx("export\\(([a-zA-Z0-9_]+)\\)[ ]+var[ ]+([a-zA-Z0-9_]+)[ ]*:[ ]*[a-zA-Z0-9_]+");
RegEx reg_export_inferred_type = RegEx("export\\([a-zA-Z0-9_]+\\)[ ]+var[ ]+([a-zA-Z0-9_]+)[ ]*:[ ]*=");
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
RegEx reg_export_advanced = RegEx("export\\(([^)^\n]+)\\)[ ]+var[ ]+([a-zA-Z0-9_]+)([^\n]+)");
Fix GDScript code style regarding colon
2023-03-03 14:42:32 +00:00
RegEx reg_setget_setget = RegEx("var[ ]+([a-zA-Z0-9_]+)([^\n]+?)[ \t]*setget[ \t]+([a-zA-Z0-9_]+)[ \t]*,[ \t]*([a-zA-Z0-9_]+)");
RegEx reg_setget_set = RegEx("var[ ]+([a-zA-Z0-9_]+)([^\n]+?)[ \t]*setget[ \t]+([a-zA-Z0-9_]+)[ \t]*[,]*[^\n]*$");
RegEx reg_setget_get = RegEx("var[ ]+([a-zA-Z0-9_]+)([^\n]+?)[ \t]*setget[ \t]+,[ \t]*([a-zA-Z0-9_]+)[ \t]*$");
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
RegEx reg_join = RegEx("([\\(\\)a-zA-Z0-9_]+)\\.join\\(([^\n^\\)]+)\\)");
RegEx reg_image_lock = RegEx("([a-zA-Z0-9_\\.]+)\\.lock\\(\\)");
RegEx reg_image_unlock = RegEx("([a-zA-Z0-9_\\.]+)\\.unlock\\(\\)");
Add conversion for instance(), set_shader_param() and node path literals
2022-08-08 21:05:56 +00:00
RegEx reg_instantiate = RegEx("\\.instance\\(([^\\)]*)\\)");
Add missed OS window settings to project converter, fix fullscreen indents. Add conversion for OS.window_maximized, vsync_enabled, window_resizable, window_borderless, get_screen_count and set_current_screen. Fix OS.window_fullscreen conversion corrupted line indents.
2023-01-08 15:13:23 +00:00
// Simple OS properties with getters/setters.
Fix wrong OS regex in project converter
2023-02-25 21:47:49 +00:00
RegEx reg_os_current_screen = RegEx("\\bOS\\.((set_|get_)?)current_screen\\b");
RegEx reg_os_min_window_size = RegEx("\\bOS\\.((set_|get_)?)min_window_size\\b");
RegEx reg_os_max_window_size = RegEx("\\bOS\\.((set_|get_)?)max_window_size\\b");
RegEx reg_os_window_position = RegEx("\\bOS\\.((set_|get_)?)window_position\\b");
RegEx reg_os_window_size = RegEx("\\bOS\\.((set_|get_)?)window_size\\b");
Add missed OS window settings to project converter, fix fullscreen indents. Add conversion for OS.window_maximized, vsync_enabled, window_resizable, window_borderless, get_screen_count and set_current_screen. Fix OS.window_fullscreen conversion corrupted line indents.
2023-01-08 15:13:23 +00:00
RegEx reg_os_getset_screen_orient = RegEx("\\bOS\\.(s|g)et_screen_orientation\\b");
// OS property getters/setters for non trivial replacements.
RegEx reg_os_set_window_resizable = RegEx(make_regex_gds_os_property_set("set_window_resizable"));
RegEx reg_os_assign_window_resizable = RegEx(make_regex_gds_os_property_assign("window_resizable"));
RegEx reg_os_is_window_resizable = RegEx(make_regex_gds_os_property_get("window_resizable", "is"));
RegEx reg_os_set_fullscreen = RegEx(make_regex_gds_os_property_set("set_window_fullscreen"));
RegEx reg_os_assign_fullscreen = RegEx(make_regex_gds_os_property_assign("window_fullscreen"));
RegEx reg_os_is_fullscreen = RegEx(make_regex_gds_os_property_get("window_fullscreen", "is"));
RegEx reg_os_set_maximized = RegEx(make_regex_gds_os_property_set("set_window_maximized"));
RegEx reg_os_assign_maximized = RegEx(make_regex_gds_os_property_assign("window_maximized"));
RegEx reg_os_is_maximized = RegEx(make_regex_gds_os_property_get("window_maximized", "is"));
RegEx reg_os_set_minimized = RegEx(make_regex_gds_os_property_set("set_window_minimized"));
RegEx reg_os_assign_minimized = RegEx(make_regex_gds_os_property_assign("window_minimized"));
RegEx reg_os_is_minimized = RegEx(make_regex_gds_os_property_get("window_minimized", "is"));
RegEx reg_os_set_vsync = RegEx(make_regex_gds_os_property_set("set_use_vsync"));
RegEx reg_os_assign_vsync = RegEx(make_regex_gds_os_property_assign("vsync_enabled"));
RegEx reg_os_is_vsync = RegEx(make_regex_gds_os_property_get("vsync_enabled", "is"));
// OS properties specific cases & specific replacements.
RegEx reg_os_assign_screen_orient = RegEx("^(\\s*)OS\\.screen_orientation\\s*=\\s*([^#]+)"); // $1 - indent, $2 - value
RegEx reg_os_set_always_on_top = RegEx(make_regex_gds_os_property_set("set_window_always_on_top"));
RegEx reg_os_is_always_on_top = RegEx("\\bOS\\.is_window_always_on_top\\s*\\(.*\\)");
RegEx reg_os_set_borderless = RegEx(make_regex_gds_os_property_set("set_borderless_window"));
RegEx reg_os_get_borderless = RegEx("\\bOS\\.get_borderless_window\\s*\\(\\s*\\)");
RegEx reg_os_screen_orient_enum = RegEx("\\bOS\\.SCREEN_ORIENTATION_(\\w+)\\b"); // $1 - constant suffix
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// GDScript keywords.
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
RegEx keyword_gdscript_tool = RegEx("^tool");
RegEx keyword_gdscript_export_single = RegEx("^export");
Fix some typos in source.
2023-10-04 10:55:11 +00:00
RegEx keyword_gdscript_export_multi = RegEx("([\t]+)export\\b");
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
RegEx keyword_gdscript_onready = RegEx("^onready");
RegEx keyword_gdscript_remote = RegEx("^remote func");
RegEx keyword_gdscript_remotesync = RegEx("^remotesync func");
RegEx keyword_gdscript_sync = RegEx("^sync func");
RegEx keyword_gdscript_slave = RegEx("^slave func");
RegEx keyword_gdscript_puppet = RegEx("^puppet func");
RegEx keyword_gdscript_puppetsync = RegEx("^puppetsync func");
RegEx keyword_gdscript_master = RegEx("^master func");
RegEx keyword_gdscript_mastersync = RegEx("^mastersync func");
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
RegEx gdscript_comment = RegEx("^\\s*#");
RegEx csharp_comment = RegEx("^\\s*\\/\\/");
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// CSharp keywords.
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
RegEx keyword_csharp_remote = RegEx("\\[Remote(Attribute)?(\\(\\))?\\]");
RegEx keyword_csharp_remotesync = RegEx("\\[(Remote)?Sync(Attribute)?(\\(\\))?\\]");
RegEx keyword_csharp_puppet = RegEx("\\[(Puppet|Slave)(Attribute)?(\\(\\))?\\]");
RegEx keyword_csharp_puppetsync = RegEx("\\[PuppetSync(Attribute)?(\\(\\))?\\]");
RegEx keyword_csharp_master = RegEx("\\[Master(Attribute)?(\\(\\))?\\]");
RegEx keyword_csharp_mastersync = RegEx("\\[MasterSync(Attribute)?(\\(\\))?\\]");
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Colors.
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
LocalVector<RegEx *> color_regexes;
LocalVector<String> color_renamed;
Fix conversion of hex color strings in project converter
2023-09-29 12:51:37 +00:00
RegEx color_hexadecimal_short_constructor = RegEx("Color\\(\"#?([a-fA-F0-9]{1})([a-fA-F0-9]{3})\\b");
RegEx color_hexadecimal_full_constructor = RegEx("Color\\(\"#?([a-fA-F0-9]{2})([a-fA-F0-9]{6})\\b");
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Classes.
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
LocalVector<RegEx *> class_tscn_regexes;
LocalVector<RegEx *> class_gd_regexes;
LocalVector<RegEx *> class_shader_regexes;
Add keycode project conversion
2023-03-02 14:24:00 +00:00
// Keycode.
RegEx input_map_keycode = RegEx("\\b,\"((physical_)?)scancode\":(\\d+)\\b");
Add joypad input map conversion to project converter. Fixes godotengine#77314 (Input Map's joypad button numbers are not converted).
2023-05-29 14:16:46 +00:00
// Button index and joypad axis.
RegEx joypad_button_index = RegEx("\\b,\"button_index\":(\\d+),(\"pressure\":\\d+\\.\\d+,\"pressed\":(false|true))\\b");
RegEx joypad_axis = RegEx("\\b,\"axis\":(\\d+)\\b");
// Index represents Godot 3's value, entry represents Godot 4 value equivalency.
// i.e: Button4(L1 - Godot3) -> joypad_button_mappings[4]=9 -> Button9(L1 - Godot4).
int joypad_button_mappings[23] = { 0, 1, 2, 3, 9, 10, -1 /*L2*/, -1 /*R2*/, 7, 8, 4, 6, 11, 12, 13, 14, 5, 15, 16, 17, 18, 19, 20 };
// Entries for L2 and R2 are -1 since they match to joypad axes and no longer to joypad buttons in Godot 4.
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
LocalVector<RegEx *> class_regexes;
RegEx class_temp_tscn = RegEx("\\bTEMP_RENAMED_CLASS.tscn\\b");
RegEx class_temp_gd = RegEx("\\bTEMP_RENAMED_CLASS.gd\\b");
RegEx class_temp_shader = RegEx("\\bTEMP_RENAMED_CLASS.shader\\b");
LocalVector<String> class_temp_tscn_renames;
LocalVector<String> class_temp_gd_renames;
LocalVector<String> class_temp_shader_renames;
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Common.
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
LocalVector<RegEx *> enum_regexes;
LocalVector<RegEx *> gdscript_function_regexes;
LocalVector<RegEx *> project_settings_regexes;
Add 3-to-4 renames for project settings in project.godot In the ConfigFile format, the first subpath is the category and is not part of the line that the regex would match. Fixes #66125.
2023-02-27 12:34:35 +00:00
LocalVector<RegEx *> project_godot_regexes;
Add InputMap conversion All InputMap strings that changed between Godot 3 and 4 are now renamed when converting the project. This includes: - alt -> alt_pressed - shift -> shift_pressed - control -> ctrl_pressed - meta -> meta_pressed - scancode -> keycode - physical_scancode -> physical_keycode - doubleclick -> double_click
2023-01-20 18:05:35 +00:00
LocalVector<RegEx *> input_map_regexes;
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
LocalVector<RegEx *> gdscript_properties_regexes;
LocalVector<RegEx *> gdscript_signals_regexes;
LocalVector<RegEx *> shaders_regexes;
LocalVector<RegEx *> builtin_types_regexes;
Add conversion for common Theme Overrides
2023-03-08 22:11:23 +00:00
LocalVector<RegEx *> theme_override_regexes;
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
LocalVector<RegEx *> csharp_function_regexes;
LocalVector<RegEx *> csharp_properties_regexes;
LocalVector<RegEx *> csharp_signal_regexes;
RegExContainer() {
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Common.
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
{
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Enum.
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
for (unsigned int current_index = 0; RenamesMap3To4::enum_renames[current_index][0]; current_index++) {
enum_regexes.push_back(memnew(RegEx(String("\\b") + RenamesMap3To4::enum_renames[current_index][0] + "\\b")));
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// GDScript functions.
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
for (unsigned int current_index = 0; RenamesMap3To4::gdscript_function_renames[current_index][0]; current_index++) {
gdscript_function_regexes.push_back(memnew(RegEx(String("\\b") + RenamesMap3To4::gdscript_function_renames[current_index][0] + "\\b")));
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
Add 3-to-4 renames for project settings in project.godot In the ConfigFile format, the first subpath is the category and is not part of the line that the regex would match. Fixes #66125.
2023-02-27 12:34:35 +00:00
// Project Settings in scripts.
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
for (unsigned int current_index = 0; RenamesMap3To4::project_settings_renames[current_index][0]; current_index++) {
project_settings_regexes.push_back(memnew(RegEx(String("\\b") + RenamesMap3To4::project_settings_renames[current_index][0] + "\\b")));
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
Add 3-to-4 renames for project settings in project.godot In the ConfigFile format, the first subpath is the category and is not part of the line that the regex would match. Fixes #66125.
2023-02-27 12:34:35 +00:00
// Project Settings in project.godot.
for (unsigned int current_index = 0; RenamesMap3To4::project_godot_renames[current_index][0]; current_index++) {
project_godot_regexes.push_back(memnew(RegEx(String("\\b") + RenamesMap3To4::project_godot_renames[current_index][0] + "\\b")));
}
Add InputMap conversion All InputMap strings that changed between Godot 3 and 4 are now renamed when converting the project. This includes: - alt -> alt_pressed - shift -> shift_pressed - control -> ctrl_pressed - meta -> meta_pressed - scancode -> keycode - physical_scancode -> physical_keycode - doubleclick -> double_click
2023-01-20 18:05:35 +00:00
// Input Map.
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
for (unsigned int current_index = 0; RenamesMap3To4::input_map_renames[current_index][0]; current_index++) {
input_map_regexes.push_back(memnew(RegEx(String("\\b") + RenamesMap3To4::input_map_renames[current_index][0] + "\\b")));
Add InputMap conversion All InputMap strings that changed between Godot 3 and 4 are now renamed when converting the project. This includes: - alt -> alt_pressed - shift -> shift_pressed - control -> ctrl_pressed - meta -> meta_pressed - scancode -> keycode - physical_scancode -> physical_keycode - doubleclick -> double_click
2023-01-20 18:05:35 +00:00
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// GDScript properties.
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
for (unsigned int current_index = 0; RenamesMap3To4::gdscript_properties_renames[current_index][0]; current_index++) {
gdscript_properties_regexes.push_back(memnew(RegEx(String("\\b") + RenamesMap3To4::gdscript_properties_renames[current_index][0] + "\\b")));
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// GDScript Signals.
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
for (unsigned int current_index = 0; RenamesMap3To4::gdscript_signals_renames[current_index][0]; current_index++) {
gdscript_signals_regexes.push_back(memnew(RegEx(String("\\b") + RenamesMap3To4::gdscript_signals_renames[current_index][0] + "\\b")));
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Shaders.
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
for (unsigned int current_index = 0; RenamesMap3To4::shaders_renames[current_index][0]; current_index++) {
shaders_regexes.push_back(memnew(RegEx(String("\\b") + RenamesMap3To4::shaders_renames[current_index][0] + "\\b")));
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Builtin types.
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
for (unsigned int current_index = 0; RenamesMap3To4::builtin_types_renames[current_index][0]; current_index++) {
builtin_types_regexes.push_back(memnew(RegEx(String("\\b") + RenamesMap3To4::builtin_types_renames[current_index][0] + "\\b")));
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
Add conversion for common Theme Overrides
2023-03-08 22:11:23 +00:00
// Theme overrides.
for (unsigned int current_index = 0; RenamesMap3To4::theme_override_renames[current_index][0]; current_index++) {
theme_override_regexes.push_back(memnew(RegEx(String("\\b") + RenamesMap3To4::theme_override_renames[current_index][0] + "\\b")));
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// CSharp function renames.
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
for (unsigned int current_index = 0; RenamesMap3To4::csharp_function_renames[current_index][0]; current_index++) {
csharp_function_regexes.push_back(memnew(RegEx(String("\\b") + RenamesMap3To4::csharp_function_renames[current_index][0] + "\\b")));
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// CSharp properties renames.
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
for (unsigned int current_index = 0; RenamesMap3To4::csharp_properties_renames[current_index][0]; current_index++) {
csharp_properties_regexes.push_back(memnew(RegEx(String("\\b") + RenamesMap3To4::csharp_properties_renames[current_index][0] + "\\b")));
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// CSharp signals renames.
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
for (unsigned int current_index = 0; RenamesMap3To4::csharp_signals_renames[current_index][0]; current_index++) {
csharp_signal_regexes.push_back(memnew(RegEx(String("\\b") + RenamesMap3To4::csharp_signals_renames[current_index][0] + "\\b")));
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Colors.
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
{
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
for (unsigned int current_index = 0; RenamesMap3To4::color_renames[current_index][0]; current_index++) {
color_regexes.push_back(memnew(RegEx(String("\\bColor.") + RenamesMap3To4::color_renames[current_index][0] + "\\b")));
color_renamed.push_back(String("Color.") + RenamesMap3To4::color_renames[current_index][1]);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Classes.
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
{
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
for (unsigned int current_index = 0; RenamesMap3To4::class_renames[current_index][0]; current_index++) {
const String class_name = RenamesMap3To4::class_renames[current_index][0];
class_tscn_regexes.push_back(memnew(RegEx(String("\\b") + class_name + ".tscn\\b")));
class_gd_regexes.push_back(memnew(RegEx(String("\\b") + class_name + ".gd\\b")));
class_shader_regexes.push_back(memnew(RegEx(String("\\b") + class_name + ".shader\\b")));
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
class_regexes.push_back(memnew(RegEx(String("\\b") + class_name + "\\b")));
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
class_temp_tscn_renames.push_back(class_name + ".tscn");
class_temp_gd_renames.push_back(class_name + ".gd");
class_temp_shader_renames.push_back(class_name + ".shader");
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
}
}
~RegExContainer() {
Use range iterators in LocalVector loops
2022-12-29 00:24:45 +00:00
for (RegEx *regex : color_regexes) {
memdelete(regex);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
for (unsigned int i = 0; i < class_tscn_regexes.size(); i++) {
memdelete(class_tscn_regexes[i]);
memdelete(class_gd_regexes[i]);
memdelete(class_shader_regexes[i]);
memdelete(class_regexes[i]);
}
Use range iterators in LocalVector loops
2022-12-29 00:24:45 +00:00
for (RegEx *regex : enum_regexes) {
memdelete(regex);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
Use range iterators in LocalVector loops
2022-12-29 00:24:45 +00:00
for (RegEx *regex : gdscript_function_regexes) {
memdelete(regex);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
Use range iterators in LocalVector loops
2022-12-29 00:24:45 +00:00
for (RegEx *regex : project_settings_regexes) {
memdelete(regex);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
Add 3-to-4 renames for project settings in project.godot In the ConfigFile format, the first subpath is the category and is not part of the line that the regex would match. Fixes #66125.
2023-02-27 12:34:35 +00:00
for (RegEx *regex : project_godot_regexes) {
memdelete(regex);
}
Use range iterators in LocalVector loops
2022-12-29 00:24:45 +00:00
for (RegEx *regex : input_map_regexes) {
memdelete(regex);
Add InputMap conversion All InputMap strings that changed between Godot 3 and 4 are now renamed when converting the project. This includes: - alt -> alt_pressed - shift -> shift_pressed - control -> ctrl_pressed - meta -> meta_pressed - scancode -> keycode - physical_scancode -> physical_keycode - doubleclick -> double_click
2023-01-20 18:05:35 +00:00
}
Use range iterators in LocalVector loops
2022-12-29 00:24:45 +00:00
for (RegEx *regex : gdscript_properties_regexes) {
memdelete(regex);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
Use range iterators in LocalVector loops
2022-12-29 00:24:45 +00:00
for (RegEx *regex : gdscript_signals_regexes) {
memdelete(regex);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
Use range iterators in LocalVector loops
2022-12-29 00:24:45 +00:00
for (RegEx *regex : shaders_regexes) {
memdelete(regex);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
Use range iterators in LocalVector loops
2022-12-29 00:24:45 +00:00
for (RegEx *regex : builtin_types_regexes) {
memdelete(regex);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
Add conversion for common Theme Overrides
2023-03-08 22:11:23 +00:00
for (RegEx *regex : theme_override_regexes) {
memdelete(regex);
}
Use range iterators in LocalVector loops
2022-12-29 00:24:45 +00:00
for (RegEx *regex : csharp_function_regexes) {
memdelete(regex);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
Use range iterators in LocalVector loops
2022-12-29 00:24:45 +00:00
for (RegEx *regex : csharp_properties_regexes) {
memdelete(regex);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
Use range iterators in LocalVector loops
2022-12-29 00:24:45 +00:00
for (RegEx *regex : csharp_signal_regexes) {
memdelete(regex);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
};
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
ProjectConverter3To4::ProjectConverter3To4(int p_maximum_file_size_kb, int p_maximum_line_length) {
maximum_file_size = p_maximum_file_size_kb * 1024;
maximum_line_length = p_maximum_line_length;
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Function responsible for converting project.
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
bool ProjectConverter3To4::convert() {
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
print_line("Starting conversion.");
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
uint64_t conversion_start_time = Time::get_singleton()->get_ticks_msec();
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
RegExContainer reg_container = RegExContainer();
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
int cached_maximum_line_length = maximum_line_length;
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
maximum_line_length = 10000; // Use only for tests bigger value, to not break them.
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
ERR_FAIL_COND_V_MSG(!test_array_names(), false, "Cannot start converting due to problems with data in arrays.");
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
ERR_FAIL_COND_V_MSG(!test_conversion(reg_container), false, "Aborting conversion due to validation tests failing");
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
maximum_line_length = cached_maximum_line_length;
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
// Checking if folder contains valid Godot 3 project.
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Project should not be converted more than once.
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
{
Change explicit 'Godot 4.0' references to 'Godot 4' Fixes #79276.
2023-07-10 11:08:11 +00:00
String converter_text = "; Project was converted by built-in tool to Godot 4";
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
ERR_FAIL_COND_V_MSG(!FileAccess::exists("project.godot"), false, "Current working directory doesn't contain a \"project.godot\" file for a Godot 3 project.");
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Error err = OK;
String project_godot_content = FileAccess::get_file_as_string("project.godot", &err);
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
ERR_FAIL_COND_V_MSG(err != OK, false, "Unable to read \"project.godot\".");
ERR_FAIL_COND_V_MSG(project_godot_content.contains(converter_text), false, "Project was already converted with this tool.");
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Ref<FileAccess> file = FileAccess::open("project.godot", FileAccess::WRITE);
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
ERR_FAIL_COND_V_MSG(file.is_null(), false, "Unable to open \"project.godot\".");
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
file->store_string(converter_text + "\n" + project_godot_content);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Vector<String> collected_files = check_for_files();
uint32_t converted_files = 0;
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Check file by file.
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
for (int i = 0; i < collected_files.size(); i++) {
String file_name = collected_files[i];
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
Vector<SourceLine> source_lines;
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
uint32_t ignored_lines = 0;
{
Ref<FileAccess> file = FileAccess::open(file_name, FileAccess::READ);
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
ERR_CONTINUE_MSG(file.is_null(), vformat("Unable to read content of \"%s\".", file_name));
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
while (!file->eof_reached()) {
String line = file->get_line();
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
SourceLine source_line;
source_line.line = line;
source_line.is_comment = reg_container.gdscript_comment.search_all(line).size() > 0 || reg_container.csharp_comment.search_all(line).size() > 0;
source_lines.append(source_line);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
}
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
String file_content_before = collect_string_from_vector(source_lines);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
uint64_t hash_before = file_content_before.hash();
uint64_t file_size = file_content_before.size();
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
print_line(vformat("Trying to convert\t%d/%d file - \"%s\" with size - %d KB", i + 1, collected_files.size(), file_name.trim_prefix("res://"), file_size / 1024));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Vector<String> reason;
bool is_ignored = false;
uint64_t start_time = Time::get_singleton()->get_ticks_msec();
if (file_name.ends_with(".shader")) {
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
DirAccess::remove_file_or_error(file_name.trim_prefix("res://"));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
file_name = file_name.replace(".shader", ".gdshader");
}
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (file_size < uint64_t(maximum_file_size)) {
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// ".tscn" must work exactly the same as ".gd" files because they may contain built-in Scripts.
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
if (file_name.ends_with(".gd")) {
Move tool declarations to top in 3to4. In godot3, `tool` can follow keywords like `extends` and `class_name` In godot4, `@tool` must be the first line in the file.
2023-03-05 12:43:51 +00:00
fix_tool_declaration(source_lines, reg_container);
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
rename_classes(source_lines, reg_container); // Using only specialized function.
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
rename_common(RenamesMap3To4::enum_renames, reg_container.enum_regexes, source_lines);
rename_colors(source_lines, reg_container); // Require to additional rename.
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
rename_common(RenamesMap3To4::gdscript_function_renames, reg_container.gdscript_function_regexes, source_lines);
rename_gdscript_functions(source_lines, reg_container, false); // Require to additional rename.
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
rename_common(RenamesMap3To4::project_settings_renames, reg_container.project_settings_regexes, source_lines);
Ensure quotes are escaped when converting builtin scripts
2023-05-23 14:55:52 +00:00
rename_gdscript_keywords(source_lines, reg_container, false);
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
rename_common(RenamesMap3To4::gdscript_properties_renames, reg_container.gdscript_properties_regexes, source_lines);
rename_common(RenamesMap3To4::gdscript_signals_renames, reg_container.gdscript_signals_regexes, source_lines);
rename_common(RenamesMap3To4::shaders_renames, reg_container.shaders_regexes, source_lines);
rename_common(RenamesMap3To4::builtin_types_renames, reg_container.builtin_types_regexes, source_lines);
Add conversion for common Theme Overrides
2023-03-08 22:11:23 +00:00
rename_common(RenamesMap3To4::theme_override_renames, reg_container.theme_override_regexes, source_lines);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
custom_rename(source_lines, "\\.shader", ".gdshader");
Fix conversion of hex color strings in project converter
2023-09-29 12:51:37 +00:00
convert_hexadecimal_colors(source_lines, reg_container);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
} else if (file_name.ends_with(".tscn")) {
Fix pause_mode may not be converted correctly in .tscn files.
2023-04-17 17:53:50 +00:00
fix_pause_mode(source_lines, reg_container);
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
rename_classes(source_lines, reg_container); // Using only specialized function.
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
rename_common(RenamesMap3To4::enum_renames, reg_container.enum_regexes, source_lines);
rename_colors(source_lines, reg_container); // Require to do additional renames.
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
rename_common(RenamesMap3To4::gdscript_function_renames, reg_container.gdscript_function_regexes, source_lines);
rename_gdscript_functions(source_lines, reg_container, true); // Require to do additional renames.
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
rename_common(RenamesMap3To4::project_settings_renames, reg_container.project_settings_regexes, source_lines);
Ensure quotes are escaped when converting builtin scripts
2023-05-23 14:55:52 +00:00
rename_gdscript_keywords(source_lines, reg_container, true);
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
rename_common(RenamesMap3To4::gdscript_properties_renames, reg_container.gdscript_properties_regexes, source_lines);
rename_common(RenamesMap3To4::gdscript_signals_renames, reg_container.gdscript_signals_regexes, source_lines);
rename_common(RenamesMap3To4::shaders_renames, reg_container.shaders_regexes, source_lines);
rename_common(RenamesMap3To4::builtin_types_renames, reg_container.builtin_types_regexes, source_lines);
Add conversion for common Theme Overrides
2023-03-08 22:11:23 +00:00
rename_common(RenamesMap3To4::theme_override_renames, reg_container.theme_override_regexes, source_lines);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
custom_rename(source_lines, "\\.shader", ".gdshader");
Fix conversion of hex color strings in project converter
2023-09-29 12:51:37 +00:00
convert_hexadecimal_colors(source_lines, reg_container);
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
} else if (file_name.ends_with(".cs")) { // TODO, C# should use different methods.
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
rename_classes(source_lines, reg_container); // Using only specialized function.
rename_common(RenamesMap3To4::csharp_function_renames, reg_container.csharp_function_regexes, source_lines);
rename_common(RenamesMap3To4::builtin_types_renames, reg_container.builtin_types_regexes, source_lines);
rename_common(RenamesMap3To4::csharp_properties_renames, reg_container.csharp_properties_regexes, source_lines);
rename_common(RenamesMap3To4::csharp_signals_renames, reg_container.csharp_signal_regexes, source_lines);
rename_csharp_functions(source_lines, reg_container);
rename_csharp_attributes(source_lines, reg_container);
custom_rename(source_lines, "public class ", "public partial class ");
Fix conversion of hex color strings in project converter
2023-09-29 12:51:37 +00:00
convert_hexadecimal_colors(source_lines, reg_container);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
} else if (file_name.ends_with(".gdshader") || file_name.ends_with(".shader")) {
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
rename_common(RenamesMap3To4::shaders_renames, reg_container.shaders_regexes, source_lines);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
} else if (file_name.ends_with("tres")) {
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
rename_classes(source_lines, reg_container); // Using only specialized function.
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
rename_common(RenamesMap3To4::shaders_renames, reg_container.shaders_regexes, source_lines);
rename_common(RenamesMap3To4::builtin_types_renames, reg_container.builtin_types_regexes, source_lines);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
custom_rename(source_lines, "\\.shader", ".gdshader");
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
} else if (file_name.ends_with("project.godot")) {
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
rename_common(RenamesMap3To4::project_godot_renames, reg_container.project_godot_regexes, source_lines);
rename_common(RenamesMap3To4::builtin_types_renames, reg_container.builtin_types_regexes, source_lines);
rename_input_map_scancode(source_lines, reg_container);
Add joypad input map conversion to project converter. Fixes godotengine#77314 (Input Map's joypad button numbers are not converted).
2023-05-29 14:16:46 +00:00
rename_joypad_buttons_and_axes(source_lines, reg_container);
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
rename_common(RenamesMap3To4::input_map_renames, reg_container.input_map_regexes, source_lines);
Fix Input Map key assignments missing after project conversion Fixes #76336 (Input Map keys missing). Moves the project.godot config_version stamping from the project manager to the project converter. Now there's no difference between converting through the project manager and the CLI tool. Fixes being prompted to re-convert the project in the project manager after having done so through the CLI tool.
2023-05-16 15:26:58 +00:00
custom_rename(source_lines, "config_version=4", "config_version=5");
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
} else if (file_name.ends_with(".csproj")) {
// TODO
Implement automatic rename for project - Import must rename nodes/root_type="Spatial" to "Node3D": - Resolves ownership issues with calling: scene->replace_by(base_node); when the original root type was Spatial.
2023-02-22 01:01:33 +00:00
} else if (file_name.ends_with(".import")) {
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
for (SourceLine &source_line : source_lines) {
String &line = source_line.line;
if (line.contains("nodes/root_type=\"Spatial\"")) {
line = "nodes/root_type=\"Node3D\"";
Fix runtime crash due to missing importer's name conversion inside .import files about OGG vorbis sound files
2023-06-15 20:55:02 +00:00
} else if (line == "importer=\"ogg_vorbis\"") {
line = "importer=\"oggvorbisstr\"";
Implement automatic rename for project - Import must rename nodes/root_type="Spatial" to "Node3D": - Resolves ownership issues with calling: scene->replace_by(base_node); when the original root type was Spatial.
2023-02-22 01:01:33 +00:00
}
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
} else {
ERR_PRINT(file_name + " is not supported!");
continue;
}
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
for (SourceLine &source_line : source_lines) {
if (source_line.is_comment) {
continue;
}
String &line = source_line.line;
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (uint64_t(line.length()) > maximum_line_length) {
ignored_lines += 1;
}
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
} else {
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
reason.append(vformat(" ERROR: File has exceeded the maximum size allowed - %d KB", maximum_file_size / 1024));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
is_ignored = true;
}
uint64_t end_time = Time::get_singleton()->get_ticks_msec();
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (is_ignored) {
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
String end_message = vformat(" Checking file took %d ms.", end_time - start_time);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
print_line(end_message);
} else {
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
String file_content_after = collect_string_from_vector(source_lines);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
uint64_t hash_after = file_content_after.hash64();
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Don't need to save file without any changes.
// Save if this is a shader, because it was renamed.
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
if (hash_before != hash_after || file_name.ends_with(".gdshader")) {
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
converted_files++;
Ref<FileAccess> file = FileAccess::open(file_name, FileAccess::WRITE);
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
ERR_CONTINUE_MSG(file.is_null(), vformat("Unable to apply changes to \"%s\", no writing access.", file_name));
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
file->store_string(file_content_after);
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
reason.append(vformat(" File was changed, conversion took %d ms.", end_time - start_time));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
} else {
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
reason.append(vformat(" File was left unchanged, checking took %d ms.", end_time - start_time));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (ignored_lines != 0) {
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
reason.append(vformat(" Ignored %d lines, because their length exceeds maximum allowed characters - %d.", ignored_lines, maximum_line_length));
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
for (int k = 0; k < reason.size(); k++) {
print_line(reason[k]);
}
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
print_line(vformat("Conversion ended - all files(%d), converted files: (%d), not converted files: (%d).", collected_files.size(), converted_files, collected_files.size() - converted_files));
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
uint64_t conversion_end_time = Time::get_singleton()->get_ticks_msec();
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
print_line(vformat("Conversion of all files took %10.3f seconds.", (conversion_end_time - conversion_start_time) / 1000.0));
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
return true;
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
// Function responsible for validating project conversion.
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
bool ProjectConverter3To4::validate_conversion() {
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
print_line("Starting checking if project conversion can be done.");
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
uint64_t conversion_start_time = Time::get_singleton()->get_ticks_msec();
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
RegExContainer reg_container = RegExContainer();
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
int cached_maximum_line_length = maximum_line_length;
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
maximum_line_length = 10000; // To avoid breaking the tests, only use this for the their larger value.
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
ERR_FAIL_COND_V_MSG(!test_array_names(), false, "Cannot start converting due to problems with data in arrays.");
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
ERR_FAIL_COND_V_MSG(!test_conversion(reg_container), false, "Aborting conversion due to validation tests failing");
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
maximum_line_length = cached_maximum_line_length;
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
// Checking if folder contains valid Godot 3 project.
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Project should not be converted more than once.
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
{
Change explicit 'Godot 4.0' references to 'Godot 4' Fixes #79276.
2023-07-10 11:08:11 +00:00
String conventer_text = "; Project was converted by built-in tool to Godot 4";
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
ERR_FAIL_COND_V_MSG(!FileAccess::exists("project.godot"), false, "Current directory doesn't contain any Godot 3 project");
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Error err = OK;
String project_godot_content = FileAccess::get_file_as_string("project.godot", &err);
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
ERR_FAIL_COND_V_MSG(err != OK, false, "Failed to read content of \"project.godot\" file.");
ERR_FAIL_COND_V_MSG(project_godot_content.contains(conventer_text), false, "Project already was converted with this tool.");
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Vector<String> collected_files = check_for_files();
uint32_t converted_files = 0;
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Check file by file.
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
for (int i = 0; i < collected_files.size(); i++) {
String file_name = collected_files[i];
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
Vector<String> lines;
uint32_t ignored_lines = 0;
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
uint64_t file_size = 0;
{
Ref<FileAccess> file = FileAccess::open(file_name, FileAccess::READ);
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
ERR_CONTINUE_MSG(file.is_null(), vformat("Unable to read content of \"%s\".", file_name));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
while (!file->eof_reached()) {
String line = file->get_line();
file_size += line.size();
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
lines.append(line);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
}
Fix not enough arguments error when validating 3to4 conversion
2022-11-21 08:49:59 +00:00
print_line(vformat("Checking for conversion - %d/%d file - \"%s\" with size - %d KB", i + 1, collected_files.size(), file_name.trim_prefix("res://"), file_size / 1024));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Vector<String> changed_elements;
Vector<String> reason;
bool is_ignored = false;
uint64_t start_time = Time::get_singleton()->get_ticks_msec();
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
if (file_name.ends_with(".shader")) {
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
reason.append("\tFile extension will be renamed from \"shader\" to \"gdshader\".");
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (file_size < uint64_t(maximum_file_size)) {
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
if (file_name.ends_with(".gd")) {
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
changed_elements.append_array(check_for_rename_classes(lines, reg_container));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
changed_elements.append_array(check_for_rename_common(RenamesMap3To4::enum_renames, reg_container.enum_regexes, lines));
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
changed_elements.append_array(check_for_rename_colors(lines, reg_container));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
changed_elements.append_array(check_for_rename_common(RenamesMap3To4::gdscript_function_renames, reg_container.gdscript_function_regexes, lines));
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
changed_elements.append_array(check_for_rename_gdscript_functions(lines, reg_container, false));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
changed_elements.append_array(check_for_rename_common(RenamesMap3To4::project_settings_renames, reg_container.project_settings_regexes, lines));
Ensure quotes are escaped when converting builtin scripts
2023-05-23 14:55:52 +00:00
changed_elements.append_array(check_for_rename_gdscript_keywords(lines, reg_container, false));
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
changed_elements.append_array(check_for_rename_common(RenamesMap3To4::gdscript_properties_renames, reg_container.gdscript_properties_regexes, lines));
changed_elements.append_array(check_for_rename_common(RenamesMap3To4::gdscript_signals_renames, reg_container.gdscript_signals_regexes, lines));
changed_elements.append_array(check_for_rename_common(RenamesMap3To4::shaders_renames, reg_container.shaders_regexes, lines));
changed_elements.append_array(check_for_rename_common(RenamesMap3To4::builtin_types_renames, reg_container.builtin_types_regexes, lines));
Add conversion for common Theme Overrides
2023-03-08 22:11:23 +00:00
changed_elements.append_array(check_for_rename_common(RenamesMap3To4::theme_override_renames, reg_container.theme_override_regexes, lines));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
changed_elements.append_array(check_for_custom_rename(lines, "\\.shader", ".gdshader"));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
} else if (file_name.ends_with(".tscn")) {
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
changed_elements.append_array(check_for_rename_classes(lines, reg_container));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
changed_elements.append_array(check_for_rename_common(RenamesMap3To4::enum_renames, reg_container.enum_regexes, lines));
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
changed_elements.append_array(check_for_rename_colors(lines, reg_container));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
changed_elements.append_array(check_for_rename_common(RenamesMap3To4::gdscript_function_renames, reg_container.gdscript_function_regexes, lines));
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
changed_elements.append_array(check_for_rename_gdscript_functions(lines, reg_container, true));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
changed_elements.append_array(check_for_rename_common(RenamesMap3To4::project_settings_renames, reg_container.project_settings_regexes, lines));
Ensure quotes are escaped when converting builtin scripts
2023-05-23 14:55:52 +00:00
changed_elements.append_array(check_for_rename_gdscript_keywords(lines, reg_container, true));
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
changed_elements.append_array(check_for_rename_common(RenamesMap3To4::gdscript_properties_renames, reg_container.gdscript_properties_regexes, lines));
changed_elements.append_array(check_for_rename_common(RenamesMap3To4::gdscript_signals_renames, reg_container.gdscript_signals_regexes, lines));
changed_elements.append_array(check_for_rename_common(RenamesMap3To4::shaders_renames, reg_container.shaders_regexes, lines));
changed_elements.append_array(check_for_rename_common(RenamesMap3To4::builtin_types_renames, reg_container.builtin_types_regexes, lines));
Add conversion for common Theme Overrides
2023-03-08 22:11:23 +00:00
changed_elements.append_array(check_for_rename_common(RenamesMap3To4::theme_override_renames, reg_container.theme_override_regexes, lines));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
changed_elements.append_array(check_for_custom_rename(lines, "\\.shader", ".gdshader"));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
} else if (file_name.ends_with(".cs")) {
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
changed_elements.append_array(check_for_rename_classes(lines, reg_container));
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
changed_elements.append_array(check_for_rename_common(RenamesMap3To4::csharp_function_renames, reg_container.csharp_function_regexes, lines));
changed_elements.append_array(check_for_rename_common(RenamesMap3To4::builtin_types_renames, reg_container.builtin_types_regexes, lines));
changed_elements.append_array(check_for_rename_common(RenamesMap3To4::csharp_properties_renames, reg_container.csharp_properties_regexes, lines));
changed_elements.append_array(check_for_rename_common(RenamesMap3To4::csharp_signals_renames, reg_container.csharp_signal_regexes, lines));
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
changed_elements.append_array(check_for_rename_csharp_functions(lines, reg_container));
changed_elements.append_array(check_for_rename_csharp_attributes(lines, reg_container));
changed_elements.append_array(check_for_custom_rename(lines, "public class ", "public partial class "));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
} else if (file_name.ends_with(".gdshader") || file_name.ends_with(".shader")) {
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
changed_elements.append_array(check_for_rename_common(RenamesMap3To4::shaders_renames, reg_container.shaders_regexes, lines));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
} else if (file_name.ends_with("tres")) {
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
changed_elements.append_array(check_for_rename_classes(lines, reg_container));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
changed_elements.append_array(check_for_rename_common(RenamesMap3To4::shaders_renames, reg_container.shaders_regexes, lines));
changed_elements.append_array(check_for_rename_common(RenamesMap3To4::builtin_types_renames, reg_container.builtin_types_regexes, lines));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
changed_elements.append_array(check_for_custom_rename(lines, "\\.shader", ".gdshader"));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
} else if (file_name.ends_with("project.godot")) {
Add 3-to-4 renames for project settings in project.godot In the ConfigFile format, the first subpath is the category and is not part of the line that the regex would match. Fixes #66125.
2023-02-27 12:34:35 +00:00
changed_elements.append_array(check_for_rename_common(RenamesMap3To4::project_godot_renames, reg_container.project_godot_regexes, lines));
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
changed_elements.append_array(check_for_rename_common(RenamesMap3To4::builtin_types_renames, reg_container.builtin_types_regexes, lines));
Add keycode project conversion
2023-03-02 14:24:00 +00:00
changed_elements.append_array(check_for_rename_input_map_scancode(lines, reg_container));
Add joypad input map conversion to project converter. Fixes godotengine#77314 (Input Map's joypad button numbers are not converted).
2023-05-29 14:16:46 +00:00
changed_elements.append_array(check_for_rename_joypad_buttons_and_axes(lines, reg_container));
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
changed_elements.append_array(check_for_rename_common(RenamesMap3To4::input_map_renames, reg_container.input_map_regexes, lines));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
} else if (file_name.ends_with(".csproj")) {
// TODO
} else {
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
ERR_PRINT(vformat("\"%s\", is not supported!", file_name));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
continue;
}
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
for (String &line : lines) {
if (uint64_t(line.length()) > maximum_line_length) {
ignored_lines += 1;
}
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
} else {
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
reason.append(vformat("\tERROR: File has exceeded the maximum size allowed - %d KB.", maximum_file_size / 1024));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
is_ignored = true;
}
uint64_t end_time = Time::get_singleton()->get_ticks_msec();
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
String end_message = vformat(" Checking file took %10.3f ms.", (end_time - start_time) / 1000.0);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (ignored_lines != 0) {
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
end_message += vformat(" Ignored %d lines, because their length exceeds maximum allowed characters - %d.", ignored_lines, maximum_line_length);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
print_line(end_message);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
for (int k = 0; k < reason.size(); k++) {
print_line(reason[k]);
}
if (changed_elements.size() > 0 && !is_ignored) {
converted_files++;
for (int k = 0; k < changed_elements.size(); k++) {
print_line(String("\t\t") + changed_elements[k]);
}
}
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
print_line(vformat("Checking for valid conversion ended - all files(%d), files which would be converted(%d), files which would not be converted(%d).", collected_files.size(), converted_files, collected_files.size() - converted_files));
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
uint64_t conversion_end_time = Time::get_singleton()->get_ticks_msec();
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
print_line(vformat("Conversion of all files took %10.3f seconds.", (conversion_end_time - conversion_start_time) / 1000.0));
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
return true;
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Collect files which will be checked, excluding ".txt", ".mp4", ".wav" etc. files.
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Vector<String> ProjectConverter3To4::check_for_files() {
Vector<String> collected_files = Vector<String>();
Vector<String> directories_to_check = Vector<String>();
directories_to_check.push_back("res://");
while (!directories_to_check.is_empty()) {
String path = directories_to_check.get(directories_to_check.size() - 1); // Is there any pop_back function?
Replace File/Directory with FileAccess/DirAccess
2022-09-05 11:01:31 +00:00
directories_to_check.resize(directories_to_check.size() - 1); // Remove last element
Fix wrong DirAccess function in project converter
2022-09-27 11:12:31 +00:00
Ref<DirAccess> dir = DirAccess::open(path);
Replace File/Directory with FileAccess/DirAccess
2022-09-05 11:01:31 +00:00
if (dir.is_valid()) {
dir->set_include_hidden(true);
dir->list_dir_begin();
String current_dir = dir->get_current_dir();
String file_name = dir->_get_next();
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
while (file_name != "") {
Implement automatic rename for project - Import must rename nodes/root_type="Spatial" to "Node3D": - Resolves ownership issues with calling: scene->replace_by(base_node); when the original root type was Spatial.
2023-02-22 01:01:33 +00:00
if (file_name == ".git" || file_name == ".godot") {
Replace File/Directory with FileAccess/DirAccess
2022-09-05 11:01:31 +00:00
file_name = dir->_get_next();
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
continue;
}
Replace File/Directory with FileAccess/DirAccess
2022-09-05 11:01:31 +00:00
if (dir->current_is_dir()) {
Rename String `plus_file` to `path_join`
2022-08-30 00:34:01 +00:00
directories_to_check.append(current_dir.path_join(file_name) + "/");
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
} else {
bool proper_extension = false;
Implement automatic rename for project - Import must rename nodes/root_type="Spatial" to "Node3D": - Resolves ownership issues with calling: scene->replace_by(base_node); when the original root type was Spatial.
2023-02-22 01:01:33 +00:00
if (file_name.ends_with(".gd") || file_name.ends_with(".shader") || file_name.ends_with(".gdshader") || file_name.ends_with(".tscn") || file_name.ends_with(".tres") || file_name.ends_with(".godot") || file_name.ends_with(".cs") || file_name.ends_with(".csproj") || file_name.ends_with(".import"))
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
proper_extension = true;
if (proper_extension) {
Rename String `plus_file` to `path_join`
2022-08-30 00:34:01 +00:00
collected_files.append(current_dir.path_join(file_name));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
}
Replace File/Directory with FileAccess/DirAccess
2022-09-05 11:01:31 +00:00
file_name = dir->_get_next();
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
} else {
print_verbose("Failed to open " + path);
}
}
return collected_files;
}
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
Vector<SourceLine> ProjectConverter3To4::split_lines(const String &text) {
Vector<String> lines = text.split("\n");
Vector<SourceLine> source_lines;
for (String &line : lines) {
SourceLine source_line;
source_line.line = line;
source_line.is_comment = false;
source_lines.append(source_line);
}
return source_lines;
}
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
// Test expected results of gdscript
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
bool ProjectConverter3To4::test_conversion_gdscript_builtin(String name, String expected, void (ProjectConverter3To4::*func)(Vector<SourceLine> &, const RegExContainer &, bool), String what, const RegExContainer &reg_container, bool builtin_script) {
Vector<SourceLine> got = split_lines(name);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
(this->*func)(got, reg_container, builtin_script);
String got_str = collect_string_from_vector(got);
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
ERR_FAIL_COND_V_MSG(expected != got_str, false, vformat("Failed to convert %s \"%s\" to \"%s\", got instead \"%s\"", what, name, expected, got_str));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
return true;
}
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
bool ProjectConverter3To4::test_conversion_with_regex(String name, String expected, void (ProjectConverter3To4::*func)(Vector<SourceLine> &, const RegExContainer &), String what, const RegExContainer &reg_container) {
Vector<SourceLine> got = split_lines(name);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
(this->*func)(got, reg_container);
String got_str = collect_string_from_vector(got);
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
ERR_FAIL_COND_V_MSG(expected != got_str, false, vformat("Failed to convert %s \"%s\" to \"%s\", got instead \"%s\"", what, name, expected, got_str));
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
return true;
}
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
bool ProjectConverter3To4::test_conversion_basic(String name, String expected, const char *array[][2], LocalVector<RegEx *> &regex_cache, String what) {
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
Vector<SourceLine> got = split_lines(name);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
rename_common(array, regex_cache, got);
String got_str = collect_string_from_vector(got);
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
ERR_FAIL_COND_V_MSG(expected != got_str, false, vformat("Failed to convert %s \"%s\" to \"%s\", got instead \"%s\"", what, name, expected, got_str));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
return true;
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Validate if conversions are proper.
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
bool ProjectConverter3To4::test_conversion(RegExContainer &reg_container) {
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
bool valid = true;
Move tool declarations to top in 3to4. In godot3, `tool` can follow keywords like `extends` and `class_name` In godot4, `@tool` must be the first line in the file.
2023-03-05 12:43:51 +00:00
valid = valid && test_conversion_with_regex("tool", "@tool", &ProjectConverter3To4::fix_tool_declaration, "gdscript keyword", reg_container);
valid = valid && test_conversion_with_regex("\n tool", "\n tool", &ProjectConverter3To4::fix_tool_declaration, "gdscript keyword", reg_container);
valid = valid && test_conversion_with_regex("\n\ntool", "@tool\n\n", &ProjectConverter3To4::fix_tool_declaration, "gdscript keyword", reg_container);
Fix pause_mode may not be converted correctly in .tscn files.
2023-04-17 17:53:50 +00:00
valid = valid && test_conversion_with_regex("pause_mode = 2", "pause_mode = 3", &ProjectConverter3To4::fix_pause_mode, "pause_mode", reg_container);
valid = valid && test_conversion_with_regex("pause_mode = 1", "pause_mode = 1", &ProjectConverter3To4::fix_pause_mode, "pause_mode", reg_container);
valid = valid && test_conversion_with_regex("pause_mode = 3", "pause_mode = 3", &ProjectConverter3To4::fix_pause_mode, "pause_mode", reg_container);
valid = valid && test_conversion_with_regex("somepause_mode = 2", "somepause_mode = 2", &ProjectConverter3To4::fix_pause_mode, "pause_mode", reg_container);
valid = valid && test_conversion_with_regex("pause_mode_ext = 2", "pause_mode_ext = 2", &ProjectConverter3To4::fix_pause_mode, "pause_mode", reg_container);
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
valid = valid && test_conversion_basic("TYPE_REAL", "TYPE_FLOAT", RenamesMap3To4::enum_renames, reg_container.enum_regexes, "enum");
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
valid = valid && test_conversion_basic("can_instance", "can_instantiate", RenamesMap3To4::gdscript_function_renames, reg_container.gdscript_function_regexes, "gdscript function");
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
valid = valid && test_conversion_basic("CanInstance", "CanInstantiate", RenamesMap3To4::csharp_function_renames, reg_container.csharp_function_regexes, "csharp function");
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
valid = valid && test_conversion_basic("translation", "position", RenamesMap3To4::gdscript_properties_renames, reg_container.gdscript_properties_regexes, "gdscript property");
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
valid = valid && test_conversion_basic("Translation", "Position", RenamesMap3To4::csharp_properties_renames, reg_container.csharp_properties_regexes, "csharp property");
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
valid = valid && test_conversion_basic("NORMALMAP", "NORMAL_MAP", RenamesMap3To4::shaders_renames, reg_container.shaders_regexes, "shader");
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
valid = valid && test_conversion_basic("text_entered", "text_submitted", RenamesMap3To4::gdscript_signals_renames, reg_container.gdscript_signals_regexes, "gdscript signal");
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
valid = valid && test_conversion_basic("TextEntered", "TextSubmitted", RenamesMap3To4::csharp_signals_renames, reg_container.csharp_signal_regexes, "csharp signal");
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
valid = valid && test_conversion_basic("audio/channel_disable_threshold_db", "audio/buses/channel_disable_threshold_db", RenamesMap3To4::project_settings_renames, reg_container.project_settings_regexes, "project setting");
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
valid = valid && test_conversion_basic("\"device\":-1,\"alt\":false,\"shift\":false,\"control\":false,\"meta\":false,\"doubleclick\":false,\"scancode\":0,\"physical_scancode\":16777254,\"script\":null", "\"device\":-1,\"alt_pressed\":false,\"shift_pressed\":false,\"ctrl_pressed\":false,\"meta_pressed\":false,\"double_click\":false,\"keycode\":0,\"physical_keycode\":16777254,\"script\":null", RenamesMap3To4::input_map_renames, reg_container.input_map_regexes, "input map");
Add InputMap conversion All InputMap strings that changed between Godot 3 and 4 are now renamed when converting the project. This includes: - alt -> alt_pressed - shift -> shift_pressed - control -> ctrl_pressed - meta -> meta_pressed - scancode -> keycode - physical_scancode -> physical_keycode - doubleclick -> double_click
2023-01-20 18:05:35 +00:00
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
valid = valid && test_conversion_basic("Transform", "Transform3D", RenamesMap3To4::builtin_types_renames, reg_container.builtin_types_regexes, "builtin type");
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Add conversion for common Theme Overrides
2023-03-08 22:11:23 +00:00
valid = valid && test_conversion_basic("custom_constants/margin_right", "theme_override_constants/margin_right", RenamesMap3To4::theme_override_renames, reg_container.theme_override_regexes, "theme overrides");
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Custom Renames.
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
valid = valid && test_conversion_with_regex("(Connect(A,B,C,D,E,F,G) != OK):", "(Connect(A, new Callable(B, C), D, E, F, G) != OK):", &ProjectConverter3To4::rename_csharp_functions, "custom rename csharp", reg_container);
valid = valid && test_conversion_with_regex("(Disconnect(A,B,C) != OK):", "(Disconnect(A, new Callable(B, C)) != OK):", &ProjectConverter3To4::rename_csharp_functions, "custom rename csharp", reg_container);
valid = valid && test_conversion_with_regex("(IsConnected(A,B,C) != OK):", "(IsConnected(A, new Callable(B, C)) != OK):", &ProjectConverter3To4::rename_csharp_functions, "custom rename", reg_container);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
valid = valid && test_conversion_with_regex("[Remote]", "[RPC(MultiplayerAPI.RPCMode.AnyPeer)]", &ProjectConverter3To4::rename_csharp_attributes, "custom rename csharp", reg_container);
valid = valid && test_conversion_with_regex("[RemoteSync]", "[RPC(MultiplayerAPI.RPCMode.AnyPeer, CallLocal = true)]", &ProjectConverter3To4::rename_csharp_attributes, "custom rename csharp", reg_container);
valid = valid && test_conversion_with_regex("[Sync]", "[RPC(MultiplayerAPI.RPCMode.AnyPeer, CallLocal = true)]", &ProjectConverter3To4::rename_csharp_attributes, "custom rename csharp", reg_container);
valid = valid && test_conversion_with_regex("[Slave]", "[RPC]", &ProjectConverter3To4::rename_csharp_attributes, "custom rename csharp", reg_container);
valid = valid && test_conversion_with_regex("[Puppet]", "[RPC]", &ProjectConverter3To4::rename_csharp_attributes, "custom rename csharp", reg_container);
valid = valid && test_conversion_with_regex("[PuppetSync]", "[RPC(CallLocal = true)]", &ProjectConverter3To4::rename_csharp_attributes, "custom rename csharp", reg_container);
valid = valid && test_conversion_with_regex("[Master]", "The master and mastersync rpc behavior is not officially supported anymore. Try using another keyword or making custom logic using Multiplayer.GetRemoteSenderId()\n[RPC]", &ProjectConverter3To4::rename_csharp_attributes, "custom rename csharp", reg_container);
valid = valid && test_conversion_with_regex("[MasterSync]", "The master and mastersync rpc behavior is not officially supported anymore. Try using another keyword or making custom logic using Multiplayer.GetRemoteSenderId()\n[RPC(CallLocal = true)]", &ProjectConverter3To4::rename_csharp_attributes, "custom rename csharp", reg_container);
Add missed OS window settings to project converter, fix fullscreen indents. Add conversion for OS.window_maximized, vsync_enabled, window_resizable, window_borderless, get_screen_count and set_current_screen. Fix OS.window_fullscreen conversion corrupted line indents.
2023-01-08 15:13:23 +00:00
valid = valid && test_conversion_gdscript_builtin("\tif OS.window_resizable: pass", "\tif (not get_window().unresizable): pass", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tif OS.is_window_resizable(): pass", "\tif (not get_window().unresizable): pass", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tOS.set_window_resizable(Settings.resizable)", "\tget_window().unresizable = not (Settings.resizable)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tOS.window_resizable = Settings.resizable", "\tget_window().unresizable = not (Settings.resizable)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tif OS.window_fullscreen: pass", "\tif ((get_window().mode == Window.MODE_EXCLUSIVE_FULLSCREEN) or (get_window().mode == Window.MODE_FULLSCREEN)): pass", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tif OS.is_window_fullscreen(): pass", "\tif ((get_window().mode == Window.MODE_EXCLUSIVE_FULLSCREEN) or (get_window().mode == Window.MODE_FULLSCREEN)): pass", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tOS.set_window_fullscreen(Settings.fullscreen)", "\tget_window().mode = Window.MODE_EXCLUSIVE_FULLSCREEN if (Settings.fullscreen) else Window.MODE_WINDOWED", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tOS.window_fullscreen = Settings.fullscreen", "\tget_window().mode = Window.MODE_EXCLUSIVE_FULLSCREEN if (Settings.fullscreen) else Window.MODE_WINDOWED", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tif OS.window_maximized: pass", "\tif (get_window().mode == Window.MODE_MAXIMIZED): pass", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tif OS.is_window_maximized(): pass", "\tif (get_window().mode == Window.MODE_MAXIMIZED): pass", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tOS.set_window_maximized(Settings.maximized)", "\tget_window().mode = Window.MODE_MAXIMIZED if (Settings.maximized) else Window.MODE_WINDOWED", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tOS.window_maximized = Settings.maximized", "\tget_window().mode = Window.MODE_MAXIMIZED if (Settings.maximized) else Window.MODE_WINDOWED", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tif OS.window_minimized: pass", "\tif (get_window().mode == Window.MODE_MINIMIZED): pass", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tif OS.is_window_minimized(): pass", "\tif (get_window().mode == Window.MODE_MINIMIZED): pass", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tOS.set_window_minimized(Settings.minimized)", "\tget_window().mode = Window.MODE_MINIMIZED if (Settings.minimized) else Window.MODE_WINDOWED", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tOS.window_minimized = Settings.minimized", "\tget_window().mode = Window.MODE_MINIMIZED if (Settings.minimized) else Window.MODE_WINDOWED", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tif OS.vsync_enabled: pass", "\tif (DisplayServer.window_get_vsync_mode() != DisplayServer.VSYNC_DISABLED): pass", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tif OS.is_vsync_enabled(): pass", "\tif (DisplayServer.window_get_vsync_mode() != DisplayServer.VSYNC_DISABLED): pass", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tOS.set_use_vsync(Settings.vsync)", "\tDisplayServer.window_set_vsync_mode(DisplayServer.VSYNC_ENABLED if (Settings.vsync) else DisplayServer.VSYNC_DISABLED)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tOS.vsync_enabled = Settings.vsync", "\tDisplayServer.window_set_vsync_mode(DisplayServer.VSYNC_ENABLED if (Settings.vsync) else DisplayServer.VSYNC_DISABLED)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tif OS.screen_orientation = OS.SCREEN_ORIENTATION_VERTICAL: pass", "\tif DisplayServer.screen_get_orientation() = DisplayServer.SCREEN_VERTICAL: pass", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tif OS.get_screen_orientation() = OS.SCREEN_ORIENTATION_LANDSCAPE: pass", "\tif DisplayServer.screen_get_orientation() = DisplayServer.SCREEN_LANDSCAPE: pass", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tOS.set_screen_orientation(Settings.orient)", "\tDisplayServer.screen_set_orientation(Settings.orient)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tOS.screen_orientation = Settings.orient", "\tDisplayServer.screen_set_orientation(Settings.orient)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tif OS.is_window_always_on_top(): pass", "\tif get_window().always_on_top: pass", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tOS.set_window_always_on_top(Settings.alwaystop)", "\tget_window().always_on_top = (Settings.alwaystop)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tif OS.get_borderless_window(): pass", "\tif get_window().borderless: pass", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tOS.set_borderless_window(Settings.borderless)", "\tget_window().borderless = (Settings.borderless)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
Change explicit 'Godot 4.0' references to 'Godot 4' Fixes #79276.
2023-07-10 11:08:11 +00:00
valid = valid && test_conversion_gdscript_builtin("\tvar aa = roman(r.move_and_slide( a, b, c, d, e, f )) # Roman", "\tr.set_velocity(a)\n\tr.set_up_direction(b)\n\tr.set_floor_stop_on_slope_enabled(c)\n\tr.set_max_slides(d)\n\tr.set_floor_max_angle(e)\n\t# TODOConverter3To4 infinite_inertia were removed in Godot 4 - previous value `f`\n\tr.move_and_slide()\n\tvar aa = roman(r.velocity) # Roman", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tmove_and_slide( a, b, c, d, e, f ) # Roman", "\tset_velocity(a)\n\tset_up_direction(b)\n\tset_floor_stop_on_slope_enabled(c)\n\tset_max_slides(d)\n\tset_floor_max_angle(e)\n\t# TODOConverter3To4 infinite_inertia were removed in Godot 4 - previous value `f`\n\tmove_and_slide() # Roman", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tvar aa = roman(r.move_and_slide_with_snap( a, g, b, c, d, e, f )) # Roman", "\tr.set_velocity(a)\n\t# TODOConverter3To4 looks that snap in Godot 4 is float, not vector like in Godot 3 - previous value `g`\n\tr.set_up_direction(b)\n\tr.set_floor_stop_on_slope_enabled(c)\n\tr.set_max_slides(d)\n\tr.set_floor_max_angle(e)\n\t# TODOConverter3To4 infinite_inertia were removed in Godot 4 - previous value `f`\n\tr.move_and_slide()\n\tvar aa = roman(r.velocity) # Roman", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tmove_and_slide_with_snap( a, g, b, c, d, e, f ) # Roman", "\tset_velocity(a)\n\t# TODOConverter3To4 looks that snap in Godot 4 is float, not vector like in Godot 3 - previous value `g`\n\tset_up_direction(b)\n\tset_floor_stop_on_slope_enabled(c)\n\tset_max_slides(d)\n\tset_floor_max_angle(e)\n\t# TODOConverter3To4 infinite_inertia were removed in Godot 4 - previous value `f`\n\tmove_and_slide() # Roman", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
Improve function detection to avoid accidental conversion When converting a function like "connect(", we do not want to detect a function like "reconnect(" as a possible candidate for conversion.
2023-03-16 20:58:50 +00:00
valid = valid && test_conversion_gdscript_builtin("remove_and_slide(a,b,c,d,e,f)", "remove_and_slide(a,b,c,d,e,f)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
Change explicit 'Godot 4.0' references to 'Godot 4' Fixes #79276.
2023-07-10 11:08:11 +00:00
valid = valid && test_conversion_gdscript_builtin("list_dir_begin( a , b )", "list_dir_begin() # TODOConverter3To4 fill missing arguments https://github.com/godotengine/godot/pull/40547", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("list_dir_begin( a )", "list_dir_begin() # TODOConverter3To4 fill missing arguments https://github.com/godotengine/godot/pull/40547", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("list_dir_begin( )", "list_dir_begin() # TODOConverter3To4 fill missing arguments https://github.com/godotengine/godot/pull/40547", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
valid = valid && test_conversion_gdscript_builtin("sort_custom( a , b )", "sort_custom(Callable(a, b))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
valid = valid && test_conversion_gdscript_builtin("func c(var a, var b)", "func c(a, b)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
valid = valid && test_conversion_gdscript_builtin("draw_line(1, 2, 3, 4, 5)", "draw_line(1, 2, 3, 4)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
Change explicit 'Godot 4.0' references to 'Godot 4' Fixes #79276.
2023-07-10 11:08:11 +00:00
valid = valid && test_conversion_gdscript_builtin("\timage.lock()", "\tfalse # image.lock() # TODOConverter3To4, Image no longer requires locking, `false` helps to not break one line if/else, so it can freely be removed", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\timage.unlock()", "\tfalse # image.unlock() # TODOConverter3To4, Image no longer requires locking, `false` helps to not break one line if/else, so it can freely be removed", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\troman.image.unlock()", "\tfalse # roman.image.unlock() # TODOConverter3To4, Image no longer requires locking, `false` helps to not break one line if/else, so it can freely be removed", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
valid = valid && test_conversion_gdscript_builtin("\tmtx.lock()", "\tmtx.lock()", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tmutex.unlock()", "\tmutex.unlock()", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
valid = valid && test_conversion_with_regex("extends CSGBox", "extends CSGBox3D", &ProjectConverter3To4::rename_classes, "classes", reg_container);
valid = valid && test_conversion_with_regex("CSGBox", "CSGBox3D", &ProjectConverter3To4::rename_classes, "classes", reg_container);
valid = valid && test_conversion_with_regex("Spatial", "Node3D", &ProjectConverter3To4::rename_classes, "classes", reg_container);
valid = valid && test_conversion_with_regex("Spatial.tscn", "Spatial.tscn", &ProjectConverter3To4::rename_classes, "classes", reg_container);
valid = valid && test_conversion_with_regex("Spatial.gd", "Spatial.gd", &ProjectConverter3To4::rename_classes, "classes", reg_container);
valid = valid && test_conversion_with_regex("Spatial.shader", "Spatial.shader", &ProjectConverter3To4::rename_classes, "classes", reg_container);
valid = valid && test_conversion_with_regex("Spatial.other", "Node3D.other", &ProjectConverter3To4::rename_classes, "classes", reg_container);
Ensure quotes are escaped when converting builtin scripts
2023-05-23 14:55:52 +00:00
valid = valid && test_conversion_gdscript_builtin("\nonready", "\n@onready", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("onready", "@onready", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword", reg_container, false);
valid = valid && test_conversion_gdscript_builtin(" onready", " onready", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\nexport", "\n@export", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\texport", "\t@export", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\texport_dialog", "\texport_dialog", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("export", "@export", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword", reg_container, false);
valid = valid && test_conversion_gdscript_builtin(" export", " export", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\n\nremote func", "\n\n@rpc(\"any_peer\") func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\n\nremote func", "\n\n@rpc(\\\"any_peer\\\") func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword", reg_container, true);
valid = valid && test_conversion_gdscript_builtin("\n\nremotesync func", "\n\n@rpc(\"any_peer\", \"call_local\") func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\n\nremotesync func", "\n\n@rpc(\\\"any_peer\\\", \\\"call_local\\\") func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword", reg_container, true);
valid = valid && test_conversion_gdscript_builtin("\n\nsync func", "\n\n@rpc(\"any_peer\", \"call_local\") func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\n\nsync func", "\n\n@rpc(\\\"any_peer\\\", \\\"call_local\\\") func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword", reg_container, true);
valid = valid && test_conversion_gdscript_builtin("\n\nslave func", "\n\n@rpc func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\n\npuppet func", "\n\n@rpc func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\n\npuppetsync func", "\n\n@rpc(\"call_local\") func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\n\npuppetsync func", "\n\n@rpc(\\\"call_local\\\") func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword", reg_container, true);
valid = valid && test_conversion_gdscript_builtin("\n\nmaster func", "\n\nThe master and mastersync rpc behavior is not officially supported anymore. Try using another keyword or making custom logic using get_multiplayer().get_remote_sender_id()\n@rpc func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\n\nmastersync func", "\n\nThe master and mastersync rpc behavior is not officially supported anymore. Try using another keyword or making custom logic using get_multiplayer().get_remote_sender_id()\n@rpc(\"call_local\") func", &ProjectConverter3To4::rename_gdscript_keywords, "gdscript keyword", reg_container, false);
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
Fix GDScript code style regarding colon
2023-03-03 14:42:32 +00:00
valid = valid && test_conversion_gdscript_builtin("var size: Vector2 = Vector2() setget set_function, get_function", "var size: Vector2 = Vector2(): get = get_function, set = set_function", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("var size: Vector2 = Vector2() setget set_function, ", "var size: Vector2 = Vector2(): set = set_function", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("var size: Vector2 = Vector2() setget set_function", "var size: Vector2 = Vector2(): set = set_function", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("var size: Vector2 = Vector2() setget , get_function", "var size: Vector2 = Vector2(): get = get_function", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
valid = valid && test_conversion_gdscript_builtin("get_node(@", "get_node(", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("yield(this, \"timeout\")", "await this.timeout", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("yield(this, \\\"timeout\\\")", "await this.timeout", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, true);
Add parentheses around arguments when converting xform
2023-03-09 23:04:04 +00:00
valid = valid && test_conversion_gdscript_builtin(" Transform.xform(Vector3(a,b,c) + Vector3.UP) ", " Transform * (Vector3(a,b,c) + Vector3.UP) ", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin(" Transform.xform_inv(Vector3(a,b,c) + Vector3.UP) ", " (Vector3(a,b,c) + Vector3.UP) * Transform ", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
valid = valid && test_conversion_gdscript_builtin("export(float) var lifetime = 3.0", "export var lifetime: float = 3.0", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("export(String, 'AnonymousPro', 'CourierPrime') var _font_name = 'AnonymousPro'", "export var _font_name = 'AnonymousPro' # (String, 'AnonymousPro', 'CourierPrime')", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false); // TODO, this is only a workaround
valid = valid && test_conversion_gdscript_builtin("export(PackedScene) var mob_scene", "export var mob_scene: PackedScene", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
Fix exported variables declaring or inferring the type were not converted correctly.
2023-04-10 16:19:26 +00:00
valid = valid && test_conversion_gdscript_builtin("export(float) var lifetime: float = 3.0", "export var lifetime: float = 3.0", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("export var lifetime: float = 3.0", "export var lifetime: float = 3.0", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("export var lifetime := 3.0", "export var lifetime := 3.0", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("export(float) var lifetime := 3.0", "export var lifetime := 3.0", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
valid = valid && test_conversion_gdscript_builtin("var d = parse_json(roman(sfs))", "var test_json_conv = JSON.new()\ntest_json_conv.parse(roman(sfs))\nvar d = test_json_conv.get_data()", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("to_json( AA ) szon", "JSON.new().stringify( AA ) szon", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("s to_json", "s JSON.new().stringify", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("AF to_json2", "AF to_json2", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("var rr = JSON.parse(a)", "var test_json_conv = JSON.new()\ntest_json_conv.parse(a)\nvar rr = test_json_conv.get_data()", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("empty()", "is_empty()", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin(".empty", ".empty", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin(").roman(", ").roman(", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\t.roman(", "\tsuper.roman(", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin(" .roman(", " super.roman(", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin(".1", ".1", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin(" .1", " .1", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("'.'", "'.'", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("'.a'", "'.a'", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\t._input(_event)", "\tsuper._input(_event)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
valid = valid && test_conversion_gdscript_builtin("(connect(A,B,C) != OK):", "(connect(A, Callable(B, C)) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("(connect(A,B,C,D) != OK):", "(connect(A, Callable(B, C).bind(D)) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("(connect(A,B,C,[D]) != OK):", "(connect(A, Callable(B, C).bind(D)) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("(connect(A,B,C,[D,E]) != OK):", "(connect(A, Callable(B, C).bind(D,E)) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("(connect(A,B,C,[D,E],F) != OK):", "(connect(A, Callable(B, C).bind(D,E), F) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("(connect(A,B,C,D,E) != OK):", "(connect(A, Callable(B, C).bind(D), E) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
Improve function detection to avoid accidental conversion When converting a function like "connect(", we do not want to detect a function like "reconnect(" as a possible candidate for conversion.
2023-03-16 20:58:50 +00:00
valid = valid && test_conversion_gdscript_builtin(".connect(A,B,C)", ".connect(A, Callable(B, C))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("abc.connect(A,B,C)", "abc.connect(A, Callable(B, C))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("\tconnect(A,B,C)", "\tconnect(A, Callable(B, C))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin(" connect(A,B,C)", " connect(A, Callable(B, C))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("_connect(A,B,C)", "_connect(A,B,C)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("do_connect(A,B,C)", "do_connect(A,B,C)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("$connect(A,B,C)", "$connect(A,B,C)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("@connect(A,B,C)", "@connect(A,B,C)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
valid = valid && test_conversion_gdscript_builtin("(start(A,B) != OK):", "(start(Callable(A, B)) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
valid = valid && test_conversion_gdscript_builtin("func start(A,B):", "func start(A,B):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
valid = valid && test_conversion_gdscript_builtin("(start(A,B,C,D,E,F,G) != OK):", "(start(Callable(A, B).bind(C), D, E, F, G) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("disconnect(A,B,C) != OK):", "disconnect(A, Callable(B, C)) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("is_connected(A,B,C) != OK):", "is_connected(A, Callable(B, C)) != OK):", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("is_connected(A,B,C))", "is_connected(A, Callable(B, C)))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
valid = valid && test_conversion_gdscript_builtin("(tween_method(A,B,C,D,E).foo())", "(tween_method(Callable(A, B), C, D, E).foo())", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("(tween_method(A,B,C,D,E,[F,G]).foo())", "(tween_method(Callable(A, B).bind(F,G), C, D, E).foo())", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("(tween_callback(A,B).foo())", "(tween_callback(Callable(A, B)).foo())", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("(tween_callback(A,B,[C,D]).foo())", "(tween_callback(Callable(A, B).bind(C,D)).foo())", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
valid = valid && test_conversion_gdscript_builtin("func _init(", "func _init(", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
Correct superclass constructors in 3to4. Fixes #70542. The 3to4 conversion tool was not handling superclass constructors. We should translate the godot3 syntax: ```gdscript func _init(a,b,c).(a,b,c): pass func _init(a,b,c): super(a,b,c) ``` Originally, the _init conversion was intended to remove `void` return types from _init functions, as this was disallowed due to #50589. As that was resolved by #53366, I removed that part of the conversion logic. If a void return type is present on a constructor, the converter now leaves it. Here's a sample diff from my own project: ```diff @@ -103,10 +105,11 @@ class Real: class Text: extends Setting - var choices: PoolStringArray - var value: String setget set_value, get_value + var choices: PackedStringArray + var value: String : get = get_value, set = set_value - func _init(section: String, key: String, default: String, choice_list: Array).(section, key, default) -> void: + func _init(section: String, key: String, default: String, choice_list: Array) -> void: + super(section, key, default) choices = choice_list func normalize(val): @@ -129,9 +132,10 @@ class Text: class Boolean: extends Setting - var value: bool setget set_value, get_value + var value: bool : get = get_value, set = set_value - func _init(section: String, key: String, default: bool).(section, key, default) -> void: + func _init(section: String, key: String, default: bool) -> void: + super(section, key, default) pass ```
2023-03-03 23:31:40 +00:00
valid = valid && test_conversion_gdscript_builtin("func _init(a,b,c).(d,e,f):", "func _init(a,b,c):\n\tsuper(d,e,f)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("func _init(a,b,c).(a.b(),c.d()):", "func _init(a,b,c):\n\tsuper(a.b(),c.d())", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("func _init(p_x:int)->void:", "func _init(p_x:int)->void:", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("func _init(a: int).(d,e,f) -> void:", "func _init(a: int) -> void:\n\tsuper(d,e,f)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
valid = valid && test_conversion_gdscript_builtin("q_PackedDataContainer._iter_init(variable1)", "q_PackedDataContainer._iter_init(variable1)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("create_from_image(aa, bb)", "create_from_image(aa) #,bb", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("q_ImageTexture.create_from_image(variable1, variable2)", "q_ImageTexture.create_from_image(variable1) #,variable2", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
valid = valid && test_conversion_gdscript_builtin("set_cell_item(a, b, c, d ,e) # AA", "set_cell_item(Vector3(a, b, c), d, e) # AA", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
valid = valid && test_conversion_gdscript_builtin("set_cell_item(a, b)", "set_cell_item(a, b)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
valid = valid && test_conversion_gdscript_builtin("get_cell_item_orientation(a, b,c)", "get_cell_item_orientation(Vector3i(a, b, c))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("get_cell_item(a, b,c)", "get_cell_item(Vector3i(a, b, c))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("map_to_world(a, b,c)", "map_to_local(Vector3i(a, b, c))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
valid = valid && test_conversion_gdscript_builtin("PackedStringArray(req_godot).join('.')", "'.'.join(PackedStringArray(req_godot))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("=PackedStringArray(req_godot).join('.')", "='.'.join(PackedStringArray(req_godot))", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("apply_force(position, impulse)", "apply_force(impulse, position)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("apply_impulse(position, impulse)", "apply_impulse(impulse, position)", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
Change explicit 'Godot 4.0' references to 'Godot 4' Fixes #79276.
2023-07-10 11:08:11 +00:00
valid = valid && test_conversion_gdscript_builtin("draw_rect(a,b,c,d,e).abc", "draw_rect(a, b, c, d).abc# e) TODOConverter3To4 Antialiasing argument is missing", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
valid = valid && test_conversion_gdscript_builtin("get_focus_owner()", "get_viewport().gui_get_focus_owner()", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("button.pressed = 1", "button.button_pressed = 1", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("button.pressed=1", "button.button_pressed=1", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
valid = valid && test_conversion_gdscript_builtin("button.pressed SF", "button.pressed SF", &ProjectConverter3To4::rename_gdscript_functions, "custom rename", reg_container, false);
Fix conversion of hex color strings in project converter
2023-09-29 12:51:37 +00:00
valid = valid && test_conversion_with_regex("Color(\"#f47d\")", "Color(\"#47df\")", &ProjectConverter3To4::convert_hexadecimal_colors, "color literals", reg_container);
valid = valid && test_conversion_with_regex("Color(\"#ff478cbf\")", "Color(\"#478cbfff\")", &ProjectConverter3To4::convert_hexadecimal_colors, "color literals", reg_container);
valid = valid && test_conversion_with_regex("Color(\"#de32bf\")", "Color(\"#de32bf\")", &ProjectConverter3To4::convert_hexadecimal_colors, "color literals", reg_container);
valid = valid && test_conversion_with_regex("AAA Color.white AF", "AAA Color.WHITE AF", &ProjectConverter3To4::rename_colors, "color constants", reg_container);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Add keycode project conversion
2023-03-02 14:24:00 +00:00
// Note: Do not change to *scancode*, it is applied before that conversion.
valid = valid && test_conversion_with_regex("\"device\":-1,\"scancode\":16777231,\"physical_scancode\":16777232", "\"device\":-1,\"scancode\":4194319,\"physical_scancode\":4194320", &ProjectConverter3To4::rename_input_map_scancode, "custom rename", reg_container);
valid = valid && test_conversion_with_regex("\"device\":-1,\"scancode\":65,\"physical_scancode\":66", "\"device\":-1,\"scancode\":65,\"physical_scancode\":66", &ProjectConverter3To4::rename_input_map_scancode, "custom rename", reg_container);
Add joypad input map conversion to project converter. Fixes godotengine#77314 (Input Map's joypad button numbers are not converted).
2023-05-29 14:16:46 +00:00
valid = valid && test_conversion_with_regex("\"device\":0,\"button_index\":5,\"pressure\":0.0,\"pressed\":false,", "\"device\":0,\"button_index\":10,\"pressure\":0.0,\"pressed\":false,", &ProjectConverter3To4::rename_joypad_buttons_and_axes, "custom rename", reg_container);
valid = valid && test_conversion_with_regex("\"device\":0,\"axis\":6,", "\"device\":0,\"axis\":4,", &ProjectConverter3To4::rename_joypad_buttons_and_axes, "custom rename", reg_container);
valid = valid && test_conversion_with_regex("InputEventJoypadButton,\"button_index\":7,\"pressure\":0.0,\"pressed\":false,\"script\":null", "InputEventJoypadMotion,\"axis\":5,\"axis_value\":1.0,\"script\":null", &ProjectConverter3To4::rename_joypad_buttons_and_axes, "custom rename", reg_container);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
// Custom rule conversion
{
String from = "instance";
String to = "instantiate";
String name = "AA.instance()";
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
Vector<SourceLine> got = split_lines(name);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
String expected = "AA.instantiate()";
custom_rename(got, from, to);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
String got_str = collect_string_from_vector(got);
if (got_str != expected) {
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
ERR_PRINT(vformat("Failed to convert custom rename \"%s\" to \"%s\", got \"%s\", instead.", name, expected, got_str));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
valid = valid && (got_str == expected);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
// get_object_of_execution
{
{ String base = "var roman = kieliszek.";
String expected = "kieliszek.";
String got = get_object_of_execution(base);
if (got != expected) {
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
ERR_PRINT(vformat("Failed to get proper data from get_object_of_execution. \"%s\" should return \"%s\"(%d), got \"%s\"(%d), instead.", base, expected, expected.size(), got, got.size()));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
valid = valid && (got == expected);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
{
String base = "r.";
String expected = "r.";
String got = get_object_of_execution(base);
if (got != expected) {
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
ERR_PRINT(vformat("Failed to get proper data from get_object_of_execution. \"%s\" should return \"%s\"(%d), got \"%s\"(%d), instead.", base, expected, expected.size(), got, got.size()));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
valid = valid && (got == expected);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
{
String base = "mortadela(";
String expected = "";
String got = get_object_of_execution(base);
if (got != expected) {
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
ERR_PRINT(vformat("Failed to get proper data from get_object_of_execution. \"%s\" should return \"%s\"(%d), got \"%s\"(%d), instead.", base, expected, expected.size(), got, got.size()));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
valid = valid && (got == expected);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Add conversion for instance(), set_shader_param() and node path literals
2022-08-08 21:05:56 +00:00
{
String base = "var node = $world/ukraine/lviv.";
String expected = "$world/ukraine/lviv.";
String got = get_object_of_execution(base);
if (got != expected) {
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
ERR_PRINT(vformat("Failed to get proper data from get_object_of_execution. \"%s\" should return \"%s\"(%d), got \"%s\"(%d), instead.", base, expected, expected.size(), got, got.size()));
Add conversion for instance(), set_shader_param() and node path literals
2022-08-08 21:05:56 +00:00
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
valid = valid && (got == expected);
Add conversion for instance(), set_shader_param() and node path literals
2022-08-08 21:05:56 +00:00
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
// get_starting_space
{
String base = "\t\t\t var roman = kieliszek.";
String expected = "\t\t\t";
String got = get_starting_space(base);
if (got != expected) {
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
ERR_PRINT(vformat("Failed to get proper data from get_object_of_execution. \"%s\" should return \"%s\"(%d), got \"%s\"(%d), instead.", base, expected, expected.size(), got, got.size()));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
valid = valid && (got == expected);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
// Parse Arguments
{
String line = "( )";
Vector<String> got_vector = parse_arguments(line);
String got = "";
String expected = "";
for (String &part : got_vector) {
got += part + "|||";
}
if (got != expected) {
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
ERR_PRINT(vformat("Failed to get proper data from parse_arguments. \"%s\" should return \"%s\"(%d), got \"%s\"(%d), instead.", line, expected, expected.size(), got, got.size()));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
valid = valid && (got == expected);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
{
String line = "(a , b , c)";
Vector<String> got_vector = parse_arguments(line);
String got = "";
String expected = "a|||b|||c|||";
for (String &part : got_vector) {
got += part + "|||";
}
if (got != expected) {
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
ERR_PRINT(vformat("Failed to get proper data from parse_arguments. \"%s\" should return \"%s\"(%d), got \"%s\"(%d), instead.", line, expected, expected.size(), got, got.size()));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
valid = valid && (got == expected);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
{
String line = "(a , \"b,\" , c)";
Vector<String> got_vector = parse_arguments(line);
String got = "";
String expected = "a|||\"b,\"|||c|||";
for (String &part : got_vector) {
got += part + "|||";
}
if (got != expected) {
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
ERR_PRINT(vformat("Failed to get proper data from parse_arguments. \"%s\" should return \"%s\"(%d), got \"%s\"(%d), instead.", line, expected, expected.size(), got, got.size()));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
valid = valid && (got == expected);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
{
String line = "(a , \"(,),,,,\" , c)";
Vector<String> got_vector = parse_arguments(line);
String got = "";
String expected = "a|||\"(,),,,,\"|||c|||";
for (String &part : got_vector) {
got += part + "|||";
}
if (got != expected) {
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
ERR_PRINT(vformat("Failed to get proper data from parse_arguments. \"%s\" should return \"%s\"(%d), got \"%s\"(%d), instead.", line, expected, expected.size(), got, got.size()));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
valid = valid && (got == expected);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
return valid;
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Validate in all arrays if names don't do cyclic renames "Node" -> "Node2D" | "Node2D" -> "2DNode"
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
bool ProjectConverter3To4::test_array_names() {
bool valid = true;
Vector<String> names = Vector<String>();
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Validate if all classes are valid.
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
{
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
for (unsigned int current_index = 0; RenamesMap3To4::class_renames[current_index][0]; current_index++) {
const String old_class = RenamesMap3To4::class_renames[current_index][0];
const String new_class = RenamesMap3To4::class_renames[current_index][1];
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Light2D, Texture, Viewport are special classes(probably virtual ones).
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
if (ClassDB::class_exists(StringName(old_class)) && old_class != "Light2D" && old_class != "Texture" && old_class != "Viewport") {
Change explicit 'Godot 4.0' references to 'Godot 4' Fixes #79276.
2023-07-10 11:08:11 +00:00
ERR_PRINT(vformat("Class \"%s\" exists in Godot 4, so it cannot be renamed to something else.", old_class));
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
valid = false; // This probably should be only a warning, but not 100% sure - this would need to be added to CI.
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Callable is special class, to which normal classes may be renamed.
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
if (!ClassDB::class_exists(StringName(new_class)) && new_class != "Callable") {
Change explicit 'Godot 4.0' references to 'Godot 4' Fixes #79276.
2023-07-10 11:08:11 +00:00
ERR_PRINT(vformat("Class \"%s\" does not exist in Godot 4, so it cannot be used in the conversion.", old_class));
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
valid = false; // This probably should be only a warning, but not 100% sure - this would need to be added to CI.
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
}
{
HashSet<String> all_functions;
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// List of excluded functions from builtin types and global namespace, because currently it is not possible to get list of functions from them.
// This will be available when https://github.com/godotengine/godot/pull/49053 or similar will be included into Godot.
Add GDScript `to_wchar_buffer` and `get_string_from_wchar` functions.
2023-02-13 14:18:12 +00:00
static const char *builtin_types_excluded_functions[] = { "dict_to_inst", "inst_to_dict", "bytes_to_var", "bytes_to_var_with_objects", "db_to_linear", "deg_to_rad", "linear_to_db", "rad_to_deg", "randf_range", "snapped", "str_to_var", "var_to_str", "var_to_bytes", "var_to_bytes_with_objects", "move_toward", "uri_encode", "uri_decode", "remove_at", "get_rotation_quaternion", "limit_length", "grow_side", "is_absolute_path", "is_valid_int", "lerp", "to_ascii_buffer", "to_utf8_buffer", "to_utf32_buffer", "to_wchar_buffer", "snapped", "remap", "rfind", nullptr };
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
for (int current_index = 0; builtin_types_excluded_functions[current_index]; current_index++) {
all_functions.insert(builtin_types_excluded_functions[current_index]);
}
Converter: Rename 3.x Vector2 clamped to limit_length
2023-02-26 11:09:30 +00:00
//for (int type = Variant::Type::NIL + 1; type < Variant::Type::VARIANT_MAX; type++) {
// List<MethodInfo> method_list;
// Variant::get_method_list_by_type(&method_list, Variant::Type(type));
// for (MethodInfo &function_data : method_list) {
// if (!all_functions.has(function_data.name)) {
// all_functions.insert(function_data.name);
// }
// }
//}
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
List<StringName> classes_list;
ClassDB::get_class_list(&classes_list);
for (StringName &name_of_class : classes_list) {
List<MethodInfo> method_list;
ClassDB::get_method_list(name_of_class, &method_list, true);
for (MethodInfo &function_data : method_list) {
if (!all_functions.has(function_data.name)) {
all_functions.insert(function_data.name);
}
}
}
int current_element = 0;
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
while (RenamesMap3To4::gdscript_function_renames[current_element][0] != nullptr) {
String name_3_x = RenamesMap3To4::gdscript_function_renames[current_element][0];
String name_4_0 = RenamesMap3To4::gdscript_function_renames[current_element][1];
if (!all_functions.has(name_4_0)) {
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
ERR_PRINT(vformat("Missing GDScript function in pair (%s - ===> %s <===)", name_3_x, name_4_0));
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
valid = false;
}
current_element++;
}
}
if (!valid) {
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
ERR_PRINT("Found function which is used in the converter, but it cannot be found in Godot 4. Rename this element or remove its entry if it's obsolete.");
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
valid = valid && test_single_array(RenamesMap3To4::enum_renames);
valid = valid && test_single_array(RenamesMap3To4::class_renames, true);
valid = valid && test_single_array(RenamesMap3To4::gdscript_function_renames, true);
valid = valid && test_single_array(RenamesMap3To4::csharp_function_renames, true);
valid = valid && test_single_array(RenamesMap3To4::gdscript_properties_renames, true);
valid = valid && test_single_array(RenamesMap3To4::csharp_properties_renames, true);
valid = valid && test_single_array(RenamesMap3To4::shaders_renames, true);
valid = valid && test_single_array(RenamesMap3To4::gdscript_signals_renames);
valid = valid && test_single_array(RenamesMap3To4::project_settings_renames);
Add 3-to-4 renames for project settings in project.godot In the ConfigFile format, the first subpath is the category and is not part of the line that the regex would match. Fixes #66125.
2023-02-27 12:34:35 +00:00
valid = valid && test_single_array(RenamesMap3To4::project_godot_renames);
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
valid = valid && test_single_array(RenamesMap3To4::input_map_renames);
valid = valid && test_single_array(RenamesMap3To4::builtin_types_renames);
valid = valid && test_single_array(RenamesMap3To4::color_renames);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
return valid;
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Validates the array to prevent cyclic renames, such as `Node` -> `Node2D`, then `Node2D` -> `2DNode`.
// Also checks if names contain leading or trailing spaces.
bool ProjectConverter3To4::test_single_array(const char *p_array[][2], bool p_ignore_4_0_name) {
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
bool valid = true;
Vector<String> names = Vector<String>();
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
for (unsigned int current_index = 0; p_array[current_index][0]; current_index++) {
String name_3_x = p_array[current_index][0];
String name_4_0 = p_array[current_index][1];
if (name_3_x != name_3_x.strip_edges()) {
ERR_PRINT(vformat("Invalid Entry \"%s\" contains leading or trailing spaces.", name_3_x));
valid = false;
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
if (names.has(name_3_x)) {
ERR_PRINT(vformat("Found duplicated entry, pair ( -> %s , %s)", name_3_x, name_4_0));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
valid = false;
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
names.append(name_3_x);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
if (name_4_0 != name_4_0.strip_edges()) {
ERR_PRINT(vformat("Invalid Entry \"%s\" contains leading or trailing spaces.", name_3_x));
valid = false;
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
if (names.has(name_4_0)) {
ERR_PRINT(vformat("Found duplicated entry, pair ( -> %s , %s)", name_3_x, name_4_0));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
valid = false;
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
if (!p_ignore_4_0_name) {
names.append(name_4_0);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
}
return valid;
};
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Returns arguments from given function execution, this cannot be really done as regex.
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
// `abc(d,e(f,g),h)` -> [d], [e(f,g)], [h]
Vector<String> ProjectConverter3To4::parse_arguments(const String &line) {
Vector<String> parts;
int string_size = line.length();
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
int start_part = 0; // Index of beginning of start part.
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
int parts_counter = 0;
char32_t previous_character = '\0';
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
bool is_inside_string = false; // If true, it ignores these 3 characters ( , ) inside string.
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
ERR_FAIL_COND_V_MSG(line.count("(") != line.count(")"), parts, vformat("Converter internal bug: substring should have equal number of open and close parentheses in line - \"%s\".", line));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
for (int current_index = 0; current_index < string_size; current_index++) {
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
char32_t character = line.get(current_index);
switch (character) {
Fix braces handling when parsing method arguments on project conversion
2023-06-19 20:46:42 +00:00
case '(':
case '[':
case '{': {
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
parts_counter++;
if (parts_counter == 1 && !is_inside_string) {
start_part = current_index;
}
break;
};
Fix braces handling when parsing method arguments on project conversion
2023-06-19 20:46:42 +00:00
case ')':
case '}': {
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
parts_counter--;
if (parts_counter == 0 && !is_inside_string) {
parts.append(line.substr(start_part + 1, current_index - start_part - 1));
start_part = current_index;
}
break;
};
3to4: Fix handling of arrays in connect() and JSON alignment
2022-08-15 17:48:04 +00:00
case ']': {
parts_counter--;
if (parts_counter == 0 && !is_inside_string) {
parts.append(line.substr(start_part, current_index - start_part));
start_part = current_index;
}
break;
};
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
case ',': {
if (parts_counter == 1 && !is_inside_string) {
parts.append(line.substr(start_part + 1, current_index - start_part - 1));
start_part = current_index;
}
break;
};
case '"': {
if (previous_character != '\\')
is_inside_string = !is_inside_string;
}
}
previous_character = character;
}
Vector<String> clean_parts;
for (String &part : parts) {
part = part.strip_edges();
if (!part.is_empty()) {
clean_parts.append(part);
}
}
return clean_parts;
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Finds latest parenthesis owned by function.
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
// `function(abc(a,b),DD)):` finds this parenthess `function(abc(a,b),DD => ) <= ):`
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
int ProjectConverter3To4::get_end_parenthesis(const String &line) const {
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
int current_state = 0;
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
for (int current_index = 0; line.length() > current_index; current_index++) {
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
char32_t character = line.get(current_index);
if (character == '(') {
current_state++;
}
if (character == ')') {
current_state--;
if (current_state == 0) {
return current_index;
}
}
}
return -1;
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Merges multiple arguments into a single String.
// Needed when after processing e.g. 2 arguments, later arguments are not changed in any way.
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
String ProjectConverter3To4::connect_arguments(const Vector<String> &arguments, int from, int to) const {
if (to == -1) {
to = arguments.size();
}
String value;
if (arguments.size() > 0 && from != 0 && from < to) {
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
value = ", ";
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
for (int i = from; i < to; i++) {
value += arguments[i];
if (i != to - 1) {
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
value += ", ";
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
}
return value;
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Returns the indentation (spaces and tabs) at the start of the line e.g. `\t\tmove_this` returns `\t\t`.
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
String ProjectConverter3To4::get_starting_space(const String &line) const {
String empty_space;
int current_character = 0;
if (line.is_empty()) {
return empty_space;
}
if (line[0] == ' ') {
while (current_character < line.size()) {
if (line[current_character] == ' ') {
empty_space += ' ';
current_character++;
} else {
break;
}
}
}
if (line[0] == '\t') {
while (current_character < line.size()) {
if (line[current_character] == '\t') {
empty_space += '\t';
current_character++;
} else {
break;
}
}
}
return empty_space;
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Returns the object that’s executing the function in the line.
// e.g. Passing the line "var roman = kieliszek.funkcja()" to this function returns "kieliszek".
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
String ProjectConverter3To4::get_object_of_execution(const String &line) const {
int end = line.size() - 1; // Last one is \0
Add conversion for instance(), set_shader_param() and node path literals
2022-08-08 21:05:56 +00:00
int variable_start = end - 1;
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
int start = end - 1;
Add conversion for instance(), set_shader_param() and node path literals
2022-08-08 21:05:56 +00:00
bool is_possibly_nodepath = false;
bool is_valid_nodepath = false;
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
while (start >= 0) {
char32_t character = line[start];
Add conversion for instance(), set_shader_param() and node path literals
2022-08-08 21:05:56 +00:00
bool is_variable_char = (character >= 'A' && character <= 'Z') || (character >= 'a' && character <= 'z') || character == '.' || character == '_';
bool is_nodepath_start = character == '$';
bool is_nodepath_sep = character == '/';
if (is_variable_char || is_nodepath_start || is_nodepath_sep) {
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
if (start == 0) {
break;
Add conversion for instance(), set_shader_param() and node path literals
2022-08-08 21:05:56 +00:00
} else if (is_nodepath_sep) {
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Freeze variable_start, try to fetch more chars since this might be a Node path literal.
Add conversion for instance(), set_shader_param() and node path literals
2022-08-08 21:05:56 +00:00
is_possibly_nodepath = true;
} else if (is_nodepath_start) {
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Found $, this is a Node path literal.
Add conversion for instance(), set_shader_param() and node path literals
2022-08-08 21:05:56 +00:00
is_valid_nodepath = true;
break;
}
if (!is_possibly_nodepath) {
variable_start--;
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
start--;
continue;
} else {
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Abandon all hope, this is neither a variable nor a Node path literal.
variable_start++; // Found invalid character, needs to be ignored.
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
break;
}
}
Add conversion for instance(), set_shader_param() and node path literals
2022-08-08 21:05:56 +00:00
if (is_valid_nodepath) {
variable_start = start;
}
return line.substr(variable_start, (end - variable_start));
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
void ProjectConverter3To4::rename_colors(Vector<SourceLine> &source_lines, const RegExContainer &reg_container) {
for (SourceLine &source_line : source_lines) {
if (source_line.is_comment) {
continue;
}
String &line = source_line.line;
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (uint64_t(line.length()) <= maximum_line_length) {
if (line.contains("Color.")) {
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
for (unsigned int current_index = 0; RenamesMap3To4::color_renames[current_index][0]; current_index++) {
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
line = reg_container.color_regexes[current_index]->sub(line, reg_container.color_renamed[current_index], true);
}
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
}
};
Fix conversion of hex color strings in project converter
2023-09-29 12:51:37 +00:00
// Convert hexadecimal colors from ARGB to RGBA
void ProjectConverter3To4::convert_hexadecimal_colors(Vector<SourceLine> &source_lines, const RegExContainer &reg_container) {
for (SourceLine &source_line : source_lines) {
if (source_line.is_comment) {
continue;
}
String &line = source_line.line;
if (uint64_t(line.length()) <= maximum_line_length) {
if (line.contains("Color(\"")) {
line = reg_container.color_hexadecimal_short_constructor.sub(line, "Color(\"#$2$1", true);
line = reg_container.color_hexadecimal_full_constructor.sub(line, "Color(\"#$2$1", true);
}
}
}
}
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
Vector<String> ProjectConverter3To4::check_for_rename_colors(Vector<String> &lines, const RegExContainer &reg_container) {
Vector<String> found_renames;
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
int current_line = 1;
for (String &line : lines) {
if (uint64_t(line.length()) <= maximum_line_length) {
if (line.contains("Color.")) {
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
for (unsigned int current_index = 0; RenamesMap3To4::color_renames[current_index][0]; current_index++) {
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
TypedArray<RegExMatch> reg_match = reg_container.color_regexes[current_index]->search_all(line);
if (reg_match.size() > 0) {
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
found_renames.append(line_formatter(current_line, RenamesMap3To4::color_renames[current_index][0], RenamesMap3To4::color_renames[current_index][1], line));
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
}
}
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
current_line++;
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
return found_renames;
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Move tool declarations to top in 3to4. In godot3, `tool` can follow keywords like `extends` and `class_name` In godot4, `@tool` must be the first line in the file.
2023-03-05 12:43:51 +00:00
void ProjectConverter3To4::fix_tool_declaration(Vector<SourceLine> &source_lines, const RegExContainer &reg_container) {
Fix pause_mode may not be converted correctly in .tscn files.
2023-04-17 17:53:50 +00:00
// In godot4, "tool" became "@tool" and must be located at the top of the file.
Move tool declarations to top in 3to4. In godot3, `tool` can follow keywords like `extends` and `class_name` In godot4, `@tool` must be the first line in the file.
2023-03-05 12:43:51 +00:00
for (int i = 0; i < source_lines.size(); ++i) {
if (source_lines[i].line == "tool") {
source_lines.remove_at(i);
source_lines.insert(0, { "@tool", false });
Fix pause_mode may not be converted correctly in .tscn files.
2023-04-17 17:53:50 +00:00
return; // assuming there's at most 1 tool declaration.
}
}
}
void ProjectConverter3To4::fix_pause_mode(Vector<SourceLine> &source_lines, const RegExContainer &reg_container) {
// In Godot 3, the pause_mode 2 equals the PAUSE_MODE_PROCESS value.
// In Godot 4, the pause_mode PAUSE_MODE_PROCESS was renamed to PROCESS_MODE_ALWAYS and equals the number 3.
// We therefore convert pause_mode = 2 to pause_mode = 3.
for (SourceLine &source_line : source_lines) {
String &line = source_line.line;
if (line == "pause_mode = 2") {
// Note: pause_mode is renamed to process_mode later on, so no need to do it here.
line = "pause_mode = 3";
Move tool declarations to top in 3to4. In godot3, `tool` can follow keywords like `extends` and `class_name` In godot4, `@tool` must be the first line in the file.
2023-03-05 12:43:51 +00:00
}
}
}
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
void ProjectConverter3To4::rename_classes(Vector<SourceLine> &source_lines, const RegExContainer &reg_container) {
for (SourceLine &source_line : source_lines) {
if (source_line.is_comment) {
continue;
}
String &line = source_line.line;
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (uint64_t(line.length()) <= maximum_line_length) {
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
for (unsigned int current_index = 0; RenamesMap3To4::class_renames[current_index][0]; current_index++) {
if (line.contains(RenamesMap3To4::class_renames[current_index][0])) {
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
bool found_ignored_items = false;
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Renaming Spatial.tscn to TEMP_RENAMED_CLASS.tscn.
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
if (line.contains(String(RenamesMap3To4::class_renames[current_index][0]) + ".")) {
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
found_ignored_items = true;
line = reg_container.class_tscn_regexes[current_index]->sub(line, "TEMP_RENAMED_CLASS.tscn", true);
line = reg_container.class_gd_regexes[current_index]->sub(line, "TEMP_RENAMED_CLASS.gd", true);
line = reg_container.class_shader_regexes[current_index]->sub(line, "TEMP_RENAMED_CLASS.shader", true);
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Causal renaming Spatial -> Node3D.
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
line = reg_container.class_regexes[current_index]->sub(line, RenamesMap3To4::class_renames[current_index][1], true);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Restore Spatial.tscn from TEMP_RENAMED_CLASS.tscn.
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (found_ignored_items) {
line = reg_container.class_temp_tscn.sub(line, reg_container.class_temp_tscn_renames[current_index], true);
line = reg_container.class_temp_gd.sub(line, reg_container.class_temp_gd_renames[current_index], true);
line = reg_container.class_temp_shader.sub(line, reg_container.class_temp_shader_renames[current_index], true);
}
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
}
}
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
};
Vector<String> ProjectConverter3To4::check_for_rename_classes(Vector<String> &lines, const RegExContainer &reg_container) {
Vector<String> found_renames;
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
int current_line = 1;
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
for (String &line : lines) {
if (uint64_t(line.length()) <= maximum_line_length) {
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
for (unsigned int current_index = 0; RenamesMap3To4::class_renames[current_index][0]; current_index++) {
if (line.contains(RenamesMap3To4::class_renames[current_index][0])) {
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
String old_line = line;
bool found_ignored_items = false;
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Renaming Spatial.tscn to TEMP_RENAMED_CLASS.tscn.
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
if (line.contains(String(RenamesMap3To4::class_renames[current_index][0]) + ".")) {
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
found_ignored_items = true;
line = reg_container.class_tscn_regexes[current_index]->sub(line, "TEMP_RENAMED_CLASS.tscn", true);
line = reg_container.class_gd_regexes[current_index]->sub(line, "TEMP_RENAMED_CLASS.gd", true);
line = reg_container.class_shader_regexes[current_index]->sub(line, "TEMP_RENAMED_CLASS.shader", true);
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Causal renaming Spatial -> Node3D.
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
TypedArray<RegExMatch> reg_match = reg_container.class_regexes[current_index]->search_all(line);
if (reg_match.size() > 0) {
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
found_renames.append(line_formatter(current_line, RenamesMap3To4::class_renames[current_index][0], RenamesMap3To4::class_renames[current_index][1], old_line));
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// Restore Spatial.tscn from TEMP_RENAMED_CLASS.tscn.
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (found_ignored_items) {
line = reg_container.class_temp_tscn.sub(line, reg_container.class_temp_tscn_renames[current_index], true);
line = reg_container.class_temp_gd.sub(line, reg_container.class_temp_gd_renames[current_index], true);
line = reg_container.class_temp_shader.sub(line, reg_container.class_temp_shader_renames[current_index], true);
}
}
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
current_line++;
}
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
return found_renames;
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
void ProjectConverter3To4::rename_gdscript_functions(Vector<SourceLine> &source_lines, const RegExContainer &reg_container, bool builtin) {
for (SourceLine &source_line : source_lines) {
if (source_line.is_comment) {
continue;
}
String &line = source_line.line;
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (uint64_t(line.length()) <= maximum_line_length) {
process_gdscript_line(line, reg_container, builtin);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
}
};
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
Vector<String> ProjectConverter3To4::check_for_rename_gdscript_functions(Vector<String> &lines, const RegExContainer &reg_container, bool builtin) {
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
int current_line = 1;
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
Vector<String> found_renames;
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
for (String &line : lines) {
if (uint64_t(line.length()) <= maximum_line_length) {
String old_line = line;
process_gdscript_line(line, reg_container, builtin);
if (old_line != line) {
found_renames.append(simple_line_formatter(current_line, old_line, line));
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
return found_renames;
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
}
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
Improve function detection to avoid accidental conversion When converting a function like "connect(", we do not want to detect a function like "reconnect(" as a possible candidate for conversion.
2023-03-16 20:58:50 +00:00
bool ProjectConverter3To4::contains_function_call(String &line, String function) const {
// We want to convert the function only if it is completely standalone.
// For example, when we search for "connect(", we don't want to accidentally convert "reconnect(".
if (!line.contains(function)) {
return false;
}
int index = line.find(function);
if (index == 0) {
return true;
}
char32_t previous_char = line.get(index - 1);
return (previous_char < '0' || previous_char > '9') && (previous_char < 'a' || previous_char > 'z') && (previous_char < 'A' || previous_char > 'Z') && previous_char != '_' && previous_char != '$' && previous_char != '@';
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// TODO, this function should run only on all ".gd" files and also on lines in ".tscn" files which are parts of built-in Scripts.
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
void ProjectConverter3To4::process_gdscript_line(String &line, const RegExContainer &reg_container, bool builtin) {
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
// In this and other functions, reg.sub() is used only after checking lines with str.contains().
// With longer lines, doing so can sometimes be significantly faster.
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if ((line.contains(".lock") || line.contains(".unlock")) && !line.contains("mtx") && !line.contains("mutex") && !line.contains("Mutex")) {
Change explicit 'Godot 4.0' references to 'Godot 4' Fixes #79276.
2023-07-10 11:08:11 +00:00
line = reg_container.reg_image_lock.sub(line, "false # $1.lock() # TODOConverter3To4, Image no longer requires locking, `false` helps to not break one line if/else, so it can freely be removed", true);
line = reg_container.reg_image_unlock.sub(line, "false # $1.unlock() # TODOConverter3To4, Image no longer requires locking, `false` helps to not break one line if/else, so it can freely be removed", true);
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// PackedStringArray(req_godot).join('.') -> '.'.join(PackedStringArray(req_godot)) PoolStringArray
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (line.contains(".join")) {
line = reg_container.reg_join.sub(line, "$2.join($1)", true);
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// -- empty() -> is_empty() Pool*Array
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (line.contains("empty")) {
line = reg_container.reg_is_empty.sub(line, "is_empty(", true);
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// -- \t.func() -> \tsuper.func() Object
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (line.contains("(") && line.contains(".")) {
Fix typos with codespell Using codespell 2.3-dev from current git. And fix typo in `methods.py` for `vsproj=yes` option (still won't work though).
2022-09-30 12:23:36 +00:00
line = reg_container.reg_super.sub(line, "$1super.$2", true); // TODO, not sure if possible, but for now this broke String text e.g. "Chosen .gitignore" -> "Chosen super.gitignore"
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// -- JSON.parse(a) -> JSON.new().parse(a) etc. JSON
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (line.contains("parse")) {
line = reg_container.reg_json_non_new.sub(line, "$1var test_json_conv = JSON.new()\n$1test_json_conv.parse($3\n$1$2test_json_conv.get_data()", true);
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// -- to_json(a) -> JSON.new().stringify(a) Object
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (line.contains("to_json")) {
line = reg_container.reg_json_to.sub(line, "JSON.new().stringify", true);
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// -- parse_json(a) -> JSON.get_data() etc. Object
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (line.contains("parse_json")) {
line = reg_container.reg_json_parse.sub(line, "$1var test_json_conv = JSON.new()\n$1test_json_conv.parse($3\n$1$2test_json_conv.get_data()", true);
}
Project converter: JSON.print -> JSON.stringify
2022-09-30 02:30:42 +00:00
// -- JSON.print( -> JSON.stringify(
if (line.contains("JSON.print(")) {
line = reg_container.reg_json_print.sub(line, "JSON.stringify(", true);
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// -- get_node(@ -> get_node( Node
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (line.contains("get_node")) {
line = line.replace("get_node(@", "get_node(");
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (line.contains("export")) {
Fix exported variables declaring or inferring the type were not converted correctly.
2023-04-10 16:19:26 +00:00
// 1. export(float) var lifetime: float = 3.0 -> export var lifetime: float = 3.0
line = reg_container.reg_export_typed.sub(line, "export var $2: $1");
// 2. export(float) var lifetime := 3.0 -> export var lifetime := 3.0
line = reg_container.reg_export_inferred_type.sub(line, "export var $1 :=");
// 3. export(float) var lifetime = 3.0 -> export var lifetime: float = 3.0 GDScript
line = reg_container.reg_export_simple.sub(line, "export var $2: $1");
// 4. export(String, 'AnonymousPro', 'CourierPrime') var _font_name = 'AnonymousPro' -> export var _font_name = 'AnonymousPro' #(String, 'AnonymousPro', 'CourierPrime') GDScript
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
line = reg_container.reg_export_advanced.sub(line, "export var $2$3 # ($1)");
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// Setget Setget
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (line.contains("setget")) {
Complete setget 3to4 conversion
2022-11-21 09:05:48 +00:00
line = reg_container.reg_setget_setget.sub(line, "var $1$2: get = $4, set = $3", true);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// Setget set
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (line.contains("setget")) {
Complete setget 3to4 conversion
2022-11-21 09:05:48 +00:00
line = reg_container.reg_setget_set.sub(line, "var $1$2: set = $3", true);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// Setget get
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (line.contains("setget")) {
Complete setget 3to4 conversion
2022-11-21 09:05:48 +00:00
line = reg_container.reg_setget_get.sub(line, "var $1$2: get = $3", true);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Add missed OS window settings to project converter, fix fullscreen indents. Add conversion for OS.window_maximized, vsync_enabled, window_resizable, window_borderless, get_screen_count and set_current_screen. Fix OS.window_fullscreen conversion corrupted line indents.
2023-01-08 15:13:23 +00:00
if (line.contains("window_resizable")) {
// OS.set_window_resizable(a) -> get_window().unresizable = not (a)
line = reg_container.reg_os_set_window_resizable.sub(line, "get_window().unresizable = not ($1)", true);
// OS.window_resizable = a -> same
line = reg_container.reg_os_assign_window_resizable.sub(line, "get_window().unresizable = not ($1)", true);
// OS.[is_]window_resizable() -> (not get_window().unresizable)
line = reg_container.reg_os_is_window_resizable.sub(line, "(not get_window().unresizable)", true);
}
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (line.contains("window_fullscreen")) {
Add missed OS window settings to project converter, fix fullscreen indents. Add conversion for OS.window_maximized, vsync_enabled, window_resizable, window_borderless, get_screen_count and set_current_screen. Fix OS.window_fullscreen conversion corrupted line indents.
2023-01-08 15:13:23 +00:00
// OS.window_fullscreen(a) -> get_window().mode = Window.MODE_EXCLUSIVE_FULLSCREEN if (a) else Window.MODE_WINDOWED
line = reg_container.reg_os_set_fullscreen.sub(line, "get_window().mode = Window.MODE_EXCLUSIVE_FULLSCREEN if ($1) else Window.MODE_WINDOWED", true);
// window_fullscreen = a -> same
line = reg_container.reg_os_assign_fullscreen.sub(line, "get_window().mode = Window.MODE_EXCLUSIVE_FULLSCREEN if ($1) else Window.MODE_WINDOWED", true);
// OS.[is_]window_fullscreen() -> ((get_window().mode == Window.MODE_EXCLUSIVE_FULLSCREEN) or (get_window().mode == Window.MODE_FULLSCREEN))
line = reg_container.reg_os_is_fullscreen.sub(line, "((get_window().mode == Window.MODE_EXCLUSIVE_FULLSCREEN) or (get_window().mode == Window.MODE_FULLSCREEN))", true);
}
if (line.contains("window_maximized")) {
// OS.window_maximized(a) -> get_window().mode = Window.MODE_MAXIMIZED if (a) else Window.MODE_WINDOWED
line = reg_container.reg_os_set_maximized.sub(line, "get_window().mode = Window.MODE_MAXIMIZED if ($1) else Window.MODE_WINDOWED", true);
// window_maximized = a -> same
line = reg_container.reg_os_assign_maximized.sub(line, "get_window().mode = Window.MODE_MAXIMIZED if ($1) else Window.MODE_WINDOWED", true);
// OS.[is_]window_maximized() -> (get_window().mode == Window.MODE_MAXIMIZED)
line = reg_container.reg_os_is_maximized.sub(line, "(get_window().mode == Window.MODE_MAXIMIZED)", true);
}
if (line.contains("window_minimized")) {
// OS.window_minimized(a) -> get_window().mode = Window.MODE_MINIMIZED if (a) else Window.MODE_WINDOWED
line = reg_container.reg_os_set_minimized.sub(line, "get_window().mode = Window.MODE_MINIMIZED if ($1) else Window.MODE_WINDOWED", true);
// window_minimized = a -> same
line = reg_container.reg_os_assign_minimized.sub(line, "get_window().mode = Window.MODE_MINIMIZED if ($1) else Window.MODE_WINDOWED", true);
// OS.[is_]window_minimized() -> (get_window().mode == Window.MODE_MINIMIZED)
line = reg_container.reg_os_is_minimized.sub(line, "(get_window().mode == Window.MODE_MINIMIZED)", true);
}
if (line.contains("set_use_vsync")) {
// OS.set_use_vsync(a) -> get_window().window_set_vsync_mode(DisplayServer.VSYNC_ENABLED if (a) else DisplayServer.VSYNC_DISABLED)
line = reg_container.reg_os_set_vsync.sub(line, "DisplayServer.window_set_vsync_mode(DisplayServer.VSYNC_ENABLED if ($1) else DisplayServer.VSYNC_DISABLED)", true);
}
if (line.contains("vsync_enabled")) {
// vsync_enabled = a -> get_window().window_set_vsync_mode(DisplayServer.VSYNC_ENABLED if (a) else DisplayServer.VSYNC_DISABLED)
line = reg_container.reg_os_assign_vsync.sub(line, "DisplayServer.window_set_vsync_mode(DisplayServer.VSYNC_ENABLED if ($1) else DisplayServer.VSYNC_DISABLED)", true);
// OS.[is_]vsync_enabled() -> (DisplayServer.window_get_vsync_mode() != DisplayServer.VSYNC_DISABLED)
line = reg_container.reg_os_is_vsync.sub(line, "(DisplayServer.window_get_vsync_mode() != DisplayServer.VSYNC_DISABLED)", true);
}
if (line.contains("OS.screen_orientation")) { // keep "OS." at start
// OS.screen_orientation = a -> DisplayServer.screen_set_orientation(a)
line = reg_container.reg_os_assign_screen_orient.sub(line, "$1DisplayServer.screen_set_orientation($2)", true); // assignment
line = line.replace("OS.screen_orientation", "DisplayServer.screen_get_orientation()"); // value access
}
if (line.contains("_window_always_on_top")) {
// OS.set_window_always_on_top(a) -> get_window().always_on_top = (a)
line = reg_container.reg_os_set_always_on_top.sub(line, "get_window().always_on_top = ($1)", true);
// OS.is_window_always_on_top() -> get_window().always_on_top
line = reg_container.reg_os_is_always_on_top.sub(line, "get_window().always_on_top", true);
}
if (line.contains("et_borderless_window")) {
// OS.set_borderless_window(a) -> get_window().borderless = (a)
line = reg_container.reg_os_set_borderless.sub(line, "get_window().borderless = ($1)", true);
// OS.get_borderless_window() -> get_window().borderless
line = reg_container.reg_os_get_borderless.sub(line, "get_window().borderless", true);
}
// OS.SCREEN_ORIENTATION_* -> DisplayServer.SCREEN_*
if (line.contains("OS.SCREEN_ORIENTATION_")) {
line = reg_container.reg_os_screen_orient_enum.sub(line, "DisplayServer.SCREEN_$1", true);
}
// OS -> Window simple replacements with optional set/get.
if (line.contains("current_screen")) {
line = reg_container.reg_os_current_screen.sub(line, "get_window().$1current_screen", true);
}
if (line.contains("min_window_size")) {
line = reg_container.reg_os_min_window_size.sub(line, "get_window().$1min_size", true);
}
if (line.contains("max_window_size")) {
line = reg_container.reg_os_max_window_size.sub(line, "get_window().$1max_size", true);
}
if (line.contains("window_position")) {
line = reg_container.reg_os_window_position.sub(line, "get_window().$1position", true);
}
if (line.contains("window_size")) {
line = reg_container.reg_os_window_size.sub(line, "get_window().$1size", true);
}
if (line.contains("et_screen_orientation")) {
line = reg_container.reg_os_getset_screen_orient.sub(line, "DisplayServer.screen_$1et_orientation", true);
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Add conversion for instance(), set_shader_param() and node path literals
2022-08-08 21:05:56 +00:00
// Instantiate
Improve function detection to avoid accidental conversion When converting a function like "connect(", we do not want to detect a function like "reconnect(" as a possible candidate for conversion.
2023-03-16 20:58:50 +00:00
if (contains_function_call(line, "instance")) {
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
line = reg_container.reg_instantiate.sub(line, ".instantiate($1)", true);
}
Add conversion for instance(), set_shader_param() and node path literals
2022-08-08 21:05:56 +00:00
Add conversions for tweens, fix move_and_slide/start/await conversions
2022-08-08 12:42:03 +00:00
// -- r.move_and_slide( a, b, c, d, e ) -> r.set_velocity(a) ... r.move_and_slide() KinematicBody
Improve function detection to avoid accidental conversion When converting a function like "connect(", we do not want to detect a function like "reconnect(" as a possible candidate for conversion.
2023-03-16 20:58:50 +00:00
if (contains_function_call(line, "move_and_slide(")) {
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
int start = line.find("move_and_slide(");
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
int end = get_end_parenthesis(line.substr(start)) + 1;
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
if (end > -1) {
String base_obj = get_object_of_execution(line.substr(0, start));
String starting_space = get_starting_space(line);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
Vector<String> parts = parse_arguments(line.substr(start, end));
if (parts.size() >= 1) {
String line_new;
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// motion_velocity
Add conversions for tweens, fix move_and_slide/start/await conversions
2022-08-08 12:42:03 +00:00
line_new += starting_space + base_obj + "set_velocity(" + parts[0] + ")\n";
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// up_direction
if (parts.size() >= 2) {
line_new += starting_space + base_obj + "set_up_direction(" + parts[1] + ")\n";
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// stop_on_slope
if (parts.size() >= 3) {
line_new += starting_space + base_obj + "set_floor_stop_on_slope_enabled(" + parts[2] + ")\n";
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// max_slides
if (parts.size() >= 4) {
line_new += starting_space + base_obj + "set_max_slides(" + parts[3] + ")\n";
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// floor_max_angle
if (parts.size() >= 5) {
line_new += starting_space + base_obj + "set_floor_max_angle(" + parts[4] + ")\n";
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// infiinite_interia
if (parts.size() >= 6) {
Change explicit 'Godot 4.0' references to 'Godot 4' Fixes #79276.
2023-07-10 11:08:11 +00:00
line_new += starting_space + "# TODOConverter3To4 infinite_inertia were removed in Godot 4 - previous value `" + parts[5] + "`\n";
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
Prevent 3-to-4 project converter from adding extra line for move_and_slide Fixes #66054
2022-09-21 21:31:27 +00:00
line_new += starting_space + base_obj + "move_and_slide()";
if (!line.begins_with(starting_space + "move_and_slide")) {
line = line_new + "\n" + line.substr(0, start) + "velocity" + line.substr(end + start);
} else {
line = line_new + line.substr(end + start);
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Add conversions for tweens, fix move_and_slide/start/await conversions
2022-08-08 12:42:03 +00:00
// -- r.move_and_slide_with_snap( a, b, c, d, e ) -> r.set_velocity(a) ... r.move_and_slide() KinematicBody
Improve function detection to avoid accidental conversion When converting a function like "connect(", we do not want to detect a function like "reconnect(" as a possible candidate for conversion.
2023-03-16 20:58:50 +00:00
if (contains_function_call(line, "move_and_slide_with_snap(")) {
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
int start = line.find("move_and_slide_with_snap(");
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
int end = get_end_parenthesis(line.substr(start)) + 1;
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
if (end > -1) {
String base_obj = get_object_of_execution(line.substr(0, start));
String starting_space = get_starting_space(line);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
Vector<String> parts = parse_arguments(line.substr(start, end));
if (parts.size() >= 1) {
String line_new;
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// motion_velocity
Add conversions for tweens, fix move_and_slide/start/await conversions
2022-08-08 12:42:03 +00:00
line_new += starting_space + base_obj + "set_velocity(" + parts[0] + ")\n";
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// snap
if (parts.size() >= 2) {
Change explicit 'Godot 4.0' references to 'Godot 4' Fixes #79276.
2023-07-10 11:08:11 +00:00
line_new += starting_space + "# TODOConverter3To4 looks that snap in Godot 4 is float, not vector like in Godot 3 - previous value `" + parts[1] + "`\n";
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// up_direction
if (parts.size() >= 3) {
line_new += starting_space + base_obj + "set_up_direction(" + parts[2] + ")\n";
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// stop_on_slope
if (parts.size() >= 4) {
line_new += starting_space + base_obj + "set_floor_stop_on_slope_enabled(" + parts[3] + ")\n";
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// max_slides
if (parts.size() >= 5) {
line_new += starting_space + base_obj + "set_max_slides(" + parts[4] + ")\n";
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// floor_max_angle
if (parts.size() >= 6) {
line_new += starting_space + base_obj + "set_floor_max_angle(" + parts[5] + ")\n";
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// infiinite_interia
if (parts.size() >= 7) {
Change explicit 'Godot 4.0' references to 'Godot 4' Fixes #79276.
2023-07-10 11:08:11 +00:00
line_new += starting_space + "# TODOConverter3To4 infinite_inertia were removed in Godot 4 - previous value `" + parts[6] + "`\n";
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
Prevent 3-to-4 project converter from adding extra line for move_and_slide Fixes #66054
2022-09-21 21:31:27 +00:00
line_new += starting_space + base_obj + "move_and_slide()";
if (!line.begins_with(starting_space + "move_and_slide_with_snap")) {
line = line_new + "\n" + line.substr(0, start) + "velocity" + line.substr(end + start);
} else {
line = line_new + line.substr(end + start);
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// -- sort_custom( a , b ) -> sort_custom(Callable( a , b )) Object
Improve function detection to avoid accidental conversion When converting a function like "connect(", we do not want to detect a function like "reconnect(" as a possible candidate for conversion.
2023-03-16 20:58:50 +00:00
if (contains_function_call(line, "sort_custom(")) {
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
int start = line.find("sort_custom(");
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
int end = get_end_parenthesis(line.substr(start)) + 1;
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
if (end > -1) {
Vector<String> parts = parse_arguments(line.substr(start, end));
if (parts.size() == 2) {
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
line = line.substr(0, start) + "sort_custom(Callable(" + parts[0] + ", " + parts[1] + "))" + line.substr(end + start);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// -- list_dir_begin( ) -> list_dir_begin() Object
Improve function detection to avoid accidental conversion When converting a function like "connect(", we do not want to detect a function like "reconnect(" as a possible candidate for conversion.
2023-03-16 20:58:50 +00:00
if (contains_function_call(line, "list_dir_begin(")) {
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
int start = line.find("list_dir_begin(");
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
int end = get_end_parenthesis(line.substr(start)) + 1;
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
if (end > -1) {
Change explicit 'Godot 4.0' references to 'Godot 4' Fixes #79276.
2023-07-10 11:08:11 +00:00
line = line.substr(0, start) + "list_dir_begin() " + line.substr(end + start) + "# TODOConverter3To4 fill missing arguments https://github.com/godotengine/godot/pull/40547";
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
// -- draw_line(1,2,3,4,5) -> draw_line(1, 2, 3, 4) CanvasItem
Improve function detection to avoid accidental conversion When converting a function like "connect(", we do not want to detect a function like "reconnect(" as a possible candidate for conversion.
2023-03-16 20:58:50 +00:00
if (contains_function_call(line, "draw_line(")) {
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
int start = line.find("draw_line(");
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
int end = get_end_parenthesis(line.substr(start)) + 1;
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
if (end > -1) {
Vector<String> parts = parse_arguments(line.substr(start, end));
if (parts.size() == 5) {
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
line = line.substr(0, start) + "draw_line(" + parts[0] + ", " + parts[1] + ", " + parts[2] + ", " + parts[3] + ")" + line.substr(end + start);
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
}
}
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// -- func c(var a, var b) -> func c(a, b)
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (line.contains("func ") && line.contains("var ")) {
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
int start = line.find("func ");
start = line.substr(start).find("(") + start;
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
int end = get_end_parenthesis(line.substr(start)) + 1;
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
if (end > -1) {
Vector<String> parts = parse_arguments(line.substr(start, end));
String start_string = line.substr(0, start) + "(";
for (int i = 0; i < parts.size(); i++) {
start_string += parts[i].strip_edges().trim_prefix("var ");
if (i != parts.size() - 1) {
start_string += ", ";
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
line = start_string + ")" + line.substr(end + start);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// -- yield(this, \"timeout\") -> await this.timeout GDScript
Improve function detection to avoid accidental conversion When converting a function like "connect(", we do not want to detect a function like "reconnect(" as a possible candidate for conversion.
2023-03-16 20:58:50 +00:00
if (contains_function_call(line, "yield(")) {
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
int start = line.find("yield(");
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
int end = get_end_parenthesis(line.substr(start)) + 1;
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
if (end > -1) {
Vector<String> parts = parse_arguments(line.substr(start, end));
if (parts.size() == 2) {
if (builtin) {
Add conversions for tweens, fix move_and_slide/start/await conversions
2022-08-08 12:42:03 +00:00
line = line.substr(0, start) + "await " + parts[0] + "." + parts[1].replace("\\\"", "").replace("\\'", "").replace(" ", "") + line.substr(end + start);
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
} else {
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
line = line.substr(0, start) + "await " + parts[0] + "." + parts[1].replace("\"", "").replace("\'", "").replace(" ", "") + line.substr(end + start);
}
}
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// -- parse_json( AA ) -> TODO Object
Improve function detection to avoid accidental conversion When converting a function like "connect(", we do not want to detect a function like "reconnect(" as a possible candidate for conversion.
2023-03-16 20:58:50 +00:00
if (contains_function_call(line, "parse_json(")) {
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
int start = line.find("parse_json(");
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
int end = get_end_parenthesis(line.substr(start)) + 1;
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
if (end > -1) {
Vector<String> parts = parse_arguments(line.substr(start, end));
line = line.substr(0, start) + "JSON.new().stringify(" + connect_arguments(parts, 0) + ")" + line.substr(end + start);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// -- .xform(Vector3(a,b,c)) -> * Vector3(a,b,c) Transform
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (line.contains(".xform(")) {
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
int start = line.find(".xform(");
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
int end = get_end_parenthesis(line.substr(start)) + 1;
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
if (end > -1) {
Vector<String> parts = parse_arguments(line.substr(start, end));
if (parts.size() == 1) {
Add parentheses around arguments when converting xform
2023-03-09 23:04:04 +00:00
line = line.substr(0, start) + " * (" + parts[0] + ")" + line.substr(end + start);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// -- .xform_inv(Vector3(a,b,c)) -> * Vector3(a,b,c) Transform
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (line.contains(".xform_inv(")) {
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
int start = line.find(".xform_inv(");
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
int end = get_end_parenthesis(line.substr(start)) + 1;
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
if (end > -1) {
String object_exec = get_object_of_execution(line.substr(0, start));
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (line.contains(object_exec + ".xform")) {
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
int start2 = line.find(object_exec + ".xform");
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Vector<String> parts = parse_arguments(line.substr(start, end));
if (parts.size() == 1) {
Add parentheses around arguments when converting xform
2023-03-09 23:04:04 +00:00
line = line.substr(0, start2) + "(" + parts[0] + ") * " + object_exec + line.substr(end + start);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
}
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
// -- "(connect(A,B,C,D,E) != OK):", "(connect(A, Callable(B, C).bind(D), E) Object
Improve function detection to avoid accidental conversion When converting a function like "connect(", we do not want to detect a function like "reconnect(" as a possible candidate for conversion.
2023-03-16 20:58:50 +00:00
if (contains_function_call(line, "connect(")) {
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
int start = line.find("connect(");
Improve function detection to avoid accidental conversion When converting a function like "connect(", we do not want to detect a function like "reconnect(" as a possible candidate for conversion.
2023-03-16 20:58:50 +00:00
int end = get_end_parenthesis(line.substr(start)) + 1;
if (end > -1) {
Vector<String> parts = parse_arguments(line.substr(start, end));
if (parts.size() == 3) {
line = line.substr(0, start) + "connect(" + parts[0] + ", Callable(" + parts[1] + ", " + parts[2] + "))" + line.substr(end + start);
} else if (parts.size() >= 4) {
line = line.substr(0, start) + "connect(" + parts[0] + ", Callable(" + parts[1] + ", " + parts[2] + ").bind(" + parts[3].lstrip(" [").rstrip("] ") + ")" + connect_arguments(parts, 4) + ")" + line.substr(end + start);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
}
// -- disconnect(a,b,c) -> disconnect(a,Callable(b,c)) Object
Improve function detection to avoid accidental conversion When converting a function like "connect(", we do not want to detect a function like "reconnect(" as a possible candidate for conversion.
2023-03-16 20:58:50 +00:00
if (contains_function_call(line, "disconnect(")) {
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
int start = line.find("disconnect(");
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
int end = get_end_parenthesis(line.substr(start)) + 1;
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
if (end > -1) {
Vector<String> parts = parse_arguments(line.substr(start, end));
if (parts.size() == 3) {
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
line = line.substr(0, start) + "disconnect(" + parts[0] + ", Callable(" + parts[1] + ", " + parts[2] + "))" + line.substr(end + start);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
}
// -- is_connected(a,b,c) -> is_connected(a,Callable(b,c)) Object
Improve function detection to avoid accidental conversion When converting a function like "connect(", we do not want to detect a function like "reconnect(" as a possible candidate for conversion.
2023-03-16 20:58:50 +00:00
if (contains_function_call(line, "is_connected(")) {
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
int start = line.find("is_connected(");
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
int end = get_end_parenthesis(line.substr(start)) + 1;
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
if (end > -1) {
Vector<String> parts = parse_arguments(line.substr(start, end));
if (parts.size() == 3) {
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
line = line.substr(0, start) + "is_connected(" + parts[0] + ", Callable(" + parts[1] + ", " + parts[2] + "))" + line.substr(end + start);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
}
Add conversions for tweens, fix move_and_slide/start/await conversions
2022-08-08 12:42:03 +00:00
// -- "(tween_method(A,B,C,D,E) != OK):", "(tween_method(Callable(A,B),C,D,E) Object
// -- "(tween_method(A,B,C,D,E,[F,G]) != OK):", "(tween_method(Callable(A,B).bind(F,G),C,D,E) Object
Improve function detection to avoid accidental conversion When converting a function like "connect(", we do not want to detect a function like "reconnect(" as a possible candidate for conversion.
2023-03-16 20:58:50 +00:00
if (contains_function_call(line, "tween_method(")) {
Add conversions for tweens, fix move_and_slide/start/await conversions
2022-08-08 12:42:03 +00:00
int start = line.find("tween_method(");
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
int end = get_end_parenthesis(line.substr(start)) + 1;
Add conversions for tweens, fix move_and_slide/start/await conversions
2022-08-08 12:42:03 +00:00
if (end > -1) {
Vector<String> parts = parse_arguments(line.substr(start, end));
if (parts.size() == 5) {
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
line = line.substr(0, start) + "tween_method(Callable(" + parts[0] + ", " + parts[1] + "), " + parts[2] + ", " + parts[3] + ", " + parts[4] + ")" + line.substr(end + start);
Add conversions for tweens, fix move_and_slide/start/await conversions
2022-08-08 12:42:03 +00:00
} else if (parts.size() >= 6) {
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
line = line.substr(0, start) + "tween_method(Callable(" + parts[0] + ", " + parts[1] + ").bind(" + connect_arguments(parts, 5).substr(1).lstrip(" [").rstrip("] ") + "), " + parts[2] + ", " + parts[3] + ", " + parts[4] + ")" + line.substr(end + start);
Add conversions for tweens, fix move_and_slide/start/await conversions
2022-08-08 12:42:03 +00:00
}
}
}
// -- "(tween_callback(A,B,[C,D]) != OK):", "(connect(Callable(A,B).bind(C,D)) Object
Improve function detection to avoid accidental conversion When converting a function like "connect(", we do not want to detect a function like "reconnect(" as a possible candidate for conversion.
2023-03-16 20:58:50 +00:00
if (contains_function_call(line, "tween_callback(")) {
Add conversions for tweens, fix move_and_slide/start/await conversions
2022-08-08 12:42:03 +00:00
int start = line.find("tween_callback(");
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
int end = get_end_parenthesis(line.substr(start)) + 1;
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
if (end > -1) {
Vector<String> parts = parse_arguments(line.substr(start, end));
if (parts.size() == 2) {
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
line = line.substr(0, start) + "tween_callback(Callable(" + parts[0] + ", " + parts[1] + "))" + line.substr(end + start);
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
} else if (parts.size() >= 3) {
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
line = line.substr(0, start) + "tween_callback(Callable(" + parts[0] + ", " + parts[1] + ").bind(" + connect_arguments(parts, 2).substr(1).lstrip(" [").rstrip("] ") + "))" + line.substr(end + start);
Add conversions for tweens, fix move_and_slide/start/await conversions
2022-08-08 12:42:03 +00:00
}
}
}
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
// -- start(a,b) -> start(Callable(a, b)) Thread
// -- start(a,b,c,d) -> start(Callable(a, b).bind(c), d) Thread
Improve function detection to avoid accidental conversion When converting a function like "connect(", we do not want to detect a function like "reconnect(" as a possible candidate for conversion.
2023-03-16 20:58:50 +00:00
if (contains_function_call(line, "start(")) {
Add conversions for tweens, fix move_and_slide/start/await conversions
2022-08-08 12:42:03 +00:00
int start = line.find("start(");
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
int end = get_end_parenthesis(line.substr(start)) + 1;
Add conversions for tweens, fix move_and_slide/start/await conversions
2022-08-08 12:42:03 +00:00
// Protection from 'func start'
if (!line.begins_with("func ")) {
if (end > -1) {
Vector<String> parts = parse_arguments(line.substr(start, end));
if (parts.size() == 2) {
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
line = line.substr(0, start) + "start(Callable(" + parts[0] + ", " + parts[1] + "))" + line.substr(end + start);
Add conversions for tweens, fix move_and_slide/start/await conversions
2022-08-08 12:42:03 +00:00
} else if (parts.size() >= 3) {
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
line = line.substr(0, start) + "start(Callable(" + parts[0] + ", " + parts[1] + ").bind(" + parts[2] + ")" + connect_arguments(parts, 3) + ")" + line.substr(end + start);
Add conversions for tweens, fix move_and_slide/start/await conversions
2022-08-08 12:42:03 +00:00
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
}
Correct superclass constructors in 3to4. Fixes #70542. The 3to4 conversion tool was not handling superclass constructors. We should translate the godot3 syntax: ```gdscript func _init(a,b,c).(a,b,c): pass func _init(a,b,c): super(a,b,c) ``` Originally, the _init conversion was intended to remove `void` return types from _init functions, as this was disallowed due to #50589. As that was resolved by #53366, I removed that part of the conversion logic. If a void return type is present on a constructor, the converter now leaves it. Here's a sample diff from my own project: ```diff @@ -103,10 +105,11 @@ class Real: class Text: extends Setting - var choices: PoolStringArray - var value: String setget set_value, get_value + var choices: PackedStringArray + var value: String : get = get_value, set = set_value - func _init(section: String, key: String, default: String, choice_list: Array).(section, key, default) -> void: + func _init(section: String, key: String, default: String, choice_list: Array) -> void: + super(section, key, default) choices = choice_list func normalize(val): @@ -129,9 +132,10 @@ class Text: class Boolean: extends Setting - var value: bool setget set_value, get_value + var value: bool : get = get_value, set = set_value - func _init(section: String, key: String, default: bool).(section, key, default) -> void: + func _init(section: String, key: String, default: bool) -> void: + super(section, key, default) pass ```
2023-03-03 23:31:40 +00:00
// -- func _init(p_x:int).(p_x): -> func _init(p_x:int):\n\tsuper(p_x) Object # https://github.com/godotengine/godot/issues/70542
if (line.contains(" _init(") && line.rfind(":") > 0) {
// func _init(p_arg1).(super4, super5, super6)->void:
// ^--^indent ^super_start super_end^
int indent = line.count("\t", 0, line.find("func"));
int super_start = line.find(".(");
int super_end = line.rfind(")");
if (super_start > 0 && super_end > super_start) {
line = line.substr(0, super_start) + line.substr(super_end + 1) + "\n" + String("\t").repeat(indent + 1) + "super" + line.substr(super_start + 1, super_end - super_start);
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
}
}
Correct superclass constructors in 3to4. Fixes #70542. The 3to4 conversion tool was not handling superclass constructors. We should translate the godot3 syntax: ```gdscript func _init(a,b,c).(a,b,c): pass func _init(a,b,c): super(a,b,c) ``` Originally, the _init conversion was intended to remove `void` return types from _init functions, as this was disallowed due to #50589. As that was resolved by #53366, I removed that part of the conversion logic. If a void return type is present on a constructor, the converter now leaves it. Here's a sample diff from my own project: ```diff @@ -103,10 +105,11 @@ class Real: class Text: extends Setting - var choices: PoolStringArray - var value: String setget set_value, get_value + var choices: PackedStringArray + var value: String : get = get_value, set = set_value - func _init(section: String, key: String, default: String, choice_list: Array).(section, key, default) -> void: + func _init(section: String, key: String, default: String, choice_list: Array) -> void: + super(section, key, default) choices = choice_list func normalize(val): @@ -129,9 +132,10 @@ class Text: class Boolean: extends Setting - var value: bool setget set_value, get_value + var value: bool : get = get_value, set = set_value - func _init(section: String, key: String, default: bool).(section, key, default) -> void: + func _init(section: String, key: String, default: bool) -> void: + super(section, key, default) pass ```
2023-03-03 23:31:40 +00:00
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// create_from_image(aa, bb) -> create_from_image(aa) #, bb ImageTexture
Improve function detection to avoid accidental conversion When converting a function like "connect(", we do not want to detect a function like "reconnect(" as a possible candidate for conversion.
2023-03-16 20:58:50 +00:00
if (contains_function_call(line, "create_from_image(")) {
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
int start = line.find("create_from_image(");
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
int end = get_end_parenthesis(line.substr(start)) + 1;
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
if (end > -1) {
Vector<String> parts = parse_arguments(line.substr(start, end));
if (parts.size() == 2) {
line = line.substr(0, start) + "create_from_image(" + parts[0] + ") " + "#," + parts[1] + line.substr(end + start);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
}
// set_cell_item(a, b, c, d ,e) -> set_cell_item(Vector3(a, b, c), d ,e)
Improve function detection to avoid accidental conversion When converting a function like "connect(", we do not want to detect a function like "reconnect(" as a possible candidate for conversion.
2023-03-16 20:58:50 +00:00
if (contains_function_call(line, "set_cell_item(")) {
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
int start = line.find("set_cell_item(");
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
int end = get_end_parenthesis(line.substr(start)) + 1;
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
if (end > -1) {
Vector<String> parts = parse_arguments(line.substr(start, end));
if (parts.size() > 2) {
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
line = line.substr(0, start) + "set_cell_item(Vector3(" + parts[0] + ", " + parts[1] + ", " + parts[2] + ")" + connect_arguments(parts, 3).lstrip(" ") + ")" + line.substr(end + start);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
}
// get_cell_item(a, b, c) -> get_cell_item(Vector3i(a, b, c))
Improve function detection to avoid accidental conversion When converting a function like "connect(", we do not want to detect a function like "reconnect(" as a possible candidate for conversion.
2023-03-16 20:58:50 +00:00
if (contains_function_call(line, "get_cell_item(")) {
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
int start = line.find("get_cell_item(");
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
int end = get_end_parenthesis(line.substr(start)) + 1;
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
if (end > -1) {
Vector<String> parts = parse_arguments(line.substr(start, end));
if (parts.size() == 3) {
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
line = line.substr(0, start) + "get_cell_item(Vector3i(" + parts[0] + ", " + parts[1] + ", " + parts[2] + "))" + line.substr(end + start);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
}
// get_cell_item_orientation(a, b, c) -> get_cell_item_orientation(Vector3i(a, b, c))
Improve function detection to avoid accidental conversion When converting a function like "connect(", we do not want to detect a function like "reconnect(" as a possible candidate for conversion.
2023-03-16 20:58:50 +00:00
if (contains_function_call(line, "get_cell_item_orientation(")) {
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
int start = line.find("get_cell_item_orientation(");
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
int end = get_end_parenthesis(line.substr(start)) + 1;
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
if (end > -1) {
Vector<String> parts = parse_arguments(line.substr(start, end));
if (parts.size() == 3) {
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
line = line.substr(0, start) + "get_cell_item_orientation(Vector3i(" + parts[0] + ", " + parts[1] + ", " + parts[2] + "))" + line.substr(end + start);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
}
// apply_impulse(A, B) -> apply_impulse(B, A)
Improve function detection to avoid accidental conversion When converting a function like "connect(", we do not want to detect a function like "reconnect(" as a possible candidate for conversion.
2023-03-16 20:58:50 +00:00
if (contains_function_call(line, "apply_impulse(")) {
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
int start = line.find("apply_impulse(");
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
int end = get_end_parenthesis(line.substr(start)) + 1;
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
if (end > -1) {
Vector<String> parts = parse_arguments(line.substr(start, end));
if (parts.size() == 2) {
line = line.substr(0, start) + "apply_impulse(" + parts[1] + ", " + parts[0] + ")" + line.substr(end + start);
More function/class renames in converter
2022-06-27 20:48:36 +00:00
}
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
}
// apply_force(A, B) -> apply_force(B, A)
Improve function detection to avoid accidental conversion When converting a function like "connect(", we do not want to detect a function like "reconnect(" as a possible candidate for conversion.
2023-03-16 20:58:50 +00:00
if (contains_function_call(line, "apply_force(")) {
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
int start = line.find("apply_force(");
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
int end = get_end_parenthesis(line.substr(start)) + 1;
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
if (end > -1) {
Vector<String> parts = parse_arguments(line.substr(start, end));
if (parts.size() == 2) {
line = line.substr(0, start) + "apply_force(" + parts[1] + ", " + parts[0] + ")" + line.substr(end + start);
More function/class renames in converter
2022-06-27 20:48:36 +00:00
}
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
}
Rename TileMap/GridMap.`world_to_map` and opposite to `local_to_map` For both TileMap and GridMap: - `world_to_map` -> `local_to_map` - `map_to_world` -> `map_to_local` Also changes any mention of "world" in this context to "local" to avoid future confusion. Finally, updates the docs of both methods for consistency. In particular, adding a note on how to convert the returned values from local to global coordinates and vice versa.
2022-08-20 16:39:05 +00:00
// map_to_world(a, b, c) -> map_to_local(Vector3i(a, b, c))
Improve function detection to avoid accidental conversion When converting a function like "connect(", we do not want to detect a function like "reconnect(" as a possible candidate for conversion.
2023-03-16 20:58:50 +00:00
if (contains_function_call(line, "map_to_world(")) {
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
int start = line.find("map_to_world(");
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
int end = get_end_parenthesis(line.substr(start)) + 1;
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
if (end > -1) {
Vector<String> parts = parse_arguments(line.substr(start, end));
if (parts.size() == 3) {
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
line = line.substr(0, start) + "map_to_local(Vector3i(" + parts[0] + ", " + parts[1] + ", " + parts[2] + "))" + line.substr(end + start);
Rename TileMap/GridMap.`world_to_map` and opposite to `local_to_map` For both TileMap and GridMap: - `world_to_map` -> `local_to_map` - `map_to_world` -> `map_to_local` Also changes any mention of "world" in this context to "local" to avoid future confusion. Finally, updates the docs of both methods for consistency. In particular, adding a note on how to convert the returned values from local to global coordinates and vice versa.
2022-08-20 16:39:05 +00:00
} else if (parts.size() == 1) {
line = line.substr(0, start) + "map_to_local(" + parts[0] + ")" + line.substr(end + start);
More function/class renames in converter
2022-06-27 20:48:36 +00:00
}
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
}
Reverse Camera2D.`rotating` to `ignore_rotation` `rotating` is misleading, as Camera2D is affected by `rotation` and `global_rotation` like any other Node2D Updates description in the docs, as well.
2022-08-13 11:37:10 +00:00
// set_rotating(true) -> set_ignore_rotation(false)
Improve function detection to avoid accidental conversion When converting a function like "connect(", we do not want to detect a function like "reconnect(" as a possible candidate for conversion.
2023-03-16 20:58:50 +00:00
if (contains_function_call(line, "set_rotating(")) {
Reverse Camera2D.`rotating` to `ignore_rotation` `rotating` is misleading, as Camera2D is affected by `rotation` and `global_rotation` like any other Node2D Updates description in the docs, as well.
2022-08-13 11:37:10 +00:00
int start = line.find("set_rotating(");
int end = get_end_parenthesis(line.substr(start)) + 1;
if (end > -1) {
Vector<String> parts = parse_arguments(line.substr(start, end));
if (parts.size() == 1) {
String opposite = parts[0] == "true" ? "false" : "true";
line = line.substr(0, start) + "set_ignore_rotation(" + opposite + ")";
}
}
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// OS.get_window_safe_area() -> DisplayServer.get_display_safe_area()
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (line.contains("OS.get_window_safe_area(")) {
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
int start = line.find("OS.get_window_safe_area(");
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
int end = get_end_parenthesis(line.substr(start)) + 1;
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
if (end > -1) {
Vector<String> parts = parse_arguments(line.substr(start, end));
if (parts.size() == 0) {
line = line.substr(0, start) + "DisplayServer.get_display_safe_area()" + line.substr(end + start);
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
}
Change explicit 'Godot 4.0' references to 'Godot 4' Fixes #79276.
2023-07-10 11:08:11 +00:00
// draw_rect(a,b,c,d,e) -> draw_rect(a,b,c,d)#e) TODOConverter3To4 Antialiasing argument is missing
Improve function detection to avoid accidental conversion When converting a function like "connect(", we do not want to detect a function like "reconnect(" as a possible candidate for conversion.
2023-03-16 20:58:50 +00:00
if (contains_function_call(line, "draw_rect(")) {
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
int start = line.find("draw_rect(");
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
int end = get_end_parenthesis(line.substr(start)) + 1;
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (end > -1) {
Vector<String> parts = parse_arguments(line.substr(start, end));
if (parts.size() == 5) {
Change explicit 'Godot 4.0' references to 'Godot 4' Fixes #79276.
2023-07-10 11:08:11 +00:00
line = line.substr(0, start) + "draw_rect(" + parts[0] + ", " + parts[1] + ", " + parts[2] + ", " + parts[3] + ")" + line.substr(end + start) + "# " + parts[4] + ") TODOConverter3To4 Antialiasing argument is missing";
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
}
}
// get_focus_owner() -> get_viewport().gui_get_focus_owner()
Improve function detection to avoid accidental conversion When converting a function like "connect(", we do not want to detect a function like "reconnect(" as a possible candidate for conversion.
2023-03-16 20:58:50 +00:00
if (contains_function_call(line, "get_focus_owner()")) {
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
line = line.replace("get_focus_owner()", "get_viewport().gui_get_focus_owner()");
}
// button.pressed = 1 -> button.button_pressed = 1
if (line.contains(".pressed")) {
int start = line.find(".pressed");
bool foundNextEqual = false;
String line_to_check = line.substr(start + String(".pressed").length());
for (int current_index = 0; line_to_check.length() > current_index; current_index++) {
char32_t chr = line_to_check.get(current_index);
if (chr == '\t' || chr == ' ') {
continue;
} else if (chr == '=') {
foundNextEqual = true;
} else {
break;
}
}
if (foundNextEqual) {
line = line.substr(0, start) + ".button_pressed" + line.substr(start + String(".pressed").length());
}
}
Reverse Camera2D.`rotating` to `ignore_rotation` `rotating` is misleading, as Camera2D is affected by `rotation` and `global_rotation` like any other Node2D Updates description in the docs, as well.
2022-08-13 11:37:10 +00:00
// rotating = true -> ignore_rotation = false # reversed "rotating" for Camera2D
Improve function detection to avoid accidental conversion When converting a function like "connect(", we do not want to detect a function like "reconnect(" as a possible candidate for conversion.
2023-03-16 20:58:50 +00:00
if (contains_function_call(line, "rotating")) {
Fix `Camera2D.rotating` not being converted and reversed properly Godot 3's Camera2D `rotating = true` and `rotating = false` are supposed to be converted and reversed to `ignore_rotation = false` and `ignore_rotation = true` respectively, but this wasn't the case before this PR, as the project converted was failing to properly read the `true` and `false` strings, thus resulting in `ignore_rotation = true` in all cases.
2023-07-10 00:57:10 +00:00
String function_name = "rotating";
int start = line.find(function_name);
Reverse Camera2D.`rotating` to `ignore_rotation` `rotating` is misleading, as Camera2D is affected by `rotation` and `global_rotation` like any other Node2D Updates description in the docs, as well.
2022-08-13 11:37:10 +00:00
bool foundNextEqual = false;
Fix `Camera2D.rotating` not being converted and reversed properly Godot 3's Camera2D `rotating = true` and `rotating = false` are supposed to be converted and reversed to `ignore_rotation = false` and `ignore_rotation = true` respectively, but this wasn't the case before this PR, as the project converted was failing to properly read the `true` and `false` strings, thus resulting in `ignore_rotation = true` in all cases.
2023-07-10 00:57:10 +00:00
String line_to_check = line.substr(start + function_name.length());
Reverse Camera2D.`rotating` to `ignore_rotation` `rotating` is misleading, as Camera2D is affected by `rotation` and `global_rotation` like any other Node2D Updates description in the docs, as well.
2022-08-13 11:37:10 +00:00
String assigned_value;
for (int current_index = 0; line_to_check.length() > current_index; current_index++) {
char32_t chr = line_to_check.get(current_index);
if (chr == '\t' || chr == ' ') {
continue;
} else if (chr == '=') {
foundNextEqual = true;
Fix `Camera2D.rotating` not being converted and reversed properly Godot 3's Camera2D `rotating = true` and `rotating = false` are supposed to be converted and reversed to `ignore_rotation = false` and `ignore_rotation = true` respectively, but this wasn't the case before this PR, as the project converted was failing to properly read the `true` and `false` strings, thus resulting in `ignore_rotation = true` in all cases.
2023-07-10 00:57:10 +00:00
assigned_value = line.substr(start + function_name.length() + current_index + 1).strip_edges();
Reverse Camera2D.`rotating` to `ignore_rotation` `rotating` is misleading, as Camera2D is affected by `rotation` and `global_rotation` like any other Node2D Updates description in the docs, as well.
2022-08-13 11:37:10 +00:00
assigned_value = assigned_value == "true" ? "false" : "true";
} else {
break;
}
}
if (foundNextEqual) {
Fix `Camera2D.rotating` not being converted and reversed properly Godot 3's Camera2D `rotating = true` and `rotating = false` are supposed to be converted and reversed to `ignore_rotation = false` and `ignore_rotation = true` respectively, but this wasn't the case before this PR, as the project converted was failing to properly read the `true` and `false` strings, thus resulting in `ignore_rotation = true` in all cases.
2023-07-10 00:57:10 +00:00
line = line.substr(0, start) + "ignore_rotation = " + assigned_value + " # reversed \"rotating\" for Camera2D";
Reverse Camera2D.`rotating` to `ignore_rotation` `rotating` is misleading, as Camera2D is affected by `rotation` and `global_rotation` like any other Node2D Updates description in the docs, as well.
2022-08-13 11:37:10 +00:00
}
}
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
// OS -> Time functions
if (line.contains("OS.get_ticks_msec")) {
line = line.replace("OS.get_ticks_msec", "Time.get_ticks_msec");
}
if (line.contains("OS.get_ticks_usec")) {
line = line.replace("OS.get_ticks_usec", "Time.get_ticks_usec");
}
if (line.contains("OS.get_unix_time")) {
line = line.replace("OS.get_unix_time", "Time.get_unix_time_from_system");
}
Project converter: OS.get_datetime -> Time.get_datetime_dict_from_system
2022-09-30 02:10:16 +00:00
if (line.contains("OS.get_datetime")) {
line = line.replace("OS.get_datetime", "Time.get_datetime_dict_from_system");
}
Add missed OS window settings to project converter, fix fullscreen indents. Add conversion for OS.window_maximized, vsync_enabled, window_resizable, window_borderless, get_screen_count and set_current_screen. Fix OS.window_fullscreen conversion corrupted line indents.
2023-01-08 15:13:23 +00:00
// OS -> DisplayServer
if (line.contains("OS.get_display_cutouts")) {
line = line.replace("OS.get_display_cutouts", "DisplayServer.get_display_cutouts");
}
if (line.contains("OS.get_screen_count")) {
line = line.replace("OS.get_screen_count", "DisplayServer.get_screen_count");
}
if (line.contains("OS.get_screen_dpi")) {
line = line.replace("OS.get_screen_dpi", "DisplayServer.screen_get_dpi");
}
if (line.contains("OS.get_screen_max_scale")) {
line = line.replace("OS.get_screen_max_scale", "DisplayServer.screen_get_max_scale");
}
if (line.contains("OS.get_screen_position")) {
line = line.replace("OS.get_screen_position", "DisplayServer.screen_get_position");
}
if (line.contains("OS.get_screen_refresh_rate")) {
line = line.replace("OS.get_screen_refresh_rate", "DisplayServer.screen_get_refresh_rate");
}
if (line.contains("OS.get_screen_scale")) {
line = line.replace("OS.get_screen_scale", "DisplayServer.screen_get_scale");
}
if (line.contains("OS.get_screen_size")) {
line = line.replace("OS.get_screen_size", "DisplayServer.screen_get_size");
}
if (line.contains("OS.set_icon")) {
line = line.replace("OS.set_icon", "DisplayServer.set_icon");
}
if (line.contains("OS.set_native_icon")) {
line = line.replace("OS.set_native_icon", "DisplayServer.set_native_icon");
}
// OS -> Window
if (line.contains("OS.window_borderless")) {
line = line.replace("OS.window_borderless", "get_window().borderless");
}
if (line.contains("OS.get_real_window_size")) {
line = line.replace("OS.get_real_window_size", "get_window().get_size_with_decorations");
}
if (line.contains("OS.is_window_focused")) {
line = line.replace("OS.is_window_focused", "get_window().has_focus");
}
if (line.contains("OS.move_window_to_foreground")) {
line = line.replace("OS.move_window_to_foreground", "get_window().move_to_foreground");
}
if (line.contains("OS.request_attention")) {
line = line.replace("OS.request_attention", "get_window().request_attention");
}
if (line.contains("OS.set_window_title")) {
line = line.replace("OS.set_window_title", "get_window().set_title");
}
Add more missing properties/methods to the converter. icon_align -> icon_alignment rect_min_size -> custom_minimum_size get_tree().set_input_as_handled() -> get_viewport().set_input_as_handled() _unhandled_key_input(event: InputEventKey) -> _unhandled_key_input(event: InputEvent) And C# equivalents
2023-01-04 11:53:04 +00:00
// get_tree().set_input_as_handled() -> get_viewport().set_input_as_handled()
if (line.contains("get_tree().set_input_as_handled()")) {
line = line.replace("get_tree().set_input_as_handled()", "get_viewport().set_input_as_handled()");
}
// Fix the simple case of using _unhandled_key_input
// func _unhandled_key_input(event: InputEventKey) -> _unhandled_key_input(event: InputEvent)
if (line.contains("_unhandled_key_input(event: InputEventKey)")) {
line = line.replace("_unhandled_key_input(event: InputEventKey)", "_unhandled_key_input(event: InputEvent)");
}
Add some missing renames to 3to4 tool. MultiplayerPeerExtension isn't an exact replacement for NetworkedMultiplayerCustom, but at least it gets you moving in the right direction. Engine.editor_hint couldn't be fixed by the renames map, because you have to add a `()` at the end.
2023-03-06 23:16:35 +00:00
if (line.contains("Engine.editor_hint")) {
line = line.replace("Engine.editor_hint", "Engine.is_editor_hint()");
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
void ProjectConverter3To4::process_csharp_line(String &line, const RegExContainer &reg_container) {
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
line = line.replace("OS.GetWindowSafeArea()", "DisplayServer.ScreenGetUsableRect()");
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Add more missing properties/methods to the converter. icon_align -> icon_alignment rect_min_size -> custom_minimum_size get_tree().set_input_as_handled() -> get_viewport().set_input_as_handled() _unhandled_key_input(event: InputEventKey) -> _unhandled_key_input(event: InputEvent) And C# equivalents
2023-01-04 11:53:04 +00:00
// GetTree().SetInputAsHandled() -> GetViewport().SetInputAsHandled()
if (line.contains("GetTree().SetInputAsHandled()")) {
line = line.replace("GetTree().SetInputAsHandled()", "GetViewport().SetInputAsHandled()");
}
// Fix the simple case of using _UnhandledKeyInput
// func _UnhandledKeyInput(InputEventKey @event) -> _UnhandledKeyInput(InputEvent @event)
if (line.contains("_UnhandledKeyInput(InputEventKey @event)")) {
line = line.replace("_UnhandledKeyInput(InputEventKey @event)", "_UnhandledKeyInput(InputEvent @event)");
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
// -- Connect(,,,things) -> Connect(,Callable(,),things) Object
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (line.contains("Connect(")) {
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
int start = line.find("Connect(");
// Protection from disconnect
if (start == 0 || line.get(start - 1) != 's') {
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
int end = get_end_parenthesis(line.substr(start)) + 1;
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
if (end > -1) {
Vector<String> parts = parse_arguments(line.substr(start, end));
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
if (parts.size() >= 3) {
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
line = line.substr(0, start) + "Connect(" + parts[0] + ", new Callable(" + parts[1] + ", " + parts[2] + ")" + connect_arguments(parts, 3) + ")" + line.substr(end + start);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
}
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
}
// -- Disconnect(a,b,c) -> Disconnect(a,Callable(b,c)) Object
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (line.contains("Disconnect(")) {
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
int start = line.find("Disconnect(");
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
int end = get_end_parenthesis(line.substr(start)) + 1;
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
if (end > -1) {
Vector<String> parts = parse_arguments(line.substr(start, end));
if (parts.size() == 3) {
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
line = line.substr(0, start) + "Disconnect(" + parts[0] + ", new Callable(" + parts[1] + ", " + parts[2] + "))" + line.substr(end + start);
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
}
}
}
// -- IsConnected(a,b,c) -> IsConnected(a,Callable(b,c)) Object
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (line.contains("IsConnected(")) {
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
int start = line.find("IsConnected(");
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
int end = get_end_parenthesis(line.substr(start)) + 1;
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
if (end > -1) {
Vector<String> parts = parse_arguments(line.substr(start, end));
if (parts.size() == 3) {
Don't strip whitespace when converting 3to4. Fixes #74204. The style guide says > Always use one space around operators and after commas The 3to4 conversion tool currently strips space in certain scenarios. I've updated it to add space whenever it is generating new code. In any case where it substitutes existing code, it leaves it as-is. For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens. However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`. Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
2023-03-02 12:34:28 +00:00
line = line.substr(0, start) + "IsConnected(" + parts[0] + ", new Callable(" + parts[1] + ", " + parts[2] + "))" + line.substr(end + start);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
}
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
}
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
void ProjectConverter3To4::rename_csharp_functions(Vector<SourceLine> &source_lines, const RegExContainer &reg_container) {
for (SourceLine &source_line : source_lines) {
if (source_line.is_comment) {
continue;
}
String &line = source_line.line;
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (uint64_t(line.length()) <= maximum_line_length) {
process_csharp_line(line, reg_container);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
}
};
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
Vector<String> ProjectConverter3To4::check_for_rename_csharp_functions(Vector<String> &lines, const RegExContainer &reg_container) {
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
int current_line = 1;
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
Vector<String> found_renames;
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
for (String &line : lines) {
if (uint64_t(line.length()) <= maximum_line_length) {
String old_line = line;
process_csharp_line(line, reg_container);
if (old_line != line) {
found_renames.append(simple_line_formatter(current_line, old_line, line));
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
}
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
return found_renames;
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
void ProjectConverter3To4::rename_csharp_attributes(Vector<SourceLine> &source_lines, const RegExContainer &reg_container) {
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
static String error_message = "The master and mastersync rpc behavior is not officially supported anymore. Try using another keyword or making custom logic using Multiplayer.GetRemoteSenderId()\n";
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
for (SourceLine &source_line : source_lines) {
if (source_line.is_comment) {
continue;
}
String &line = source_line.line;
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (uint64_t(line.length()) <= maximum_line_length) {
line = reg_container.keyword_csharp_remote.sub(line, "[RPC(MultiplayerAPI.RPCMode.AnyPeer)]", true);
line = reg_container.keyword_csharp_remotesync.sub(line, "[RPC(MultiplayerAPI.RPCMode.AnyPeer, CallLocal = true)]", true);
line = reg_container.keyword_csharp_puppet.sub(line, "[RPC]", true);
line = reg_container.keyword_csharp_puppetsync.sub(line, "[RPC(CallLocal = true)]", true);
line = reg_container.keyword_csharp_master.sub(line, error_message + "[RPC]", true);
line = reg_container.keyword_csharp_mastersync.sub(line, error_message + "[RPC(CallLocal = true)]", true);
}
Add conversion for the RPC attributes in C#
2022-08-06 02:05:15 +00:00
}
}
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
Vector<String> ProjectConverter3To4::check_for_rename_csharp_attributes(Vector<String> &lines, const RegExContainer &reg_container) {
Add conversion for the RPC attributes in C#
2022-08-06 02:05:15 +00:00
int current_line = 1;
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
Vector<String> found_renames;
Add conversion for the RPC attributes in C#
2022-08-06 02:05:15 +00:00
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
for (String &line : lines) {
if (uint64_t(line.length()) <= maximum_line_length) {
String old;
old = line;
line = reg_container.keyword_csharp_remote.sub(line, "[RPC(MultiplayerAPI.RPCMode.AnyPeer)]", true);
if (old != line) {
found_renames.append(line_formatter(current_line, "[Remote]", "[RPC(MultiplayerAPI.RPCMode.AnyPeer)]", line));
}
Add conversion for the RPC attributes in C#
2022-08-06 02:05:15 +00:00
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
old = line;
line = reg_container.keyword_csharp_remotesync.sub(line, "[RPC(MultiplayerAPI.RPCMode.AnyPeer, CallLocal = true)]", true);
if (old != line) {
found_renames.append(line_formatter(current_line, "[RemoteSync]", "[RPC(MultiplayerAPI.RPCMode.AnyPeer, CallLocal = true)]", line));
}
old = line;
line = reg_container.keyword_csharp_puppet.sub(line, "[RPC]", true);
if (old != line) {
found_renames.append(line_formatter(current_line, "[Puppet]", "[RPC]", line));
}
old = line;
line = reg_container.keyword_csharp_puppetsync.sub(line, "[RPC(CallLocal = true)]", true);
if (old != line) {
found_renames.append(line_formatter(current_line, "[PuppetSync]", "[RPC(CallLocal = true)]", line));
}
old = line;
line = reg_container.keyword_csharp_master.sub(line, "[RPC]", true);
if (old != line) {
found_renames.append(line_formatter(current_line, "[Master]", "[RPC]", line));
}
old = line;
line = reg_container.keyword_csharp_mastersync.sub(line, "[RPC(CallLocal = true)]", true);
if (old != line) {
found_renames.append(line_formatter(current_line, "[MasterSync]", "[RPC(CallLocal = true)]", line));
}
}
Add conversion for the RPC attributes in C#
2022-08-06 02:05:15 +00:00
current_line++;
}
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
return found_renames;
Add conversion for the RPC attributes in C#
2022-08-06 02:05:15 +00:00
}
Ensure quotes are escaped when converting builtin scripts
2023-05-23 14:55:52 +00:00
_FORCE_INLINE_ static String builtin_escape(const String &p_str, bool p_builtin) {
if (p_builtin) {
return p_str.replace("\"", "\\\"");
} else {
return p_str;
}
}
void ProjectConverter3To4::rename_gdscript_keywords(Vector<SourceLine> &source_lines, const RegExContainer &reg_container, bool builtin) {
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
static String error_message = "The master and mastersync rpc behavior is not officially supported anymore. Try using another keyword or making custom logic using get_multiplayer().get_remote_sender_id()\n";
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
for (SourceLine &source_line : source_lines) {
if (source_line.is_comment) {
continue;
}
String &line = source_line.line;
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (uint64_t(line.length()) <= maximum_line_length) {
if (line.contains("export")) {
line = reg_container.keyword_gdscript_export_single.sub(line, "@export", true);
}
if (line.contains("export")) {
Fix some typos in source.
2023-10-04 10:55:11 +00:00
line = reg_container.keyword_gdscript_export_multi.sub(line, "$1@export", true);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
if (line.contains("onready")) {
line = reg_container.keyword_gdscript_onready.sub(line, "@onready", true);
}
if (line.contains("remote")) {
Ensure quotes are escaped when converting builtin scripts
2023-05-23 14:55:52 +00:00
line = reg_container.keyword_gdscript_remote.sub(line, builtin_escape("@rpc(\"any_peer\") func", builtin), true);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
if (line.contains("remote")) {
Ensure quotes are escaped when converting builtin scripts
2023-05-23 14:55:52 +00:00
line = reg_container.keyword_gdscript_remotesync.sub(line, builtin_escape("@rpc(\"any_peer\", \"call_local\") func", builtin), true);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
if (line.contains("sync")) {
Ensure quotes are escaped when converting builtin scripts
2023-05-23 14:55:52 +00:00
line = reg_container.keyword_gdscript_sync.sub(line, builtin_escape("@rpc(\"any_peer\", \"call_local\") func", builtin), true);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
if (line.contains("slave")) {
line = reg_container.keyword_gdscript_slave.sub(line, "@rpc func", true);
}
if (line.contains("puppet")) {
line = reg_container.keyword_gdscript_puppet.sub(line, "@rpc func", true);
}
if (line.contains("puppet")) {
Ensure quotes are escaped when converting builtin scripts
2023-05-23 14:55:52 +00:00
line = reg_container.keyword_gdscript_puppetsync.sub(line, builtin_escape("@rpc(\"call_local\") func", builtin), true);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
if (line.contains("master")) {
line = reg_container.keyword_gdscript_master.sub(line, error_message + "@rpc func", true);
}
if (line.contains("master")) {
Ensure quotes are escaped when converting builtin scripts
2023-05-23 14:55:52 +00:00
line = reg_container.keyword_gdscript_mastersync.sub(line, error_message + builtin_escape("@rpc(\"call_local\") func", builtin), true);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
}
Various converter enhancements and bugfixes
2022-07-31 11:15:02 +00:00
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Ensure quotes are escaped when converting builtin scripts
2023-05-23 14:55:52 +00:00
Vector<String> ProjectConverter3To4::check_for_rename_gdscript_keywords(Vector<String> &lines, const RegExContainer &reg_container, bool builtin) {
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
Vector<String> found_renames;
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
int current_line = 1;
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
for (String &line : lines) {
if (uint64_t(line.length()) <= maximum_line_length) {
String old;
if (line.contains("tool")) {
old = line;
line = reg_container.keyword_gdscript_tool.sub(line, "@tool", true);
if (old != line) {
found_renames.append(line_formatter(current_line, "tool", "@tool", line));
}
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (line.contains("export")) {
old = line;
line = reg_container.keyword_gdscript_export_single.sub(line, "$1@export", true);
if (old != line) {
found_renames.append(line_formatter(current_line, "export", "@export", line));
}
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (line.contains("export")) {
old = line;
Fix some typos in source.
2023-10-04 10:55:11 +00:00
line = reg_container.keyword_gdscript_export_multi.sub(line, "@export", true);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (old != line) {
found_renames.append(line_formatter(current_line, "export", "@export", line));
}
}
if (line.contains("onready")) {
old = line;
line = reg_container.keyword_gdscript_tool.sub(line, "@onready", true);
if (old != line) {
found_renames.append(line_formatter(current_line, "onready", "@onready", line));
}
}
if (line.contains("remote")) {
old = line;
Ensure quotes are escaped when converting builtin scripts
2023-05-23 14:55:52 +00:00
line = reg_container.keyword_gdscript_remote.sub(line, builtin_escape("@rpc(\"any_peer\") func", builtin), true);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (old != line) {
Ensure quotes are escaped when converting builtin scripts
2023-05-23 14:55:52 +00:00
found_renames.append(line_formatter(current_line, "remote func", builtin_escape("@rpc(\"any_peer\") func", builtin), line));
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
}
if (line.contains("remote")) {
old = line;
Ensure quotes are escaped when converting builtin scripts
2023-05-23 14:55:52 +00:00
line = reg_container.keyword_gdscript_remotesync.sub(line, builtin_escape("@rpc(\"any_peer\", \"call_local\")) func", builtin), true);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (old != line) {
Ensure quotes are escaped when converting builtin scripts
2023-05-23 14:55:52 +00:00
found_renames.append(line_formatter(current_line, "remotesync func", builtin_escape("@rpc(\"any_peer\", \"call_local\")) func", builtin), line));
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
}
if (line.contains("sync")) {
old = line;
Ensure quotes are escaped when converting builtin scripts
2023-05-23 14:55:52 +00:00
line = reg_container.keyword_gdscript_sync.sub(line, builtin_escape("@rpc(\"any_peer\", \"call_local\")) func", builtin), true);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (old != line) {
Ensure quotes are escaped when converting builtin scripts
2023-05-23 14:55:52 +00:00
found_renames.append(line_formatter(current_line, "sync func", builtin_escape("@rpc(\"any_peer\", \"call_local\")) func", builtin), line));
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
}
if (line.contains("slave")) {
old = line;
line = reg_container.keyword_gdscript_slave.sub(line, "@rpc func", true);
if (old != line) {
found_renames.append(line_formatter(current_line, "slave func", "@rpc func", line));
}
}
if (line.contains("puppet")) {
old = line;
line = reg_container.keyword_gdscript_puppet.sub(line, "@rpc func", true);
if (old != line) {
found_renames.append(line_formatter(current_line, "puppet func", "@rpc func", line));
}
}
if (line.contains("puppet")) {
old = line;
Ensure quotes are escaped when converting builtin scripts
2023-05-23 14:55:52 +00:00
line = reg_container.keyword_gdscript_puppetsync.sub(line, builtin_escape("@rpc(\"call_local\") func", builtin), true);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (old != line) {
Ensure quotes are escaped when converting builtin scripts
2023-05-23 14:55:52 +00:00
found_renames.append(line_formatter(current_line, "puppetsync func", builtin_escape("@rpc(\"call_local\") func", builtin), line));
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
}
if (line.contains("master")) {
old = line;
line = reg_container.keyword_gdscript_master.sub(line, "@rpc func", true);
if (old != line) {
found_renames.append(line_formatter(current_line, "master func", "@rpc func", line));
}
}
if (line.contains("master")) {
old = line;
Ensure quotes are escaped when converting builtin scripts
2023-05-23 14:55:52 +00:00
line = reg_container.keyword_gdscript_master.sub(line, builtin_escape("@rpc(\"call_local\") func", builtin), true);
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (old != line) {
Ensure quotes are escaped when converting builtin scripts
2023-05-23 14:55:52 +00:00
found_renames.append(line_formatter(current_line, "mastersync func", builtin_escape("@rpc(\"call_local\") func", builtin), line));
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
}
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
current_line++;
}
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
return found_renames;
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
void ProjectConverter3To4::rename_input_map_scancode(Vector<SourceLine> &source_lines, const RegExContainer &reg_container) {
Add keycode project conversion
2023-03-02 14:24:00 +00:00
// The old Special Key, now colliding with CMD_OR_CTRL.
const int old_spkey = (1 << 24);
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
for (SourceLine &source_line : source_lines) {
if (source_line.is_comment) {
continue;
}
String &line = source_line.line;
Add keycode project conversion
2023-03-02 14:24:00 +00:00
if (uint64_t(line.length()) <= maximum_line_length) {
TypedArray<RegExMatch> reg_match = reg_container.input_map_keycode.search_all(line);
for (int i = 0; i < reg_match.size(); ++i) {
Ref<RegExMatch> match = reg_match[i];
PackedStringArray strings = match->get_strings();
int key = strings[3].to_int();
if (key & old_spkey) {
// Create new key, clearing old Special Key and setting new one.
key = (key & ~old_spkey) | (int)Key::SPECIAL;
line = line.replace(strings[0], String(",\"") + strings[1] + "scancode\":" + String::num_int64(key));
}
}
}
}
}
Add joypad input map conversion to project converter. Fixes godotengine#77314 (Input Map's joypad button numbers are not converted).
2023-05-29 14:16:46 +00:00
void ProjectConverter3To4::rename_joypad_buttons_and_axes(Vector<SourceLine> &source_lines, const RegExContainer &reg_container) {
for (SourceLine &source_line : source_lines) {
if (source_line.is_comment) {
continue;
}
String &line = source_line.line;
if (uint64_t(line.length()) <= maximum_line_length) {
// Remap button indexes.
TypedArray<RegExMatch> reg_match = reg_container.joypad_button_index.search_all(line);
for (int i = 0; i < reg_match.size(); ++i) {
Ref<RegExMatch> match = reg_match[i];
PackedStringArray strings = match->get_strings();
String button_index_entry = strings[0];
int button_index_value = strings[1].to_int();
if (button_index_value == 6) { // L2 and R2 are mapped to joypad axes in Godot 4.
line = line.replace("InputEventJoypadButton", "InputEventJoypadMotion");
line = line.replace(button_index_entry, ",\"axis\":4,\"axis_value\":1.0");
} else if (button_index_value == 7) {
line = line.replace("InputEventJoypadButton", "InputEventJoypadMotion");
line = line.replace(button_index_entry, ",\"axis\":5,\"axis_value\":1.0");
} else if (button_index_value < 22) { // There are no mappings for indexes greater than 22 in both Godot 3 & 4.
String pressure_and_pressed_properties = strings[2];
line = line.replace(button_index_entry, ",\"button_index\":" + String::num_int64(reg_container.joypad_button_mappings[button_index_value]) + "," + pressure_and_pressed_properties);
}
}
// Remap axes. Only L2 and R2 need remapping.
reg_match = reg_container.joypad_axis.search_all(line);
for (int i = 0; i < reg_match.size(); ++i) {
Ref<RegExMatch> match = reg_match[i];
PackedStringArray strings = match->get_strings();
String axis_entry = strings[0];
int axis_value = strings[1].to_int();
if (axis_value == 6) {
line = line.replace(axis_entry, ",\"axis\":4");
} else if (axis_value == 7) {
line = line.replace(axis_entry, ",\"axis\":5");
}
}
}
}
}
Vector<String> ProjectConverter3To4::check_for_rename_joypad_buttons_and_axes(Vector<String> &lines, const RegExContainer &reg_container) {
Vector<String> found_renames;
int current_line = 1;
for (String &line : lines) {
if (uint64_t(line.length()) <= maximum_line_length) {
// Remap button indexes.
TypedArray<RegExMatch> reg_match = reg_container.joypad_button_index.search_all(line);
for (int i = 0; i < reg_match.size(); ++i) {
Ref<RegExMatch> match = reg_match[i];
PackedStringArray strings = match->get_strings();
String button_index_entry = strings[0];
int button_index_value = strings[1].to_int();
if (button_index_value == 6) { // L2 and R2 are mapped to joypad axes in Godot 4.
found_renames.append(line_formatter(current_line, "InputEventJoypadButton", "InputEventJoypadMotion", line));
found_renames.append(line_formatter(current_line, button_index_entry, ",\"axis\":4", line));
} else if (button_index_value == 7) {
found_renames.append(line_formatter(current_line, "InputEventJoypadButton", "InputEventJoypadMotion", line));
found_renames.append(line_formatter(current_line, button_index_entry, ",\"axis\":5", line));
} else if (button_index_value < 22) { // There are no mappings for indexes greater than 22 in both Godot 3 & 4.
found_renames.append(line_formatter(current_line, "\"button_index\":" + strings[1], "\"button_index\":" + String::num_int64(reg_container.joypad_button_mappings[button_index_value]), line));
}
}
// Remap axes. Only L2 and R2 need remapping.
reg_match = reg_container.joypad_axis.search_all(line);
for (int i = 0; i < reg_match.size(); ++i) {
Ref<RegExMatch> match = reg_match[i];
PackedStringArray strings = match->get_strings();
String axis_entry = strings[0];
int axis_value = strings[1].to_int();
if (axis_value == 6) {
found_renames.append(line_formatter(current_line, axis_entry, ",\"axis\":4", line));
} else if (axis_value == 7) {
found_renames.append(line_formatter(current_line, axis_entry, ",\"axis\":5", line));
}
}
current_line++;
}
}
return found_renames;
}
Add keycode project conversion
2023-03-02 14:24:00 +00:00
Vector<String> ProjectConverter3To4::check_for_rename_input_map_scancode(Vector<String> &lines, const RegExContainer &reg_container) {
Vector<String> found_renames;
// The old Special Key, now colliding with CMD_OR_CTRL.
const int old_spkey = (1 << 24);
int current_line = 1;
for (String &line : lines) {
if (uint64_t(line.length()) <= maximum_line_length) {
TypedArray<RegExMatch> reg_match = reg_container.input_map_keycode.search_all(line);
for (int i = 0; i < reg_match.size(); ++i) {
Ref<RegExMatch> match = reg_match[i];
PackedStringArray strings = match->get_strings();
int key = strings[3].to_int();
if (key & old_spkey) {
// Create new key, clearing old Special Key and setting new one.
key = (key & ~old_spkey) | (int)Key::SPECIAL;
found_renames.append(line_formatter(current_line, strings[3], String::num_int64(key), line));
}
}
}
current_line++;
}
return found_renames;
}
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
void ProjectConverter3To4::custom_rename(Vector<SourceLine> &source_lines, String from, String to) {
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
RegEx reg = RegEx(String("\\b") + from + "\\b");
CRASH_COND(!reg.is_valid());
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
for (SourceLine &source_line : source_lines) {
if (source_line.is_comment) {
continue;
}
String &line = source_line.line;
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (uint64_t(line.length()) <= maximum_line_length) {
line = reg.sub(line, to, true);
}
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
};
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
Vector<String> ProjectConverter3To4::check_for_custom_rename(Vector<String> &lines, String from, String to) {
Vector<String> found_renames;
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
RegEx reg = RegEx(String("\\b") + from + "\\b");
CRASH_COND(!reg.is_valid());
int current_line = 1;
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
for (String &line : lines) {
if (uint64_t(line.length()) <= maximum_line_length) {
TypedArray<RegExMatch> reg_match = reg.search_all(line);
if (reg_match.size() > 0) {
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
found_renames.append(line_formatter(current_line, from.replace("\\.", "."), to, line)); // Without replacing it will print "\.shader" instead ".shader".
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
current_line++;
}
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
return found_renames;
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
void ProjectConverter3To4::rename_common(const char *array[][2], LocalVector<RegEx *> &cached_regexes, Vector<SourceLine> &source_lines) {
for (SourceLine &source_line : source_lines) {
if (source_line.is_comment) {
continue;
}
String &line = source_line.line;
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (uint64_t(line.length()) <= maximum_line_length) {
for (unsigned int current_index = 0; current_index < cached_regexes.size(); current_index++) {
if (line.contains(array[current_index][0])) {
line = cached_regexes[current_index]->sub(line, array[current_index][1], true);
}
}
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
}
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
Vector<String> ProjectConverter3To4::check_for_rename_common(const char *array[][2], LocalVector<RegEx *> &cached_regexes, Vector<String> &lines) {
Vector<String> found_renames;
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
int current_line = 1;
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
for (String &line : lines) {
if (uint64_t(line.length()) <= maximum_line_length) {
for (unsigned int current_index = 0; current_index < cached_regexes.size(); current_index++) {
if (line.contains(array[current_index][0])) {
TypedArray<RegExMatch> reg_match = cached_regexes[current_index]->search_all(line);
if (reg_match.size() > 0) {
found_renames.append(line_formatter(current_line, array[current_index][0], array[current_index][1], line));
}
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
}
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
current_line++;
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
return found_renames;
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
// Prints full info about renamed things e.g.:
// Line (67) remove -> remove_at - LINE """ doubler._blacklist.remove(0) """
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
String ProjectConverter3To4::line_formatter(int current_line, String from, String to, String line) {
if (from.size() > 200) {
from = from.substr(0, 197) + "...";
}
if (to.size() > 200) {
to = to.substr(0, 197) + "...";
}
if (line.size() > 400) {
line = line.substr(0, 397) + "...";
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
from = from.strip_escapes();
to = to.strip_escapes();
line = line.replace("\r", "").replace("\n", "").strip_edges();
return vformat("Line(%d), %s -> %s - LINE \"\"\" %s \"\"\"", current_line, from, to, line);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
// Prints only full lines e.g.:
// Line (1) - FULL LINES - """yield(get_tree().create_timer(3), 'timeout')""" =====> """ await get_tree().create_timer(3).timeout """
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
String ProjectConverter3To4::simple_line_formatter(int current_line, String old_line, String new_line) {
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
if (old_line.size() > 1000) {
old_line = old_line.substr(0, 997) + "...";
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
if (new_line.size() > 1000) {
new_line = new_line.substr(0, 997) + "...";
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Fix several oddities in Project Converter This is not a complete list. Nor are all of the changes exhaustive. - Measure final execution time in seconds instead of milliseconds. - Use `vformat()` instead of unreadable string concatenation whenever necessary. - Replaces every `&` used with booleans with `&&` because Visual Studio was really complaining about it. - Adds punctuation to some comments, in accordance to codebase guidelines. - Fixes some typos around the file (such as "parenthesis" being called "parenthess"), as well as attempt to change some sentences to be more English-correct. - Reworded some comments and error messages entirely.
2022-09-07 20:25:26 +00:00
old_line = old_line.replace("\r", "").replace("\n", "").strip_edges();
new_line = new_line.replace("\r", "").replace("\n", "").strip_edges();
return vformat("Line (%d) - FULL LINES - \"\"\" %s \"\"\" =====> \"\"\" %s \"\"\"", current_line, old_line, new_line);
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
}
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
// Collects string from vector strings
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
String ProjectConverter3To4::collect_string_from_vector(Vector<SourceLine> &vector) {
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
String string = "";
for (int i = 0; i < vector.size(); i++) {
Project Converter: Do not convert lines that start with a comment Lines that start with # or // are ignored
2023-03-01 22:10:45 +00:00
string += vector[i].line;
Speedup conversion and add option to set maximum line length to prevent freezes
2022-08-13 20:17:35 +00:00
if (i != vector.size() - 1) {
string += "\n";
}
}
return string;
}
Add Godot 3.x -> Godot 4.x project converter
2022-03-10 15:21:22 +00:00
#endif // MODULE_REGEX_ENABLED
Clean up ProjectConverter3To4 architecture, move renames map to separate file This allows properly limiting what features depend on the RegEx module (doing the actual conversion) and what features only require the renames data (GDScript suggestions). Also better excludes the conversion command line options when actually disabling deprecated code. Fixes #73029.
2023-02-10 08:07:01 +00:00
Add hint for identifiers renamed since Godot 3
2022-03-23 17:54:41 +00:00
#endif // DISABLE_DEPRECATED
Reference in a new issue Copy permalink