Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-25 10:44:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

PoolVector is gone, replaced by Vector

Browse source 
Typed `PoolTypeArray` types are now renamed `PackedTypeArray` and are
sugar for `Vector<Type>`.
This commit is contained in:
Juan Linietsky 2020-02-17 18:06:54 -03:00 • committed by Juan Linietsky
parent fb8c93c10b
commit 3205a92ad8
406 changed files with 5314 additions and 8271 deletions
Download patch file Download diff file Expand all files Collapse all files

26
editor/plugins/script_text_editor.cpp
View file

@ -306,13 +306,13 @@ void ScriptTextEditor::_set_theme_for_script() {
text_edit->add_keyword_color("RID", basetype_color);
text_edit->add_keyword_color("Dictionary", basetype_color);
text_edit->add_keyword_color("Array", basetype_color);
text_edit->add_keyword_color("PoolByteArray", basetype_color);
text_edit->add_keyword_color("PoolIntArray", basetype_color);
text_edit->add_keyword_color("PoolRealArray", basetype_color);
text_edit->add_keyword_color("PoolStringArray", basetype_color);
text_edit->add_keyword_color("PoolVector2Array", basetype_color);
text_edit->add_keyword_color("PoolVector3Array", basetype_color);
text_edit->add_keyword_color("PoolColorArray", basetype_color);
text_edit->add_keyword_color("PackedByteArray", basetype_color);
text_edit->add_keyword_color("PackedIntArray", basetype_color);
text_edit->add_keyword_color("PackedRealArray", basetype_color);
text_edit->add_keyword_color("PackedStringArray", basetype_color);
text_edit->add_keyword_color("PackedVector2Array", basetype_color);
text_edit->add_keyword_color("PackedVector3Array", basetype_color);
text_edit->add_keyword_color("PackedColorArray", basetype_color);
//colorize engine types
List<StringName> types;
@ -424,7 +424,7 @@ void ScriptTextEditor::_notification(int p_what) {
}
}
void ScriptTextEditor::add_callback(const String &p_function, PoolStringArray p_args) {
void ScriptTextEditor::add_callback(const String &p_function, PackedStringArray p_args) {
String code = code_editor->get_text_edit()->get_text();
int pos = script->get_language()->find_function(p_function, code);
@ -1212,7 +1212,7 @@ void ScriptTextEditor::_edit_option(int p_op) {
Expression expression;
Vector<String> lines = code_editor->get_text_edit()->get_selection_text().split("\n");
PoolStringArray results;
PackedStringArray results;
for (int i = 0; i < lines.size(); i++) {
String line = lines[i];
@ -1221,17 +1221,17 @@ void ScriptTextEditor::_edit_option(int p_op) {
if (expression.parse(line) == OK) {
Variant result = expression.execute(Array(), Variant(), false);
if (expression.get_error_text() == "") {
results.append(whitespace + result.get_construct_string());
results.push_back(whitespace + result.get_construct_string());
} else {
results.append(line);
results.push_back(line);
}
} else {
results.append(line);
results.push_back(line);
}
}
code_editor->get_text_edit()->begin_complex_operation(); //prevents creating a two-step undo
code_editor->get_text_edit()->insert_text_at_cursor(results.join("\n"));
code_editor->get_text_edit()->insert_text_at_cursor(String("\n").join(results));
code_editor->get_text_edit()->end_complex_operation();
} break;
case SEARCH_FIND: {