diff options
Diffstat (limited to 'editor/plugins/script_editor_plugin.cpp')
| -rw-r--r-- | editor/plugins/script_editor_plugin.cpp | 1561 |
1 files changed, 668 insertions, 893 deletions
diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index 4709cb843..8d319500d 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -27,33 +27,32 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "script_editor_plugin.h" +#include "editor/editor_node.h" #include "editor/editor_settings.h" +#include "editor/script_editor_debugger.h" +#include "globals.h" #include "io/resource_loader.h" #include "io/resource_saver.h" +#include "os/file_access.h" +#include "os/input.h" +#include "os/keyboard.h" #include "os/keyboard.h" #include "os/os.h" -#include "editor/editor_node.h" -#include "editor/script_editor_debugger.h" -#include "globals.h" -#include "os/file_access.h" #include "scene/main/viewport.h" -#include "os/keyboard.h" -#include "os/input.h" /*** SCRIPT EDITOR ****/ - -static bool _can_open_in_editor(Script* p_script) { +static bool _can_open_in_editor(Script *p_script) { String path = p_script->get_path(); - if (path.find("::")!=-1) { + if (path.find("::") != -1) { //refuse handling this if it can't be edited - bool valid=false; - for(int i=0;i<EditorNode::get_singleton()->get_editor_data().get_edited_scene_count();i++) { + bool valid = false; + for (int i = 0; i < EditorNode::get_singleton()->get_editor_data().get_edited_scene_count(); i++) { if (path.begins_with(EditorNode::get_singleton()->get_editor_data().get_scene_path(i))) { - valid=true; + valid = true; break; } } @@ -64,68 +63,63 @@ static bool _can_open_in_editor(Script* p_script) { return true; } - class EditorScriptCodeCompletionCache : public ScriptCodeCompletionCache { - struct Cache { uint64_t time_loaded; RES cache; }; - Map<String,Cache> cached; - + Map<String, Cache> cached; public: - uint64_t max_time_cache; int max_cache_size; void cleanup() { - List< Map<String,Cache>::Element * > to_clean; + List<Map<String, Cache>::Element *> to_clean; - - Map<String,Cache>::Element *I=cached.front(); - while(I) { - if ((OS::get_singleton()->get_ticks_msec()-I->get().time_loaded)>max_time_cache) { + Map<String, Cache>::Element *I = cached.front(); + while (I) { + if ((OS::get_singleton()->get_ticks_msec() - I->get().time_loaded) > max_time_cache) { to_clean.push_back(I); } - I=I->next(); + I = I->next(); } - while(to_clean.front()) { + while (to_clean.front()) { cached.erase(to_clean.front()->get()); to_clean.pop_front(); } } - RES get_cached_resource(const String& p_path) { + RES get_cached_resource(const String &p_path) { - Map<String,Cache>::Element *E=cached.find(p_path); + Map<String, Cache>::Element *E = cached.find(p_path); if (!E) { Cache c; - c.cache=ResourceLoader::load(p_path); - E=cached.insert(p_path,c); + c.cache = ResourceLoader::load(p_path); + E = cached.insert(p_path, c); } - E->get().time_loaded=OS::get_singleton()->get_ticks_msec(); + E->get().time_loaded = OS::get_singleton()->get_ticks_msec(); - if (cached.size()>max_cache_size) { + if (cached.size() > max_cache_size) { uint64_t older; - Map<String,Cache>::Element *O=cached.front(); - older=O->get().time_loaded; - Map<String,Cache>::Element *I=O; - while(I) { - if (I->get().time_loaded<older) { + Map<String, Cache>::Element *O = cached.front(); + older = O->get().time_loaded; + Map<String, Cache>::Element *I = O; + while (I) { + if (I->get().time_loaded < older) { older = I->get().time_loaded; - O=I; + O = I; } - I=I->next(); + I = I->next(); } - if (O!=E) {//should never heppane.. + if (O != E) { //should never heppane.. cached.erase(O); } } @@ -133,18 +127,16 @@ public: return E->get().cache; } - EditorScriptCodeCompletionCache() { - max_cache_size=128; - max_time_cache=5*60*1000; //minutes, five + max_cache_size = 128; + max_time_cache = 5 * 60 * 1000; //minutes, five } - }; #define SORT_SCRIPT_LIST -void ScriptEditorQuickOpen::popup(const Vector<String>& p_functions, bool p_dontclear) { +void ScriptEditorQuickOpen::popup(const Vector<String> &p_functions, bool p_dontclear) { popup_centered_ratio(0.6); if (p_dontclear) @@ -152,55 +144,45 @@ void ScriptEditorQuickOpen::popup(const Vector<String>& p_functions, bool p_dont else search_box->clear(); search_box->grab_focus(); - functions=p_functions; + functions = p_functions; _update_search(); - - } - -void ScriptEditorQuickOpen::_text_changed(const String& p_newtext) { +void ScriptEditorQuickOpen::_text_changed(const String &p_newtext) { _update_search(); } -void ScriptEditorQuickOpen::_sbox_input(const InputEvent& p_ie) { +void ScriptEditorQuickOpen::_sbox_input(const InputEvent &p_ie) { - if (p_ie.type==InputEvent::KEY && ( - p_ie.key.scancode == KEY_UP || - p_ie.key.scancode == KEY_DOWN || - p_ie.key.scancode == KEY_PAGEUP || - p_ie.key.scancode == KEY_PAGEDOWN ) ) { + if (p_ie.type == InputEvent::KEY && (p_ie.key.scancode == KEY_UP || + p_ie.key.scancode == KEY_DOWN || + p_ie.key.scancode == KEY_PAGEUP || + p_ie.key.scancode == KEY_PAGEDOWN)) { - search_options->call("_input_event",p_ie); + search_options->call("_input_event", p_ie); search_box->accept_event(); } - } - - void ScriptEditorQuickOpen::_update_search() { - search_options->clear(); TreeItem *root = search_options->create_item(); - for(int i=0;i<functions.size();i++) { + for (int i = 0; i < functions.size(); i++) { String file = functions[i]; - if ((search_box->get_text()=="" || file.findn(search_box->get_text())!=-1)) { + if ((search_box->get_text() == "" || file.findn(search_box->get_text()) != -1)) { TreeItem *ti = search_options->create_item(root); - ti->set_text(0,file); - if (root->get_children()==ti) + ti->set_text(0, file); + if (root->get_children() == ti) ti->select(0); - } } - get_ok()->set_disabled(root->get_children()==NULL); - + get_ok()->set_disabled(root->get_children() == NULL); } void ScriptEditorQuickOpen::_confirmed() { @@ -208,80 +190,68 @@ void ScriptEditorQuickOpen::_confirmed() { TreeItem *ti = search_options->get_selected(); if (!ti) return; - int line = ti->get_text(0).get_slice(":",1).to_int(); + int line = ti->get_text(0).get_slice(":", 1).to_int(); - emit_signal("goto_line",line-1); + emit_signal("goto_line", line - 1); hide(); } void ScriptEditorQuickOpen::_notification(int p_what) { - if (p_what==NOTIFICATION_ENTER_TREE) { - - connect("confirmed",this,"_confirmed"); - + if (p_what == NOTIFICATION_ENTER_TREE) { + connect("confirmed", this, "_confirmed"); } } - - - void ScriptEditorQuickOpen::_bind_methods() { - ObjectTypeDB::bind_method(_MD("_text_changed"),&ScriptEditorQuickOpen::_text_changed); - ObjectTypeDB::bind_method(_MD("_confirmed"),&ScriptEditorQuickOpen::_confirmed); - ObjectTypeDB::bind_method(_MD("_sbox_input"),&ScriptEditorQuickOpen::_sbox_input); - - ADD_SIGNAL(MethodInfo("goto_line",PropertyInfo(Variant::INT,"line"))); + ObjectTypeDB::bind_method(_MD("_text_changed"), &ScriptEditorQuickOpen::_text_changed); + ObjectTypeDB::bind_method(_MD("_confirmed"), &ScriptEditorQuickOpen::_confirmed); + ObjectTypeDB::bind_method(_MD("_sbox_input"), &ScriptEditorQuickOpen::_sbox_input); + ADD_SIGNAL(MethodInfo("goto_line", PropertyInfo(Variant::INT, "line"))); } - ScriptEditorQuickOpen::ScriptEditorQuickOpen() { - - VBoxContainer *vbc = memnew( VBoxContainer ); + VBoxContainer *vbc = memnew(VBoxContainer); add_child(vbc); set_child_rect(vbc); - search_box = memnew( LineEdit ); - vbc->add_margin_child(TTR("Search:"),search_box); - search_box->connect("text_changed",this,"_text_changed"); - search_box->connect("input_event",this,"_sbox_input"); - search_options = memnew( Tree ); - vbc->add_margin_child(TTR("Matches:"),search_options,true); + search_box = memnew(LineEdit); + vbc->add_margin_child(TTR("Search:"), search_box); + search_box->connect("text_changed", this, "_text_changed"); + search_box->connect("input_event", this, "_sbox_input"); + search_options = memnew(Tree); + vbc->add_margin_child(TTR("Matches:"), search_options, true); get_ok()->set_text(TTR("Open")); get_ok()->set_disabled(true); register_text_enter(search_box); set_hide_on_ok(false); - search_options->connect("item_activated",this,"_confirmed"); + search_options->connect("item_activated", this, "_confirmed"); search_options->set_hide_root(true); } - ///////////////////////////////// -ScriptEditor *ScriptEditor::script_editor=NULL; - -Vector<String> ScriptTextEditor::get_functions() { +ScriptEditor *ScriptEditor::script_editor = NULL; +Vector<String> ScriptTextEditor::get_functions() { String errortxt; - int line=-1,col; - TextEdit *te=get_text_edit(); + int line = -1, col; + TextEdit *te = get_text_edit(); String text = te->get_text(); List<String> fnc; - if (script->get_language()->validate(text,line,col,errortxt,script->get_path(),&fnc)) { + if (script->get_language()->validate(text, line, col, errortxt, script->get_path(), &fnc)) { //if valid rewrite functions to latest functions.clear(); - for (List<String>::Element *E=fnc.front();E;E=E->next()) { + for (List<String>::Element *E = fnc.front(); E; E = E->next()) { functions.push_back(E->get()); } - - } return functions; @@ -291,7 +261,7 @@ void ScriptTextEditor::apply_code() { if (script.is_null()) return; -// print_line("applying code"); + // print_line("applying code"); script->set_source_code(get_text_edit()->get_text()); script->update_exports(); } @@ -307,108 +277,105 @@ void ScriptTextEditor::_load_theme_settings() { /* keyword color */ - - get_text_edit()->set_custom_bg_color(EDITOR_DEF("text_editor/background_color",Color(0,0,0,0))); - get_text_edit()->add_color_override("completion_background_color", EDITOR_DEF("text_editor/completion_background_color", Color(0,0,0,0))); + get_text_edit()->set_custom_bg_color(EDITOR_DEF("text_editor/background_color", Color(0, 0, 0, 0))); + get_text_edit()->add_color_override("completion_background_color", EDITOR_DEF("text_editor/completion_background_color", Color(0, 0, 0, 0))); get_text_edit()->add_color_override("completion_selected_color", EDITOR_DEF("text_editor/completion_selected_color", Color::html("434244"))); get_text_edit()->add_color_override("completion_existing_color", EDITOR_DEF("text_editor/completion_existing_color", Color::html("21dfdfdf"))); get_text_edit()->add_color_override("completion_scroll_color", EDITOR_DEF("text_editor/completion_scroll_color", Color::html("ffffff"))); get_text_edit()->add_color_override("completion_font_color", EDITOR_DEF("text_editor/completion_font_color", Color::html("aaaaaa"))); - get_text_edit()->add_color_override("font_color",EDITOR_DEF("text_editor/text_color",Color(0,0,0))); - get_text_edit()->add_color_override("line_number_color",EDITOR_DEF("text_editor/line_number_color",Color(0,0,0))); - get_text_edit()->add_color_override("caret_color",EDITOR_DEF("text_editor/caret_color",Color(0,0,0))); - get_text_edit()->add_color_override("caret_background_color",EDITOR_DEF("text_editor/caret_background_color",Color(0,0,0))); - get_text_edit()->add_color_override("font_selected_color",EDITOR_DEF("text_editor/text_selected_color",Color(1,1,1))); - get_text_edit()->add_color_override("selection_color",EDITOR_DEF("text_editor/selection_color",Color(0.2,0.2,1))); - get_text_edit()->add_color_override("brace_mismatch_color",EDITOR_DEF("text_editor/brace_mismatch_color",Color(1,0.2,0.2))); - get_text_edit()->add_color_override("current_line_color",EDITOR_DEF("text_editor/current_line_color",Color(0.3,0.5,0.8,0.15))); - get_text_edit()->add_color_override("word_highlighted_color",EDITOR_DEF("text_editor/word_highlighted_color",Color(0.8,0.9,0.9,0.15))); - get_text_edit()->add_color_override("number_color",EDITOR_DEF("text_editor/number_color",Color(0.9,0.6,0.0,2))); - get_text_edit()->add_color_override("function_color",EDITOR_DEF("text_editor/function_color",Color(0.4,0.6,0.8))); - get_text_edit()->add_color_override("member_variable_color",EDITOR_DEF("text_editor/member_variable_color",Color(0.9,0.3,0.3))); - get_text_edit()->add_color_override("mark_color", EDITOR_DEF("text_editor/mark_color", Color(1.0,0.4,0.4,0.4))); - get_text_edit()->add_color_override("breakpoint_color", EDITOR_DEF("text_editor/breakpoint_color", Color(0.8,0.8,0.4,0.2))); - get_text_edit()->add_color_override("search_result_color",EDITOR_DEF("text_editor/search_result_color",Color(0.05,0.25,0.05,1))); - get_text_edit()->add_color_override("search_result_border_color",EDITOR_DEF("text_editor/search_result_border_color",Color(0.1,0.45,0.1,1))); - get_text_edit()->add_constant_override("line_spacing", EDITOR_DEF("text_editor/line_spacing",4)); + get_text_edit()->add_color_override("font_color", EDITOR_DEF("text_editor/text_color", Color(0, 0, 0))); + get_text_edit()->add_color_override("line_number_color", EDITOR_DEF("text_editor/line_number_color", Color(0, 0, 0))); + get_text_edit()->add_color_override("caret_color", EDITOR_DEF("text_editor/caret_color", Color(0, 0, 0))); + get_text_edit()->add_color_override("caret_background_color", EDITOR_DEF("text_editor/caret_background_color", Color(0, 0, 0))); + get_text_edit()->add_color_override("font_selected_color", EDITOR_DEF("text_editor/text_selected_color", Color(1, 1, 1))); + get_text_edit()->add_color_override("selection_color", EDITOR_DEF("text_editor/selection_color", Color(0.2, 0.2, 1))); + get_text_edit()->add_color_override("brace_mismatch_color", EDITOR_DEF("text_editor/brace_mismatch_color", Color(1, 0.2, 0.2))); + get_text_edit()->add_color_override("current_line_color", EDITOR_DEF("text_editor/current_line_color", Color(0.3, 0.5, 0.8, 0.15))); + get_text_edit()->add_color_override("word_highlighted_color", EDITOR_DEF("text_editor/word_highlighted_color", Color(0.8, 0.9, 0.9, 0.15))); + get_text_edit()->add_color_override("number_color", EDITOR_DEF("text_editor/number_color", Color(0.9, 0.6, 0.0, 2))); + get_text_edit()->add_color_override("function_color", EDITOR_DEF("text_editor/function_color", Color(0.4, 0.6, 0.8))); + get_text_edit()->add_color_override("member_variable_color", EDITOR_DEF("text_editor/member_variable_color", Color(0.9, 0.3, 0.3))); + get_text_edit()->add_color_override("mark_color", EDITOR_DEF("text_editor/mark_color", Color(1.0, 0.4, 0.4, 0.4))); + get_text_edit()->add_color_override("breakpoint_color", EDITOR_DEF("text_editor/breakpoint_color", Color(0.8, 0.8, 0.4, 0.2))); + get_text_edit()->add_color_override("search_result_color", EDITOR_DEF("text_editor/search_result_color", Color(0.05, 0.25, 0.05, 1))); + get_text_edit()->add_color_override("search_result_border_color", EDITOR_DEF("text_editor/search_result_border_color", Color(0.1, 0.45, 0.1, 1))); + get_text_edit()->add_constant_override("line_spacing", EDITOR_DEF("text_editor/line_spacing", 4)); - Color keyword_color= EDITOR_DEF("text_editor/keyword_color",Color(0.5,0.0,0.2)); + Color keyword_color = EDITOR_DEF("text_editor/keyword_color", Color(0.5, 0.0, 0.2)); List<String> keywords; script->get_language()->get_reserved_words(&keywords); - for(List<String>::Element *E=keywords.front();E;E=E->next()) { + for (List<String>::Element *E = keywords.front(); E; E = E->next()) { - get_text_edit()->add_keyword_color(E->get(),keyword_color); + get_text_edit()->add_keyword_color(E->get(), keyword_color); } //colorize core types - Color basetype_color= EDITOR_DEF("text_editor/base_type_color",Color(0.3,0.3,0.0)); + Color basetype_color = EDITOR_DEF("text_editor/base_type_color", Color(0.3, 0.3, 0.0)); - get_text_edit()->add_keyword_color("Vector2",basetype_color); - get_text_edit()->add_keyword_color("Vector3",basetype_color); - get_text_edit()->add_keyword_color("Plane",basetype_color); - get_text_edit()->add_keyword_color("Quat",basetype_color); - get_text_edit()->add_keyword_color("AABB",basetype_color); - get_text_edit()->add_keyword_color("Matrix3",basetype_color); - get_text_edit()->add_keyword_color("Transform",basetype_color); - get_text_edit()->add_keyword_color("Color",basetype_color); - get_text_edit()->add_keyword_color("Image",basetype_color); - get_text_edit()->add_keyword_color("InputEvent",basetype_color); - get_text_edit()->add_keyword_color("Rect2",basetype_color); - get_text_edit()->add_keyword_color("NodePath",basetype_color); + get_text_edit()->add_keyword_color("Vector2", basetype_color); + get_text_edit()->add_keyword_color("Vector3", basetype_color); + get_text_edit()->add_keyword_color("Plane", basetype_color); + get_text_edit()->add_keyword_color("Quat", basetype_color); + get_text_edit()->add_keyword_color("AABB", basetype_color); + get_text_edit()->add_keyword_color("Matrix3", basetype_color); + get_text_edit()->add_keyword_color("Transform", basetype_color); + get_text_edit()->add_keyword_color("Color", basetype_color); + get_text_edit()->add_keyword_color("Image", basetype_color); + get_text_edit()->add_keyword_color("InputEvent", basetype_color); + get_text_edit()->add_keyword_color("Rect2", basetype_color); + get_text_edit()->add_keyword_color("NodePath", basetype_color); //colorize engine types - Color type_color= EDITOR_DEF("text_editor/engine_type_color",Color(0.0,0.2,0.4)); + Color type_color = EDITOR_DEF("text_editor/engine_type_color", Color(0.0, 0.2, 0.4)); List<StringName> types; ObjectTypeDB::get_type_list(&types); - for(List<StringName>::Element *E=types.front();E;E=E->next()) { + for (List<StringName>::Element *E = types.front(); E; E = E->next()) { String n = E->get(); if (n.begins_with("_")) n = n.substr(1, n.length()); - get_text_edit()->add_keyword_color(n,type_color); + get_text_edit()->add_keyword_color(n, type_color); } //colorize comments - Color comment_color = EDITOR_DEF("text_editor/comment_color",Color::hex(0x797e7eff)); + Color comment_color = EDITOR_DEF("text_editor/comment_color", Color::hex(0x797e7eff)); List<String> comments; script->get_language()->get_comment_delimiters(&comments); - for(List<String>::Element *E=comments.front();E;E=E->next()) { + for (List<String>::Element *E = comments.front(); E; E = E->next()) { String comment = E->get(); - String beg = comment.get_slice(" ",0); - String end = comment.get_slice_count(" ")>1?comment.get_slice(" ",1):String(); + String beg = comment.get_slice(" ", 0); + String end = comment.get_slice_count(" ") > 1 ? comment.get_slice(" ", 1) : String(); - get_text_edit()->add_color_region(beg,end,comment_color,end==""); + get_text_edit()->add_color_region(beg, end, comment_color, end == ""); } //colorize strings - Color string_color = EDITOR_DEF("text_editor/string_color",Color::hex(0x6b6f00ff)); + Color string_color = EDITOR_DEF("text_editor/string_color", Color::hex(0x6b6f00ff)); List<String> strings; script->get_language()->get_string_delimiters(&strings); - for (List<String>::Element *E=strings.front();E;E=E->next()) { + for (List<String>::Element *E = strings.front(); E; E = E->next()) { String string = E->get(); - String beg = string.get_slice(" ",0); - String end = string.get_slice_count(" ")>1?string.get_slice(" ",1):String(); - get_text_edit()->add_color_region(beg,end,string_color,end==""); + String beg = string.get_slice(" ", 0); + String end = string.get_slice_count(" ") > 1 ? string.get_slice(" ", 1) : String(); + get_text_edit()->add_color_region(beg, end, string_color, end == ""); } //colorize symbols - Color symbol_color= EDITOR_DEF("text_editor/symbol_color",Color::hex(0x005291ff)); + Color symbol_color = EDITOR_DEF("text_editor/symbol_color", Color::hex(0x005291ff)); get_text_edit()->set_symbol_color(symbol_color); - } - void ScriptTextEditor::reload_text() { - ERR_FAIL_COND(script.is_null()) ; + ERR_FAIL_COND(script.is_null()); TextEdit *te = get_text_edit(); int column = te->cursor_get_column(); @@ -426,57 +393,51 @@ void ScriptTextEditor::reload_text() { te->tag_saved_version(); _line_col_changed(); - } void ScriptTextEditor::_notification(int p_what) { - if (p_what==NOTIFICATION_READY) { + if (p_what == NOTIFICATION_READY) { //emit_signal("name_changed"); } } +bool ScriptTextEditor::is_unsaved() { -bool ScriptTextEditor::is_unsaved() { - - return get_text_edit()->get_version()!=get_text_edit()->get_saved_version(); + return get_text_edit()->get_version() != get_text_edit()->get_saved_version(); } -String ScriptTextEditor::get_name() { +String ScriptTextEditor::get_name() { String name; - if (script->get_path().find("local://")==-1 && script->get_path().find("::")==-1) { - name=script->get_path().get_file(); - if (get_text_edit()->get_version()!=get_text_edit()->get_saved_version()) { - name+="(*)"; + if (script->get_path().find("local://") == -1 && script->get_path().find("::") == -1) { + name = script->get_path().get_file(); + if (get_text_edit()->get_version() != get_text_edit()->get_saved_version()) { + name += "(*)"; } - } else if (script->get_name()!="") - name=script->get_name(); + } else if (script->get_name() != "") + name = script->get_name(); else - name=script->get_type()+"("+itos(script->get_instance_ID())+")"; + name = script->get_type() + "(" + itos(script->get_instance_ID()) + ")"; return name; - } Ref<Texture> ScriptTextEditor::get_icon() { - if (get_parent_control() && get_parent_control()->has_icon(script->get_type(),"EditorIcons")) { - return get_parent_control()->get_icon(script->get_type(),"EditorIcons"); + if (get_parent_control() && get_parent_control()->has_icon(script->get_type(), "EditorIcons")) { + return get_parent_control()->get_icon(script->get_type(), "EditorIcons"); } return Ref<Texture>(); } - - -void ScriptTextEditor::set_edited_script(const Ref<Script>& p_script) { +void ScriptTextEditor::set_edited_script(const Ref<Script> &p_script) { ERR_FAIL_COND(!script.is_null()); - script=p_script; - + script = p_script; _load_theme_settings(); @@ -484,27 +445,25 @@ void ScriptTextEditor::set_edited_script(const Ref<Script>& p_script) { get_text_edit()->clear_undo_history(); get_text_edit()->tag_saved_version(); - emit_signal("name_changed"); _line_col_changed(); } - void ScriptTextEditor::_validate_script() { String errortxt; - int line=-1,col; - TextEdit *te=get_text_edit(); + int line = -1, col; + TextEdit *te = get_text_edit(); String text = te->get_text(); List<String> fnc; - if (!script->get_language()->validate(text,line,col,errortxt,script->get_path(),&fnc)) { - String error_text="error("+itos(line)+","+itos(col)+"): "+errortxt; + if (!script->get_language()->validate(text, line, col, errortxt, script->get_path(), &fnc)) { + String error_text = "error(" + itos(line) + "," + itos(col) + "): " + errortxt; set_error(error_text); } else { set_error(""); - line=-1; + line = -1; if (!script->is_tool()) { script->set_source_code(text); script->update_exports(); @@ -512,31 +471,29 @@ void ScriptTextEditor::_validate_script() { } functions.clear(); - for (List<String>::Element *E=fnc.front();E;E=E->next()) { + for (List<String>::Element *E = fnc.front(); E; E = E->next()) { functions.push_back(E->get()); } - } line--; - for(int i=0;i<te->get_line_count();i++) { - te->set_line_as_marked(i,line==i); + for (int i = 0; i < te->get_line_count(); i++) { + te->set_line_as_marked(i, line == i); } emit_signal("name_changed"); } +static Node *_find_node_for_script(Node *p_base, Node *p_current, const Ref<Script> &p_script) { -static Node* _find_node_for_script(Node* p_base, Node*p_current, const Ref<Script>& p_script) { - - if (p_current->get_owner()!=p_base && p_base!=p_current) + if (p_current->get_owner() != p_base && p_base != p_current) return NULL; Ref<Script> c = p_current->get_script(); - if (c==p_script) + if (c == p_script) return p_current; - for(int i=0;i<p_current->get_child_count();i++) { - Node *found = _find_node_for_script(p_base,p_current->get_child(i),p_script); + for (int i = 0; i < p_current->get_child_count(); i++) { + Node *found = _find_node_for_script(p_base, p_current->get_child(i), p_script); if (found) return found; } @@ -544,19 +501,18 @@ static Node* _find_node_for_script(Node* p_base, Node*p_current, const Ref<Scrip return NULL; } -static void _find_changed_scripts_for_external_editor(Node* p_base, Node*p_current, Set<Ref<Script> > &r_scripts) { +static void _find_changed_scripts_for_external_editor(Node *p_base, Node *p_current, Set<Ref<Script> > &r_scripts) { - if (p_current->get_owner()!=p_base && p_base!=p_current) + if (p_current->get_owner() != p_base && p_base != p_current) return; Ref<Script> c = p_current->get_script(); if (c.is_valid()) r_scripts.insert(c); - for(int i=0;i<p_current->get_child_count();i++) { - _find_changed_scripts_for_external_editor(p_base,p_current->get_child(i),r_scripts); + for (int i = 0; i < p_current->get_child_count(); i++) { + _find_changed_scripts_for_external_editor(p_base, p_current->get_child(i), r_scripts); } - } void ScriptEditor::_update_modified_scripts_for_external_editor(Ref<Script> p_for_script) { @@ -568,17 +524,17 @@ void ScriptEditor::_update_modified_scripts_for_external_editor(Ref<Script> p_fo Node *base = get_tree()->get_edited_scene_root(); if (base) { - _find_changed_scripts_for_external_editor(base,base,scripts); + _find_changed_scripts_for_external_editor(base, base, scripts); } - for (Set<Ref<Script> >::Element *E=scripts.front();E;E=E->next()) { + for (Set<Ref<Script> >::Element *E = scripts.front(); E; E = E->next()) { Ref<Script> script = E->get(); - if (p_for_script.is_valid() && p_for_script!=script) + if (p_for_script.is_valid() && p_for_script != script) continue; - if (script->get_path()=="" || script->get_path().find("local://")!=-1 || script->get_path().find("::")!=-1) { + if (script->get_path() == "" || script->get_path().find("local://") != -1 || script->get_path().find("::") != -1) { continue; //internal script, who cares, though weird } @@ -586,32 +542,28 @@ void ScriptEditor::_update_modified_scripts_for_external_editor(Ref<Script> p_fo uint64_t last_date = script->get_last_modified_time(); uint64_t date = FileAccess::get_modified_time(script->get_path()); - if (last_date!=date) { + if (last_date != date) { - Ref<Script> rel_script = ResourceLoader::load(script->get_path(),script->get_type(),true); + Ref<Script> rel_script = ResourceLoader::load(script->get_path(), script->get_type(), true); ERR_CONTINUE(!rel_script.is_valid()); - script->set_source_code( rel_script->get_source_code() ); - script->set_last_modified_time( rel_script->get_last_modified_time() ); + script->set_source_code(rel_script->get_source_code()); + script->set_last_modified_time(rel_script->get_last_modified_time()); script->update_exports(); } - } } - - -void ScriptTextEditor::_code_complete_script(const String& p_code, List<String>* r_options) { +void ScriptTextEditor::_code_complete_script(const String &p_code, List<String> *r_options) { Node *base = get_tree()->get_edited_scene_root(); if (base) { - base = _find_node_for_script(base,base,script); + base = _find_node_for_script(base, base, script); } String hint; - Error err = script->get_language()->complete_code(p_code,script->get_path().get_base_dir(),base,r_options,hint); - if (hint!="") { + Error err = script->get_language()->complete_code(p_code, script->get_path().get_base_dir(), base, r_options, hint); + if (hint != "") { get_text_edit()->set_code_hint(hint); } - } void ScriptTextEditor::_bind_methods() { @@ -623,35 +575,34 @@ ScriptTextEditor::ScriptTextEditor() { /*** SCRIPT EDITOR ******/ -String ScriptEditor::_get_debug_tooltip(const String&p_text,Node *_ste) { +String ScriptEditor::_get_debug_tooltip(const String &p_text, Node *_ste) { - ScriptTextEditor *ste=_ste->cast_to<ScriptTextEditor>(); + ScriptTextEditor *ste = _ste->cast_to<ScriptTextEditor>(); String val = debugger->get_var_value(p_text); - if (val!=String()) { - return p_text+": "+val; + if (val != String()) { + return p_text + ": " + val; } else { return String(); } } -void ScriptEditor::_breaked(bool p_breaked,bool p_can_debug) { +void ScriptEditor::_breaked(bool p_breaked, bool p_can_debug) { if (bool(EditorSettings::get_singleton()->get("text_editor/external/use_external_editor"))) { return; } - debug_menu->get_popup()->set_item_disabled( debug_menu->get_popup()->get_item_index(DEBUG_NEXT), !(p_breaked && p_can_debug)); - debug_menu->get_popup()->set_item_disabled( debug_menu->get_popup()->get_item_index(DEBUG_STEP), !(p_breaked && p_can_debug) ); - debug_menu->get_popup()->set_item_disabled( debug_menu->get_popup()->get_item_index(DEBUG_BREAK), p_breaked ); - debug_menu->get_popup()->set_item_disabled( debug_menu->get_popup()->get_item_index(DEBUG_CONTINUE), !p_breaked ); - + debug_menu->get_popup()->set_item_disabled(debug_menu->get_popup()->get_item_index(DEBUG_NEXT), !(p_breaked && p_can_debug)); + debug_menu->get_popup()->set_item_disabled(debug_menu->get_popup()->get_item_index(DEBUG_STEP), !(p_breaked && p_can_debug)); + debug_menu->get_popup()->set_item_disabled(debug_menu->get_popup()->get_item_index(DEBUG_BREAK), p_breaked); + debug_menu->get_popup()->set_item_disabled(debug_menu->get_popup()->get_item_index(DEBUG_CONTINUE), !p_breaked); } void ScriptEditor::_show_debugger(bool p_show) { -// debug_menu->get_popup()->set_item_checked( debug_menu->get_popup()->get_item_index(DEBUG_SHOW), p_show); + // debug_menu->get_popup()->set_item_checked( debug_menu->get_popup()->get_item_index(DEBUG_SHOW), p_show); } void ScriptEditor::_script_created(Ref<Script> p_script) { @@ -673,7 +624,7 @@ void ScriptEditor::_trim_trailing_whitespace(TextEdit *tx) { int end = 0; for (int j = line.length() - 1; j > -1; j--) { if (line[j] != ' ' && line[j] != '\t') { - end = j+1; + end = j + 1; break; } } @@ -689,7 +640,7 @@ void ScriptEditor::_trim_trailing_whitespace(TextEdit *tx) { void ScriptEditor::_goto_script_line2(int p_line) { int selected = tab_container->get_current_tab(); - if (selected<0 || selected>=tab_container->get_child_count()) + if (selected < 0 || selected >= tab_container->get_child_count()) return; ScriptTextEditor *current = tab_container->get_child(selected)->cast_to<ScriptTextEditor>(); @@ -697,25 +648,20 @@ void ScriptEditor::_goto_script_line2(int p_line) { return; current->get_text_edit()->cursor_set_line(p_line); - } -void ScriptEditor::_goto_script_line(REF p_script,int p_line) { - +void ScriptEditor::_goto_script_line(REF p_script, int p_line) { editor->push_item(p_script.ptr()); _goto_script_line2(p_line); - } - void ScriptEditor::_update_history_arrows() { - script_back->set_disabled( history_pos<=0 ); - script_forward->set_disabled( history_pos>=history.size()-1 ); + script_back->set_disabled(history_pos <= 0); + script_forward->set_disabled(history_pos >= history.size() - 1); } - void ScriptEditor::_go_to_tab(int p_idx) { Node *cn = tab_container->get_child(p_idx); @@ -725,31 +671,30 @@ void ScriptEditor::_go_to_tab(int p_idx) { if (!c) return; - if (history_pos>=0 && history_pos<history.size() && history[history_pos].control==tab_container->get_current_tab_control()) { + if (history_pos >= 0 && history_pos < history.size() && history[history_pos].control == tab_container->get_current_tab_control()) { Node *n = tab_container->get_current_tab_control(); if (n->cast_to<ScriptTextEditor>()) { - history[history_pos].scroll_pos=n->cast_to<ScriptTextEditor>()->get_text_edit()->get_v_scroll(); - history[history_pos].cursor_column=n->cast_to<ScriptTextEditor>()->get_text_edit()->cursor_get_column(); - history[history_pos].cursor_row=n->cast_to<ScriptTextEditor>()->get_text_edit()->cursor_get_line(); + history[history_pos].scroll_pos = n->cast_to<ScriptTextEditor>()->get_text_edit()->get_v_scroll(); + history[history_pos].cursor_column = n->cast_to<ScriptTextEditor>()->get_text_edit()->cursor_get_column(); + history[history_pos].cursor_row = n->cast_to<ScriptTextEditor>()->get_text_edit()->cursor_get_line(); } if (n->cast_to<EditorHelp>()) { - history[history_pos].scroll_pos=n->cast_to<EditorHelp>()->get_scroll(); + history[history_pos].scroll_pos = n->cast_to<EditorHelp>()->get_scroll(); } } - history.resize(history_pos+1); + history.resize(history_pos + 1); ScriptHistory sh; - sh.control=c; - sh.scroll_pos=0; + sh.control = c; + sh.scroll_pos = 0; history.push_back(sh); history_pos++; - tab_container->set_current_tab(p_idx); c = tab_container->get_current_tab_control(); @@ -764,14 +709,12 @@ void ScriptEditor::_go_to_tab(int p_idx) { if (c->cast_to<EditorHelp>()) { script_name_label->set_text(c->cast_to<EditorHelp>()->get_class_name()); - script_icon->set_texture(get_icon("Help","EditorIcons")); + script_icon->set_texture(get_icon("Help", "EditorIcons")); if (is_visible()) c->cast_to<EditorHelp>()->set_focused(); } - - - c->set_meta("__editor_pass",++edit_pass); + c->set_meta("__editor_pass", ++edit_pass); _update_history_arrows(); _update_script_colors(); } @@ -779,7 +722,7 @@ void ScriptEditor::_go_to_tab(int p_idx) { void ScriptEditor::_close_tab(int p_idx) { int selected = p_idx; - if (selected<0 || selected>=tab_container->get_child_count()) + if (selected < 0 || selected >= tab_container->get_child_count()) return; Node *tselected = tab_container->get_child(selected); @@ -789,27 +732,27 @@ void ScriptEditor::_close_tab(int p_idx) { } //remove from history - history.resize(history_pos+1); + history.resize(history_pos + 1); - for(int i=0;i<history.size();i++) { - if (history[i].control==tselected) { + for (int i = 0; i < history.size(); i++) { + if (history[i].control == tselected) { history.remove(i); i--; history_pos--; } } - if (history_pos>=history.size()) { - history_pos=history.size()-1; + if (history_pos >= history.size()) { + history_pos = history.size() - 1; } int idx = tab_container->get_current_tab(); memdelete(tselected); - if (idx>=tab_container->get_child_count()) - idx=tab_container->get_child_count()-1; - if (idx>=0) { + if (idx >= tab_container->get_child_count()) + idx = tab_container->get_child_count() - 1; + if (idx >= 0) { - if (history_pos>=0) { + if (history_pos >= 0) { idx = history[history_pos].control->get_index(); } tab_container->set_current_tab(idx); @@ -817,11 +760,8 @@ void ScriptEditor::_close_tab(int p_idx) { //script_list->select(idx); } - _update_history_arrows(); - - _update_script_names(); _save_layout(); } @@ -829,40 +769,34 @@ void ScriptEditor::_close_tab(int p_idx) { void ScriptEditor::_close_current_tab() { _close_tab(tab_container->get_current_tab()); - } void ScriptEditor::_close_docs_tab() { int child_count = tab_container->get_child_count(); - for (int i = child_count-1; i>=0; i--) { + for (int i = child_count - 1; i >= 0; i--) { EditorHelp *ste = tab_container->get_child(i)->cast_to<EditorHelp>(); if (ste) { _close_tab(i); } - } - } - - -void ScriptEditor::_resave_scripts(const String& p_str) { +void ScriptEditor::_resave_scripts(const String &p_str) { apply_scripts(); - for(int i=0;i<tab_container->get_child_count();i++) { + for (int i = 0; i < tab_container->get_child_count(); i++) { ScriptTextEditor *ste = tab_container->get_child(i)->cast_to<ScriptTextEditor>(); if (!ste) continue; - Ref<Script> script = ste->get_edited_script(); - if (script->get_path()=="" || script->get_path().find("local://")!=-1 || script->get_path().find("::")!=-1) + if (script->get_path() == "" || script->get_path().find("local://") != -1 || script->get_path().find("::") != -1) continue; //internal script, who cares if (trim_trailing_whitespace_on_save) { @@ -873,14 +807,11 @@ void ScriptEditor::_resave_scripts(const String& p_str) { } disk_changed->hide(); - } -void ScriptEditor::_reload_scripts(){ - +void ScriptEditor::_reload_scripts() { - - for(int i=0;i<tab_container->get_child_count();i++) { + for (int i = 0; i < tab_container->get_child_count(); i++) { ScriptTextEditor *ste = tab_container->get_child(i)->cast_to<ScriptTextEditor>(); if (!ste) { @@ -888,46 +819,36 @@ void ScriptEditor::_reload_scripts(){ continue; } - Ref<Script> script = ste->get_edited_script(); - if (script->get_path()=="" || script->get_path().find("local://")!=-1 || script->get_path().find("::")!=-1) { + if (script->get_path() == "" || script->get_path().find("local://") != -1 || script->get_path().find("::") != -1) { continue; //internal script, who cares } - uint64_t last_date = script->get_last_modified_time(); uint64_t date = FileAccess::get_modified_time(script->get_path()); //printf("last date: %lli vs date: %lli\n",last_date,date); - if (last_date==date) { + if (last_date == date) { continue; } - - Ref<Script> rel_script = ResourceLoader::load(script->get_path(),script->get_type(),true); + Ref<Script> rel_script = ResourceLoader::load(script->get_path(), script->get_type(), true); ERR_CONTINUE(!rel_script.is_valid()); - script->set_source_code( rel_script->get_source_code() ); - script->set_last_modified_time( rel_script->get_last_modified_time() ); + script->set_source_code(rel_script->get_source_code()); + script->set_last_modified_time(rel_script->get_last_modified_time()); script->reload(); ste->reload_text(); - - } disk_changed->hide(); _update_script_names(); - } +void ScriptEditor::_res_saved_callback(const Ref<Resource> &p_res) { - -void ScriptEditor::_res_saved_callback(const Ref<Resource>& p_res) { - - - - for(int i=0;i<tab_container->get_child_count();i++) { + for (int i = 0; i < tab_container->get_child_count(); i++) { ScriptTextEditor *ste = tab_container->get_child(i)->cast_to<ScriptTextEditor>(); if (!ste) { @@ -935,113 +856,102 @@ void ScriptEditor::_res_saved_callback(const Ref<Resource>& p_res) { continue; } - Ref<Script> script = ste->get_edited_script(); - if (script->get_path()=="" || script->get_path().find("local://")!=-1 || script->get_path().find("::")!=-1) { + if (script->get_path() == "" || script->get_path().find("local://") != -1 || script->get_path().find("::") != -1) { continue; //internal script, who cares } - if (script==p_res) { + if (script == p_res) { ste->get_text_edit()->tag_saved_version(); } - } _update_script_names(); - if (!pending_auto_reload && auto_reload_running_scripts) { call_deferred("_live_auto_reload_running_scripts"); - pending_auto_reload=true; + pending_auto_reload = true; } } void ScriptEditor::_live_auto_reload_running_scripts() { - pending_auto_reload=false; + pending_auto_reload = false; debugger->reload_scripts(); } - bool ScriptEditor::_test_script_times_on_disk(Ref<Script> p_for_script) { - disk_changed_list->clear(); TreeItem *r = disk_changed_list->create_item(); disk_changed_list->set_hide_root(true); - bool need_ask=false; - bool need_reload=false; - bool use_autoreload=bool(EDITOR_DEF("text_editor/auto_reload_scripts_on_external_change",false)); - - + bool need_ask = false; + bool need_reload = false; + bool use_autoreload = bool(EDITOR_DEF("text_editor/auto_reload_scripts_on_external_change", false)); - for(int i=0;i<tab_container->get_child_count();i++) { + for (int i = 0; i < tab_container->get_child_count(); i++) { ScriptTextEditor *ste = tab_container->get_child(i)->cast_to<ScriptTextEditor>(); if (ste) { Ref<Script> script = ste->get_edited_script(); - if (p_for_script.is_valid() && p_for_script!=script) + if (p_for_script.is_valid() && p_for_script != script) continue; - if (script->get_path()=="" || script->get_path().find("local://")!=-1 || script->get_path().find("::")!=-1) + if (script->get_path() == "" || script->get_path().find("local://") != -1 || script->get_path().find("::") != -1) continue; //internal script, who cares - uint64_t last_date = script->get_last_modified_time(); uint64_t date = FileAccess::get_modified_time(script->get_path()); //printf("last date: %lli vs date: %lli\n",last_date,date); - if (last_date!=date) { + if (last_date != date) { TreeItem *ti = disk_changed_list->create_item(r); - ti->set_text(0,script->get_path().get_file()); + ti->set_text(0, script->get_path().get_file()); if (!use_autoreload || ste->is_unsaved()) { - need_ask=true; + need_ask = true; } - need_reload=true; + need_reload = true; //r->set_metadata(0,); } } } - - if (need_reload) { if (!need_ask) { script_editor->_reload_scripts(); - need_reload=false; + need_reload = false; } else { - disk_changed->call_deferred("popup_centered_ratio",0.5); + disk_changed->call_deferred("popup_centered_ratio", 0.5); } } return need_reload; } -void ScriptEditor::swap_lines(TextEdit *tx, int line1, int line2) -{ - String tmp = tx->get_line(line1); - String tmp2 = tx->get_line(line2); - tx->set_line(line2, tmp); - tx->set_line(line1, tmp2); +void ScriptEditor::swap_lines(TextEdit *tx, int line1, int line2) { + String tmp = tx->get_line(line1); + String tmp2 = tx->get_line(line2); + tx->set_line(line2, tmp); + tx->set_line(line1, tmp2); - tx->cursor_set_line(line2); + tx->cursor_set_line(line2); } void ScriptEditor::_breakpoint_toggled(const int p_row) { int selected = tab_container->get_current_tab(); - if (selected<0 || selected>=tab_container->get_child_count()) { + if (selected < 0 || selected >= tab_container->get_child_count()) { return; } ScriptTextEditor *current = tab_container->get_child(selected)->cast_to<ScriptTextEditor>(); if (current) { - get_debugger()->set_breakpoint(current->get_edited_script()->get_path(),p_row+1,current->get_text_edit()->is_line_set_as_breakpoint(p_row)); + get_debugger()->set_breakpoint(current->get_edited_script()->get_path(), p_row + 1, current->get_text_edit()->is_line_set_as_breakpoint(p_row)); } } @@ -1049,12 +959,12 @@ void ScriptEditor::_file_dialog_action(String p_file) { switch (file_dialog_option) { case FILE_SAVE_THEME_AS: { - if(!EditorSettings::get_singleton()->save_text_editor_theme_as(p_file)) { + if (!EditorSettings::get_singleton()->save_text_editor_theme_as(p_file)) { editor->show_warning(TTR("Error while saving theme"), TTR("Error saving")); } } break; case FILE_IMPORT_THEME: { - if(!EditorSettings::get_singleton()->import_text_editor_theme(p_file)) { + if (!EditorSettings::get_singleton()->import_text_editor_theme(p_file)) { editor->show_warning(TTR("Error importing theme"), TTR("Error importing")); } } break; @@ -1064,11 +974,10 @@ void ScriptEditor::_file_dialog_action(String p_file) { void ScriptEditor::_menu_option(int p_option) { - - switch(p_option) { + switch (p_option) { case FILE_NEW: { script_create_dialog->config("Node", ".gd"); - script_create_dialog->popup_centered(Size2(300, 300)*EDSCALE); + script_create_dialog->popup_centered(Size2(300, 300) * EDSCALE); } break; case FILE_OPEN: { @@ -1114,7 +1023,7 @@ void ScriptEditor::_menu_option(int p_option) { EditorSettings::get_singleton()->load_text_editor_theme(); } break; case FILE_SAVE_THEME: { - if(!EditorSettings::get_singleton()->save_text_editor_theme()) { + if (!EditorSettings::get_singleton()->save_text_editor_theme()) { editor->show_warning(TTR("Error while saving theme"), TTR("Error saving")); } } break; @@ -1136,17 +1045,17 @@ void ScriptEditor::_menu_option(int p_option) { String current; - if (tab_container->get_tab_count()>0) { - EditorHelp *eh = tab_container->get_child( tab_container->get_current_tab() )->cast_to<EditorHelp>(); + if (tab_container->get_tab_count() > 0) { + EditorHelp *eh = tab_container->get_child(tab_container->get_current_tab())->cast_to<EditorHelp>(); if (eh) { - current=eh->get_class_name(); + current = eh->get_class_name(); } } help_index->popup(); - if (current!="") { - help_index->call_deferred("select_class",current); + if (current != "") { + help_index->call_deferred("select_class", current); } } break; case SEARCH_WEBSITE: { @@ -1163,8 +1072,8 @@ void ScriptEditor::_menu_option(int p_option) { } break; case DEBUG_SHOW: { if (debugger) { - bool visible = debug_menu->get_popup()->is_item_checked( debug_menu->get_popup()->get_item_index(DEBUG_SHOW) ); - debug_menu->get_popup()->set_item_checked( debug_menu->get_popup()->get_item_index(DEBUG_SHOW), !visible); + bool visible = debug_menu->get_popup()->is_item_checked(debug_menu->get_popup()->get_item_index(DEBUG_SHOW)); + debug_menu->get_popup()->set_item_checked(debug_menu->get_popup()->get_item_index(DEBUG_SHOW), !visible); if (visible) debugger->hide(); else @@ -1172,25 +1081,24 @@ void ScriptEditor::_menu_option(int p_option) { } } break; case DEBUG_SHOW_KEEP_OPEN: { - bool visible = debug_menu->get_popup()->is_item_checked( debug_menu->get_popup()->get_item_index(DEBUG_SHOW_KEEP_OPEN) ); + bool visible = debug_menu->get_popup()->is_item_checked(debug_menu->get_popup()->get_item_index(DEBUG_SHOW_KEEP_OPEN)); if (debugger) debugger->set_hide_on_stop(visible); - debug_menu->get_popup()->set_item_checked( debug_menu->get_popup()->get_item_index(DEBUG_SHOW_KEEP_OPEN), !visible); + debug_menu->get_popup()->set_item_checked(debug_menu->get_popup()->get_item_index(DEBUG_SHOW_KEEP_OPEN), !visible); } break; } - int selected = tab_container->get_current_tab(); - if (selected<0 || selected>=tab_container->get_child_count()) + if (selected < 0 || selected >= tab_container->get_child_count()) return; ScriptTextEditor *current = tab_container->get_child(selected)->cast_to<ScriptTextEditor>(); if (current) { - switch(p_option) { + switch (p_option) { case FILE_NEW: { script_create_dialog->config("Node", ".gd"); - script_create_dialog->popup_centered(Size2(300, 300)*EDSCALE); + script_create_dialog->popup_centered(Size2(300, 300) * EDSCALE); } break; case FILE_SAVE: { @@ -1200,7 +1108,7 @@ void ScriptEditor::_menu_option(int p_option) { if (trim_trailing_whitespace_on_save) { _trim_trailing_whitespace(current->get_text_edit()); } - editor->save_resource( current->get_edited_script() ); + editor->save_resource(current->get_edited_script()); } break; case FILE_SAVE_AS: { @@ -1209,7 +1117,7 @@ void ScriptEditor::_menu_option(int p_option) { _trim_trailing_whitespace(current->get_text_edit()); } editor->push_item(current->get_edited_script()->cast_to<Object>()); - editor->save_resource_as( current->get_edited_script() ); + editor->save_resource_as(current->get_edited_script()); } break; case EDIT_UNDO: { @@ -1249,15 +1157,13 @@ void ScriptEditor::_menu_option(int p_option) { return; tx->begin_complex_operation(); - if (tx->is_selection_active()) - { + if (tx->is_selection_active()) { int from_line = tx->get_selection_from_line(); - int from_col = tx->get_selection_from_column(); - int to_line = tx->get_selection_to_line(); + int from_col = tx->get_selection_from_column(); + int to_line = tx->get_selection_to_line(); int to_column = tx->get_selection_to_column(); - for (int i = from_line; i <= to_line; i++) - { + for (int i = from_line; i <= to_line; i++) { int line_id = i; int next_id = i - 1; @@ -1266,12 +1172,10 @@ void ScriptEditor::_menu_option(int p_option) { swap_lines(tx, line_id, next_id); } - int from_line_up = from_line > 0 ? from_line-1 : from_line; - int to_line_up = to_line > 0 ? to_line-1 : to_line; + int from_line_up = from_line > 0 ? from_line - 1 : from_line; + int to_line_up = to_line > 0 ? to_line - 1 : to_line; tx->select(from_line_up, from_col, to_line_up, to_column); - } - else - { + } else { int line_id = tx->cursor_get_line(); int next_id = line_id - 1; @@ -1292,33 +1196,29 @@ void ScriptEditor::_menu_option(int p_option) { return; tx->begin_complex_operation(); - if (tx->is_selection_active()) - { + if (tx->is_selection_active()) { int from_line = tx->get_selection_from_line(); - int from_col = tx->get_selection_from_column(); - int to_line = tx->get_selection_to_line(); + int from_col = tx->get_selection_from_column(); + int to_line = tx->get_selection_to_line(); int to_column = tx->get_selection_to_column(); - for (int i = to_line; i >= from_line; i--) - { + for (int i = to_line; i >= from_line; i--) { int line_id = i; int next_id = i + 1; - if (line_id == tx->get_line_count()-1 || next_id > tx->get_line_count()) + if (line_id == tx->get_line_count() - 1 || next_id > tx->get_line_count()) return; swap_lines(tx, line_id, next_id); } - int from_line_down = from_line < tx->get_line_count() ? from_line+1 : from_line; - int to_line_down = to_line < tx->get_line_count() ? to_line+1 : to_line; + int from_line_down = from_line < tx->get_line_count() ? from_line + 1 : from_line; + int to_line_down = to_line < tx->get_line_count() ? to_line + 1 : to_line; tx->select(from_line_down, from_col, to_line_down, to_column); - } - else - { + } else { int line_id = tx->cursor_get_line(); int next_id = line_id + 1; - if (line_id == tx->get_line_count()-1 || next_id > tx->get_line_count()) + if (line_id == tx->get_line_count() - 1 || next_id > tx->get_line_count()) return; swap_lines(tx, line_id, next_id); @@ -1335,23 +1235,18 @@ void ScriptEditor::_menu_option(int p_option) { return; tx->begin_complex_operation(); - if (tx->is_selection_active()) - { + if (tx->is_selection_active()) { tx->indent_selection_left(); - } - else - { + } else { int begin = tx->cursor_get_line(); String line_text = tx->get_line(begin); // begins with tab - if (line_text.begins_with("\t")) - { + if (line_text.begins_with("\t")) { line_text = line_text.substr(1, line_text.length()); tx->set_line(begin, line_text); } // begins with 4 spaces - else if (line_text.begins_with(" ")) - { + else if (line_text.begins_with(" ")) { line_text = line_text.substr(4, line_text.length()); tx->set_line(begin, line_text); } @@ -1369,12 +1264,9 @@ void ScriptEditor::_menu_option(int p_option) { return; tx->begin_complex_operation(); - if (tx->is_selection_active()) - { + if (tx->is_selection_active()) { tx->indent_selection_right(); - } - else - { + } else { int begin = tx->cursor_get_line(); String line_text = tx->get_line(begin); line_text = '\t' + line_text; @@ -1407,7 +1299,7 @@ void ScriptEditor::_menu_option(int p_option) { for (int i = from_line; i <= to_line; i++) { if (i >= tx->get_line_count() - 1) { - tx->set_line(i, tx->get_line(i) + "\n"); + tx->set_line(i, tx->get_line(i) + "\n"); } String line_clone = tx->get_line(i); tx->insert_at(line_clone, next_line); @@ -1430,19 +1322,16 @@ void ScriptEditor::_menu_option(int p_option) { if (scr.is_null()) return; - tx->begin_complex_operation(); - if (tx->is_selection_active()) - { + if (tx->is_selection_active()) { int begin = tx->get_selection_from_line(); int end = tx->get_selection_to_line(); // End of selection ends on the first column of the last line, ignore it. - if(tx->get_selection_to_column() == 0) + if (tx->get_selection_to_column() == 0) end -= 1; - for (int i = begin; i <= end; i++) - { + for (int i = begin; i <= end; i++) { String line_text = tx->get_line(i); if (line_text.begins_with("#")) @@ -1451,9 +1340,7 @@ void ScriptEditor::_menu_option(int p_option) { line_text = "#" + line_text; tx->set_line(i, line_text); } - } - else - { + } else { int begin = tx->cursor_get_line(); String line_text = tx->get_line(begin); @@ -1480,18 +1367,17 @@ void ScriptEditor::_menu_option(int p_option) { Ref<Script> scr = current->get_edited_script(); if (scr.is_null()) return; - int begin,end; + int begin, end; if (te->is_selection_active()) { - begin=te->get_selection_from_line(); - end=te->get_selection_to_line(); + begin = te->get_selection_from_line(); + end = te->get_selection_to_line(); } else { - begin=0; - end=te->get_line_count()-1; + begin = 0; + end = te->get_line_count() - 1; } - scr->get_language()->auto_indent_code(text,begin,end); + scr->get_language()->auto_indent_code(text, begin, end); te->set_text(text); - } break; case FILE_TOOL_RELOAD: case FILE_TOOL_RELOAD_SOFT: { @@ -1501,9 +1387,9 @@ void ScriptEditor::_menu_option(int p_option) { if (scr.is_null()) return; scr->set_source_code(te->get_text()); - bool soft = p_option==FILE_TOOL_RELOAD_SOFT || scr->get_instance_base_type()=="EditorPlugin"; //always soft-reload editor plugins + bool soft = p_option == FILE_TOOL_RELOAD_SOFT || scr->get_instance_base_type() == "EditorPlugin"; //always soft-reload editor plugins - scr->get_language()->reload_tool_script(scr,soft); + scr->get_language()->reload_tool_script(scr, soft); } break; case EDIT_TRIM_TRAILING_WHITESAPCE: { _trim_trailing_whitespace(current->get_text_edit()); @@ -1535,20 +1421,20 @@ void ScriptEditor::_menu_option(int p_option) { goto_line_dialog->popup_find_line(current->get_text_edit()); } break; case DEBUG_TOGGLE_BREAKPOINT: { - int line=current->get_text_edit()->cursor_get_line(); + int line = current->get_text_edit()->cursor_get_line(); bool dobreak = !current->get_text_edit()->is_line_set_as_breakpoint(line); - current->get_text_edit()->set_line_as_breakpoint(line,dobreak); - get_debugger()->set_breakpoint(current->get_edited_script()->get_path(),line+1,dobreak); + current->get_text_edit()->set_line_as_breakpoint(line, dobreak); + get_debugger()->set_breakpoint(current->get_edited_script()->get_path(), line + 1, dobreak); } break; case DEBUG_REMOVE_ALL_BREAKPOINTS: { List<int> bpoints; current->get_text_edit()->get_breakpoints(&bpoints); - for(List<int>::Element *E=bpoints.front();E;E=E->next()) { + for (List<int>::Element *E = bpoints.front(); E; E = E->next()) { int line = E->get(); bool dobreak = !current->get_text_edit()->is_line_set_as_breakpoint(line); - current->get_text_edit()->set_line_as_breakpoint(line,dobreak); - get_debugger()->set_breakpoint(current->get_edited_script()->get_path(),line+1,dobreak); + current->get_text_edit()->set_line_as_breakpoint(line, dobreak); + get_debugger()->set_breakpoint(current->get_edited_script()->get_path(), line + 1, dobreak); } } case DEBUG_GOTO_NEXT_BREAKPOINT: { @@ -1558,12 +1444,12 @@ void ScriptEditor::_menu_option(int p_option) { return; } - int line=current->get_text_edit()->cursor_get_line(); + int line = current->get_text_edit()->cursor_get_line(); // wrap around if (line >= bpoints[bpoints.size() - 1]) { current->get_text_edit()->cursor_set_line(bpoints[0]); } else { - for(List<int>::Element *E=bpoints.front();E;E=E->next()) { + for (List<int>::Element *E = bpoints.front(); E; E = E->next()) { int bline = E->get(); if (bline > line) { current->get_text_edit()->cursor_set_line(bline); @@ -1580,12 +1466,12 @@ void ScriptEditor::_menu_option(int p_option) { return; } - int line=current->get_text_edit()->cursor_get_line(); + int line = current->get_text_edit()->cursor_get_line(); // wrap around if (line <= bpoints[0]) { current->get_text_edit()->cursor_set_line(bpoints[bpoints.size() - 1]); } else { - for(List<int>::Element *E=bpoints.back();E;E=E->prev()) { + for (List<int>::Element *E = bpoints.back(); E; E = E->prev()) { int bline = E->get(); if (bline < line) { current->get_text_edit()->cursor_set_line(bline); @@ -1626,8 +1512,8 @@ void ScriptEditor::_menu_option(int p_option) { help_search_dialog->popup(text); } break; case FILE_CLOSE: { - if (current->get_text_edit()->get_version()!=current->get_text_edit()->get_saved_version()) { - erase_tab_confirm->set_text("Close and save changes?\n\""+current->get_name()+"\""); + if (current->get_text_edit()->get_version() != current->get_text_edit()->get_saved_version()) { + erase_tab_confirm->set_text("Close and save changes?\n\"" + current->get_name() + "\""); erase_tab_confirm->popup_centered_minsize(); } else { _close_current_tab(); @@ -1638,32 +1524,30 @@ void ScriptEditor::_menu_option(int p_option) { } break; case WINDOW_MOVE_LEFT: { - if (tab_container->get_current_tab()>0) { - tab_container->call_deferred("set_current_tab",tab_container->get_current_tab()-1); - script_list->call_deferred("select",tab_container->get_current_tab()-1); - tab_container->move_child(current,tab_container->get_current_tab()-1); + if (tab_container->get_current_tab() > 0) { + tab_container->call_deferred("set_current_tab", tab_container->get_current_tab() - 1); + script_list->call_deferred("select", tab_container->get_current_tab() - 1); + tab_container->move_child(current, tab_container->get_current_tab() - 1); _update_script_names(); } } break; case WINDOW_MOVE_RIGHT: { - if (tab_container->get_current_tab()<tab_container->get_child_count()-1) { - tab_container->call_deferred("set_current_tab",tab_container->get_current_tab()+1); - script_list->call_deferred("select",tab_container->get_current_tab()+1); - tab_container->move_child(current,tab_container->get_current_tab()+1); + if (tab_container->get_current_tab() < tab_container->get_child_count() - 1) { + tab_container->call_deferred("set_current_tab", tab_container->get_current_tab() + 1); + script_list->call_deferred("select", tab_container->get_current_tab() + 1); + tab_container->move_child(current, tab_container->get_current_tab() + 1); _update_script_names(); } - } break; default: { - if (p_option>=WINDOW_SELECT_BASE) { - - tab_container->set_current_tab(p_option-WINDOW_SELECT_BASE); - script_list->select(p_option-WINDOW_SELECT_BASE); + if (p_option >= WINDOW_SELECT_BASE) { + tab_container->set_current_tab(p_option - WINDOW_SELECT_BASE); + script_list->select(p_option - WINDOW_SELECT_BASE); } } } @@ -1672,7 +1556,7 @@ void ScriptEditor::_menu_option(int p_option) { EditorHelp *help = tab_container->get_current_tab_control()->cast_to<EditorHelp>(); if (help) { - switch(p_option) { + switch (p_option) { case SEARCH_FIND: { help->popup_search(); @@ -1686,12 +1570,8 @@ void ScriptEditor::_menu_option(int p_option) { case CLOSE_DOCS: { _close_docs_tab(); } break; - - } } - - } void ScriptEditor::_tab_changed(int p_which) { @@ -1701,19 +1581,19 @@ void ScriptEditor::_tab_changed(int p_which) { void ScriptEditor::_notification(int p_what) { - if (p_what==NOTIFICATION_ENTER_TREE) { + if (p_what == NOTIFICATION_ENTER_TREE) { - editor->connect("play_pressed",this,"_editor_play"); - editor->connect("pause_pressed",this,"_editor_pause"); - editor->connect("stop_pressed",this,"_editor_stop"); - editor->connect("script_add_function_request",this,"_add_callback"); - editor->connect("resource_saved",this,"_res_saved_callback"); - script_list->connect("item_selected",this,"_script_selected"); - script_split->connect("dragged",this,"_script_split_dragged"); - autosave_timer->connect("timeout",this,"_autosave_scripts"); + editor->connect("play_pressed", this, "_editor_play"); + editor->connect("pause_pressed", this, "_editor_pause"); + editor->connect("stop_pressed", this, "_editor_stop"); + editor->connect("script_add_function_request", this, "_add_callback"); + editor->connect("resource_saved", this, "_res_saved_callback"); + script_list->connect("item_selected", this, "_script_selected"); + script_split->connect("dragged", this, "_script_split_dragged"); + autosave_timer->connect("timeout", this, "_autosave_scripts"); { float autosave_time = EditorSettings::get_singleton()->get("text_editor/autosave_interval_secs"); - if (autosave_time>0) { + if (autosave_time > 0) { autosave_timer->set_wait_time(autosave_time); autosave_timer->start(); } else { @@ -1721,51 +1601,41 @@ void ScriptEditor::_notification(int p_what) { } } - EditorSettings::get_singleton()->connect("settings_changed",this,"_editor_settings_changed"); - help_search->set_icon(get_icon("Help","EditorIcons")); - site_search->set_icon(get_icon("Godot","EditorIcons")); - class_search->set_icon(get_icon("ClassList","EditorIcons")); - - script_forward->set_icon(get_icon("Forward","EditorIcons")); - script_back->set_icon(get_icon("Back","EditorIcons")); - - - + EditorSettings::get_singleton()->connect("settings_changed", this, "_editor_settings_changed"); + help_search->set_icon(get_icon("Help", "EditorIcons")); + site_search->set_icon(get_icon("Godot", "EditorIcons")); + class_search->set_icon(get_icon("ClassList", "EditorIcons")); + script_forward->set_icon(get_icon("Forward", "EditorIcons")); + script_back->set_icon(get_icon("Back", "EditorIcons")); } - if (p_what==NOTIFICATION_READY) { + if (p_what == NOTIFICATION_READY) { - get_tree()->connect("tree_changed",this,"_tree_changed"); - editor->connect("request_help",this,"_request_help"); + get_tree()->connect("tree_changed", this, "_tree_changed"); + editor->connect("request_help", this, "_request_help"); } - if (p_what==NOTIFICATION_EXIT_TREE) { - - editor->disconnect("play_pressed",this,"_editor_play"); - editor->disconnect("pause_pressed",this,"_editor_pause"); - editor->disconnect("stop_pressed",this,"_editor_stop"); + if (p_what == NOTIFICATION_EXIT_TREE) { + editor->disconnect("play_pressed", this, "_editor_play"); + editor->disconnect("pause_pressed", this, "_editor_pause"); + editor->disconnect("stop_pressed", this, "_editor_stop"); } - if (p_what==MainLoop::NOTIFICATION_WM_FOCUS_IN) { + if (p_what == MainLoop::NOTIFICATION_WM_FOCUS_IN) { _test_script_times_on_disk(); _update_modified_scripts_for_external_editor(); } - if (p_what==NOTIFICATION_PROCESS) { - + if (p_what == NOTIFICATION_PROCESS) { } - } +void ScriptEditor::close_builtin_scripts_from_scene(const String &p_scene) { -void ScriptEditor::close_builtin_scripts_from_scene(const String& p_scene) { - - - - for(int i=0;i<tab_container->get_child_count();i++) { + for (int i = 0; i < tab_container->get_child_count(); i++) { ScriptTextEditor *ste = tab_container->get_child(i)->cast_to<ScriptTextEditor>(); @@ -1775,32 +1645,27 @@ void ScriptEditor::close_builtin_scripts_from_scene(const String& p_scene) { if (!script.is_valid()) continue; - if (script->get_path().find("::")!=-1 && script->get_path().begins_with(p_scene)) { //is an internal script and belongs to scene being closed + if (script->get_path().find("::") != -1 && script->get_path().begins_with(p_scene)) { //is an internal script and belongs to scene being closed _close_tab(i); i--; - } } - } - - } void ScriptEditor::edited_scene_changed() { _update_modified_scripts_for_external_editor(); - } -static const Node * _find_node_with_script(const Node* p_node, const RefPtr & p_script) { +static const Node *_find_node_with_script(const Node *p_node, const RefPtr &p_script) { - if (p_node->get_script()==p_script) + if (p_node->get_script() == p_script) return p_node; - for(int i=0;i<p_node->get_child_count();i++) { + for (int i = 0; i < p_node->get_child_count(); i++) { - const Node *result = _find_node_with_script(p_node->get_child(i),p_script); + const Node *result = _find_node_with_script(p_node->get_child(i), p_script); if (result) return result; } @@ -1810,8 +1675,7 @@ static const Node * _find_node_with_script(const Node* p_node, const RefPtr & p_ Dictionary ScriptEditor::get_state() const { - -// apply_scripts(); + // apply_scripts(); Dictionary state; #if 0 @@ -1850,7 +1714,7 @@ Dictionary ScriptEditor::get_state() const { #endif return state; } -void ScriptEditor::set_state(const Dictionary& p_state) { +void ScriptEditor::set_state(const Dictionary &p_state) { #if 0 print_line("attempt set state: "+String(Variant(p_state))); @@ -1890,7 +1754,6 @@ void ScriptEditor::set_state(const Dictionary& p_state) { tab_container->set_current_tab(p_state["current"]); } #endif - } void ScriptEditor::clear() { #if 0 @@ -1919,14 +1782,11 @@ void ScriptEditor::clear() { } #endif - - } - void ScriptEditor::get_breakpoints(List<String> *p_breakpoints) { - for(int i=0;i<tab_container->get_child_count();i++) { + for (int i = 0; i < tab_container->get_child_count(); i++) { ScriptTextEditor *ste = tab_container->get_child(i)->cast_to<ScriptTextEditor>(); if (!ste) @@ -1937,27 +1797,23 @@ void ScriptEditor::get_breakpoints(List<String> *p_breakpoints) { Ref<Script> script = ste->get_edited_script(); String base = script->get_path(); - ERR_CONTINUE( base.begins_with("local://") || base=="" ); + ERR_CONTINUE(base.begins_with("local://") || base == ""); - for(List<int>::Element *E=bpoints.front();E;E=E->next()) { + for (List<int>::Element *E = bpoints.front(); E; E = E->next()) { - p_breakpoints->push_back(base+":"+itos(E->get()+1)); + p_breakpoints->push_back(base + ":" + itos(E->get() + 1)); } } - } - - - - void ScriptEditor::ensure_focus_current() { if (!is_inside_tree()) return; int cidx = tab_container->get_current_tab(); - if (cidx<0 || cidx>=tab_container->get_tab_count()); + if (cidx < 0 || cidx >= tab_container->get_tab_count()) + ; Control *c = tab_container->get_child(cidx)->cast_to<Control>(); if (!c) return; @@ -1972,17 +1828,15 @@ void ScriptEditor::_script_selected(int p_idx) { grab_focus_block = !Input::get_singleton()->is_mouse_button_pressed(1); //amazing hack, simply amazing _go_to_tab(script_list->get_item_metadata(p_idx)); - grab_focus_block=false; + grab_focus_block = false; } void ScriptEditor::ensure_select_current() { - - if (tab_container->get_child_count() && tab_container->get_current_tab()>=0) { + if (tab_container->get_child_count() && tab_container->get_current_tab() >= 0) { Node *current = tab_container->get_child(tab_container->get_current_tab()); - ScriptTextEditor *ste = current->cast_to<ScriptTextEditor>(); if (ste) { @@ -1994,8 +1848,6 @@ void ScriptEditor::ensure_select_current() { edit_menu->show(); search_menu->show(); script_search_menu->hide(); - - } EditorHelp *eh = current->cast_to<EditorHelp>(); @@ -2004,18 +1856,12 @@ void ScriptEditor::ensure_select_current() { edit_menu->hide(); search_menu->hide(); script_search_menu->show(); - } } - - - - - } -void ScriptEditor::_find_scripts(Node* p_base, Node* p_current, Set<Ref<Script> > &used) { - if (p_current!=p_base && p_current->get_owner()!=p_base) +void ScriptEditor::_find_scripts(Node *p_base, Node *p_current, Set<Ref<Script> > &used) { + if (p_current != p_base && p_current->get_owner() != p_base) return; if (p_current->get_script_instance()) { @@ -2024,10 +1870,9 @@ void ScriptEditor::_find_scripts(Node* p_base, Node* p_current, Set<Ref<Script> used.insert(scr); } - for(int i=0;i<p_current->get_child_count();i++) { - _find_scripts(p_base,p_current->get_child(i),used); + for (int i = 0; i < p_current->get_child_count(); i++) { + _find_scripts(p_base, p_current->get_child(i), used); } - } struct _ScriptEditorItemData { @@ -2040,32 +1885,29 @@ struct _ScriptEditorItemData { bool used; int category; + bool operator<(const _ScriptEditorItemData &id) const { - bool operator<(const _ScriptEditorItemData& id) const { - - return category==id.category?sort_key<id.sort_key:category<id.category; + return category == id.category ? sort_key < id.sort_key : category < id.category; } - }; - void ScriptEditor::_update_script_colors() { bool script_temperature_enabled = EditorSettings::get_singleton()->get("text_editor/script_temperature_enabled"); bool highlight_current = EditorSettings::get_singleton()->get("text_editor/highlight_current_script"); int hist_size = EditorSettings::get_singleton()->get("text_editor/script_temperature_history_size"); - Color hot_color=EditorSettings::get_singleton()->get("text_editor/script_temperature_hot_color"); - Color cold_color=EditorSettings::get_singleton()->get("text_editor/script_temperature_cold_color"); + Color hot_color = EditorSettings::get_singleton()->get("text_editor/script_temperature_hot_color"); + Color cold_color = EditorSettings::get_singleton()->get("text_editor/script_temperature_cold_color"); - for(int i=0;i<script_list->get_item_count();i++) { + for (int i = 0; i < script_list->get_item_count(); i++) { int c = script_list->get_item_metadata(i); Node *n = tab_container->get_child(c); if (!n) continue; - script_list->set_item_custom_bg_color(i,Color(0,0,0,0)); + script_list->set_item_custom_bg_color(i, Color(0, 0, 0, 0)); bool current = tab_container->get_current_tab() == c; if (current && highlight_current) { @@ -2077,15 +1919,15 @@ void ScriptEditor::_update_script_colors() { continue; } - int pass=n->get_meta("__editor_pass"); + int pass = n->get_meta("__editor_pass"); int h = edit_pass - pass; - if (h>hist_size) { + if (h > hist_size) { continue; } - int non_zero_hist_size = ( hist_size == 0 ) ? 1 : hist_size; - float v = Math::ease((edit_pass-pass)/float(non_zero_hist_size),0.4); + int non_zero_hist_size = (hist_size == 0) ? 1 : hist_size; + float v = Math::ease((edit_pass - pass) / float(non_zero_hist_size), 0.4); - script_list->set_item_custom_bg_color(i,hot_color.linear_interpolate(cold_color,v)); + script_list->set_item_custom_bg_color(i, hot_color.linear_interpolate(cold_color, v)); } } } @@ -2095,22 +1937,21 @@ void ScriptEditor::_update_script_names() { if (restoring_layout) return; - waiting_update_names=false; + waiting_update_names = false; Set<Ref<Script> > used; - Node* edited = EditorNode::get_singleton()->get_edited_scene(); + Node *edited = EditorNode::get_singleton()->get_edited_scene(); if (edited) { - _find_scripts(edited,edited,used); + _find_scripts(edited, edited, used); } script_list->clear(); bool split_script_help = EditorSettings::get_singleton()->get("text_editor/group_help_pages"); - ScriptSortBy sort_by = (ScriptSortBy) (int) EditorSettings::get_singleton()->get("text_editor/sort_scripts_by"); - ScriptListName display_as = (ScriptListName) (int) EditorSettings::get_singleton()->get("text_editor/list_script_names_as"); + ScriptSortBy sort_by = (ScriptSortBy)(int)EditorSettings::get_singleton()->get("text_editor/sort_scripts_by"); + ScriptListName display_as = (ScriptListName)(int)EditorSettings::get_singleton()->get("text_editor/list_script_names_as"); Vector<_ScriptEditorItemData> sedata; - for(int i=0;i<tab_container->get_child_count();i++) { - + for (int i = 0; i < tab_container->get_child_count(); i++) { ScriptTextEditor *ste = tab_container->get_child(i)->cast_to<ScriptTextEditor>(); if (ste) { @@ -2120,39 +1961,38 @@ void ScriptEditor::_update_script_names() { String path = ste->get_edited_script()->get_path(); _ScriptEditorItemData sd; - sd.icon=icon; - sd.name=name; - sd.tooltip=path; - sd.index=i; - sd.used=used.has(ste->get_edited_script()); - sd.category=0; - + sd.icon = icon; + sd.name = name; + sd.tooltip = path; + sd.index = i; + sd.used = used.has(ste->get_edited_script()); + sd.category = 0; + switch (sort_by) { case SORT_BY_NAME: { - sd.sort_key=name.to_lower(); + sd.sort_key = name.to_lower(); } break; case SORT_BY_PATH: { - sd.sort_key=path; + sd.sort_key = path; } break; } - + switch (display_as) { case DISPLAY_NAME: { - sd.name=name; + sd.name = name; } break; case DISPLAY_DIR_AND_NAME: { if (!path.get_base_dir().get_file().empty()) { - sd.name=path.get_base_dir().get_file() + "/" + name; + sd.name = path.get_base_dir().get_file() + "/" + name; } else { - sd.name=name; + sd.name = name; } } break; case DISPLAY_FULL_PATH: { - sd.name=path; + sd.name = path; } break; } - sedata.push_back(sd); } @@ -2160,62 +2000,50 @@ void ScriptEditor::_update_script_names() { if (eh) { String name = eh->get_class_name(); - Ref<Texture> icon = get_icon("Help","EditorIcons"); - String tooltip = name+" Class Reference"; + Ref<Texture> icon = get_icon("Help", "EditorIcons"); + String tooltip = name + " Class Reference"; _ScriptEditorItemData sd; - sd.icon=icon; - sd.name=name; - sd.sort_key=name; - sd.tooltip=tooltip; - sd.index=i; - sd.used=false; - sd.category=split_script_help?1:0; + sd.icon = icon; + sd.name = name; + sd.sort_key = name; + sd.tooltip = tooltip; + sd.index = i; + sd.used = false; + sd.category = split_script_help ? 1 : 0; sedata.push_back(sd); - } - } sedata.sort(); - for(int i=0;i<sedata.size();i++) { + for (int i = 0; i < sedata.size(); i++) { - script_list->add_item(sedata[i].name,sedata[i].icon); - int index = script_list->get_item_count()-1; - script_list->set_item_tooltip(index,sedata[i].tooltip); - script_list->set_item_metadata(index,sedata[i].index); + script_list->add_item(sedata[i].name, sedata[i].icon); + int index = script_list->get_item_count() - 1; + script_list->set_item_tooltip(index, sedata[i].tooltip); + script_list->set_item_metadata(index, sedata[i].index); if (sedata[i].used) { - script_list->set_item_custom_bg_color(index,Color(88/255.0,88/255.0,60/255.0)); + script_list->set_item_custom_bg_color(index, Color(88 / 255.0, 88 / 255.0, 60 / 255.0)); } - if (tab_container->get_current_tab()==sedata[i].index) { + if (tab_container->get_current_tab() == sedata[i].index) { script_list->select(index); script_name_label->set_text(sedata[i].name); script_icon->set_texture(sedata[i].icon); - } } _update_script_colors(); - - - - } - - -void ScriptEditor::edit(const Ref<Script>& p_script) { +void ScriptEditor::edit(const Ref<Script> &p_script) { if (p_script.is_null()) return; // refuse to open built-in if scene is not loaded - - - // see if already has it bool open_dominant = EditorSettings::get_singleton()->get("text_editor/open_dominant_script_on_scene_change"); @@ -2225,33 +2053,32 @@ void ScriptEditor::edit(const Ref<Script>& p_script) { String path = EditorSettings::get_singleton()->get("external_editor/exec_path"); String flags = EditorSettings::get_singleton()->get("external_editor/exec_flags"); List<String> args; - flags=flags.strip_edges(); - if (flags!=String()) { - Vector<String> flagss = flags.split(" ",false); - for(int i=0;i<flagss.size();i++) + flags = flags.strip_edges(); + if (flags != String()) { + Vector<String> flagss = flags.split(" ", false); + for (int i = 0; i < flagss.size(); i++) args.push_back(flagss[i]); } args.push_back(Globals::get_singleton()->globalize_path(p_script->get_path())); - Error err = OS::get_singleton()->execute(path,args,false); - if (err==OK) + Error err = OS::get_singleton()->execute(path, args, false); + if (err == OK) return; WARN_PRINT("Couldn't open external text editor, using internal"); } - - for(int i=0;i<tab_container->get_child_count();i++) { + for (int i = 0; i < tab_container->get_child_count(); i++) { ScriptTextEditor *ste = tab_container->get_child(i)->cast_to<ScriptTextEditor>(); if (!ste) continue; - if (ste->get_edited_script()==p_script) { + if (ste->get_edited_script() == p_script) { if (open_dominant || !EditorNode::get_singleton()->is_changing_scene()) { - if (tab_container->get_current_tab()!=i) { + if (tab_container->get_current_tab() != i) { _go_to_tab(i); - script_list->select( script_list->find_metadata(i) ); + script_list->select(script_list->find_metadata(i)); } if (is_visible()) ste->get_text_edit()->grab_focus(); @@ -2262,141 +2089,126 @@ void ScriptEditor::edit(const Ref<Script>& p_script) { // doesn't have it, make a new one - ScriptTextEditor *ste = memnew( ScriptTextEditor ); - ste->update_editor_settings(); + ScriptTextEditor *ste = memnew(ScriptTextEditor); + ste->update_editor_settings(); ste->set_edited_script(p_script); - ste->get_text_edit()->set_tooltip_request_func(this,"_get_debug_tooltip",ste); + ste->get_text_edit()->set_tooltip_request_func(this, "_get_debug_tooltip", ste); ste->get_text_edit()->set_callhint_settings( - EditorSettings::get_singleton()->get("text_editor/put_callhint_tooltip_below_current_line"), - EditorSettings::get_singleton()->get("text_editor/callhint_tooltip_offset")); + EditorSettings::get_singleton()->get("text_editor/put_callhint_tooltip_below_current_line"), + EditorSettings::get_singleton()->get("text_editor/callhint_tooltip_offset")); ste->get_text_edit()->connect("breakpoint_toggled", this, "_breakpoint_toggled"); tab_container->add_child(ste); - _go_to_tab(tab_container->get_tab_count()-1); - - - + _go_to_tab(tab_container->get_tab_count() - 1); _update_script_names(); _save_layout(); - ste->connect("name_changed",this,"_update_script_names"); + ste->connect("name_changed", this, "_update_script_names"); //test for modification, maybe the script was not edited but was loaded _test_script_times_on_disk(p_script); _update_modified_scripts_for_external_editor(p_script); - } void ScriptEditor::save_all_scripts() { - - for(int i=0;i<tab_container->get_child_count();i++) { + for (int i = 0; i < tab_container->get_child_count(); i++) { ScriptTextEditor *ste = tab_container->get_child(i)->cast_to<ScriptTextEditor>(); if (!ste) continue; - if (trim_trailing_whitespace_on_save) { _trim_trailing_whitespace(ste->get_text_edit()); } - if (ste->get_text_edit()->get_version()==ste->get_text_edit()->get_saved_version()) + if (ste->get_text_edit()->get_version() == ste->get_text_edit()->get_saved_version()) continue; Ref<Script> script = ste->get_edited_script(); if (script.is_valid()) ste->apply_code(); - if (script->get_path()!="" && script->get_path().find("local://")==-1 &&script->get_path().find("::")==-1) { + if (script->get_path() != "" && script->get_path().find("local://") == -1 && script->get_path().find("::") == -1) { //external script, save it editor->save_resource(script); //ResourceSaver::save(script->get_path(),script); - } - } - } void ScriptEditor::apply_scripts() const { - for(int i=0;i<tab_container->get_child_count();i++) { + for (int i = 0; i < tab_container->get_child_count(); i++) { ScriptTextEditor *ste = tab_container->get_child(i)->cast_to<ScriptTextEditor>(); if (!ste) continue; ste->apply_code(); } - } void ScriptEditor::_editor_play() { debugger->start(); debug_menu->get_popup()->grab_focus(); - debug_menu->get_popup()->set_item_disabled( debug_menu->get_popup()->get_item_index(DEBUG_NEXT), true ); - debug_menu->get_popup()->set_item_disabled( debug_menu->get_popup()->get_item_index(DEBUG_STEP), true ); - debug_menu->get_popup()->set_item_disabled( debug_menu->get_popup()->get_item_index(DEBUG_BREAK), false ); - debug_menu->get_popup()->set_item_disabled( debug_menu->get_popup()->get_item_index(DEBUG_CONTINUE), true ); + debug_menu->get_popup()->set_item_disabled(debug_menu->get_popup()->get_item_index(DEBUG_NEXT), true); + debug_menu->get_popup()->set_item_disabled(debug_menu->get_popup()->get_item_index(DEBUG_STEP), true); + debug_menu->get_popup()->set_item_disabled(debug_menu->get_popup()->get_item_index(DEBUG_BREAK), false); + debug_menu->get_popup()->set_item_disabled(debug_menu->get_popup()->get_item_index(DEBUG_CONTINUE), true); - //debugger_gui->start_listening(Globals::get_singleton()->get("debug/debug_port")); + //debugger_gui->start_listening(Globals::get_singleton()->get("debug/debug_port")); } void ScriptEditor::_editor_pause() { - - } void ScriptEditor::_editor_stop() { debugger->stop(); - debug_menu->get_popup()->set_item_disabled( debug_menu->get_popup()->get_item_index(DEBUG_NEXT), true ); - debug_menu->get_popup()->set_item_disabled( debug_menu->get_popup()->get_item_index(DEBUG_STEP), true ); - debug_menu->get_popup()->set_item_disabled( debug_menu->get_popup()->get_item_index(DEBUG_BREAK), true ); - debug_menu->get_popup()->set_item_disabled( debug_menu->get_popup()->get_item_index(DEBUG_CONTINUE), true ); + debug_menu->get_popup()->set_item_disabled(debug_menu->get_popup()->get_item_index(DEBUG_NEXT), true); + debug_menu->get_popup()->set_item_disabled(debug_menu->get_popup()->get_item_index(DEBUG_STEP), true); + debug_menu->get_popup()->set_item_disabled(debug_menu->get_popup()->get_item_index(DEBUG_BREAK), true); + debug_menu->get_popup()->set_item_disabled(debug_menu->get_popup()->get_item_index(DEBUG_CONTINUE), true); } - -void ScriptEditor::_add_callback(Object *p_obj, const String& p_function, const StringArray& p_args) { +void ScriptEditor::_add_callback(Object *p_obj, const String &p_function, const StringArray &p_args) { //print_line("add callback! hohoho"); kinda sad to remove this ERR_FAIL_COND(!p_obj); Ref<Script> script = p_obj->get_script(); - ERR_FAIL_COND( !script.is_valid() ); + ERR_FAIL_COND(!script.is_valid()); editor->push_item(script.ptr()); - for(int i=0;i<tab_container->get_child_count();i++) { + for (int i = 0; i < tab_container->get_child_count(); i++) { ScriptTextEditor *ste = tab_container->get_child(i)->cast_to<ScriptTextEditor>(); if (!ste) continue; - if (ste->get_edited_script()!=script) + if (ste->get_edited_script() != script) continue; String code = ste->get_text_edit()->get_text(); - int pos = script->get_language()->find_function(p_function,code); - if (pos==-1) { + int pos = script->get_language()->find_function(p_function, code); + if (pos == -1) { //does not exist ste->get_text_edit()->deselect(); - pos=ste->get_text_edit()->get_line_count()+2; - String func = script->get_language()->make_function("",p_function,p_args); + pos = ste->get_text_edit()->get_line_count() + 2; + String func = script->get_language()->make_function("", p_function, p_args); //code=code+func; - ste->get_text_edit()->cursor_set_line(pos+1); + ste->get_text_edit()->cursor_set_line(pos + 1); ste->get_text_edit()->cursor_set_column(1000000); //none shall be that big - ste->get_text_edit()->insert_text_at_cursor("\n\n"+func); + ste->get_text_edit()->insert_text_at_cursor("\n\n" + func); } _go_to_tab(i); ste->get_text_edit()->cursor_set_line(pos); ste->get_text_edit()->cursor_set_column(1); - script_list->select( script_list->find_metadata(i) ); + script_list->select(script_list->find_metadata(i)); break; - } - } void ScriptEditor::_save_layout() { @@ -2412,7 +2224,7 @@ void ScriptEditor::_editor_settings_changed() { trim_trailing_whitespace_on_save = EditorSettings::get_singleton()->get("text_editor/trim_trailing_whitespace_on_save"); float autosave_time = EditorSettings::get_singleton()->get("text_editor/autosave_interval_secs"); - if (autosave_time>0) { + if (autosave_time > 0) { autosave_timer->set_wait_time(autosave_time); autosave_timer->start(); } else { @@ -2426,19 +2238,18 @@ void ScriptEditor::_editor_settings_changed() { EditorSettings::get_singleton()->load_text_editor_theme(); } - for(int i=0;i<tab_container->get_child_count();i++) { + for (int i = 0; i < tab_container->get_child_count(); i++) { ScriptTextEditor *ste = tab_container->get_child(i)->cast_to<ScriptTextEditor>(); if (!ste) continue; - ste->update_editor_settings(); + ste->update_editor_settings(); } _update_script_colors(); _update_script_names(); - ScriptServer::set_reload_scripts_on_save(EDITOR_DEF("text_editor/auto_reload_and_parse_scripts_on_save",true)); - + ScriptServer::set_reload_scripts_on_save(EDITOR_DEF("text_editor/auto_reload_and_parse_scripts_on_save", true)); } void ScriptEditor::_autosave_scripts() { @@ -2451,7 +2262,7 @@ void ScriptEditor::_tree_changed() { if (waiting_update_names) return; - waiting_update_names=true; + waiting_update_names = true; call_deferred("_update_script_names"); } @@ -2460,7 +2271,7 @@ void ScriptEditor::_script_split_dragged(float) { _save_layout(); } -void ScriptEditor::_unhandled_input(const InputEvent& p_event) { +void ScriptEditor::_unhandled_input(const InputEvent &p_event) { if (p_event.key.pressed || !is_visible()) return; if (ED_IS_SHORTCUT("script_editor/next_script", p_event)) { int next_tab = script_list->get_current() + 1; @@ -2478,21 +2289,21 @@ void ScriptEditor::_unhandled_input(const InputEvent& p_event) { void ScriptEditor::set_window_layout(Ref<ConfigFile> p_layout) { - if (!bool(EDITOR_DEF("text_editor/restore_scripts_on_load",true))) { + if (!bool(EDITOR_DEF("text_editor/restore_scripts_on_load", true))) { return; } - if (!p_layout->has_section_key("ScriptEditor","open_scripts") && !p_layout->has_section_key("ScriptEditor","open_help")) + if (!p_layout->has_section_key("ScriptEditor", "open_scripts") && !p_layout->has_section_key("ScriptEditor", "open_help")) return; - Array scripts = p_layout->get_value("ScriptEditor","open_scripts"); + Array scripts = p_layout->get_value("ScriptEditor", "open_scripts"); Array helps; - if (p_layout->has_section_key("ScriptEditor","open_help")) - helps=p_layout->get_value("ScriptEditor","open_help"); + if (p_layout->has_section_key("ScriptEditor", "open_help")) + helps = p_layout->get_value("ScriptEditor", "open_help"); - restoring_layout=true; + restoring_layout = true; - for(int i=0;i<scripts.size();i++) { + for (int i = 0; i < scripts.size(); i++) { String path = scripts[i]; if (!FileAccess::exists(path)) @@ -2503,22 +2314,21 @@ void ScriptEditor::set_window_layout(Ref<ConfigFile> p_layout) { } } - for(int i=0;i<helps.size();i++) { + for (int i = 0; i < helps.size(); i++) { String path = helps[i]; _help_class_open(path); } - for(int i=0;i<tab_container->get_child_count();i++) { - tab_container->get_child(i)->set_meta("__editor_pass",Variant()); + for (int i = 0; i < tab_container->get_child_count(); i++) { + tab_container->get_child(i)->set_meta("__editor_pass", Variant()); } - - if (p_layout->has_section_key("ScriptEditor","split_offset")) { - script_split->set_split_offset(p_layout->get_value("ScriptEditor","split_offset")); + if (p_layout->has_section_key("ScriptEditor", "split_offset")) { + script_split->set_split_offset(p_layout->get_value("ScriptEditor", "split_offset")); } - restoring_layout=false; + restoring_layout = false; _update_script_names(); } @@ -2528,7 +2338,7 @@ void ScriptEditor::get_window_layout(Ref<ConfigFile> p_layout) { Array scripts; Array helps; - for(int i=0;i<tab_container->get_child_count();i++) { + for (int i = 0; i < tab_container->get_child_count(); i++) { ScriptTextEditor *ste = tab_container->get_child(i)->cast_to<ScriptTextEditor>(); if (ste) { @@ -2546,24 +2356,20 @@ void ScriptEditor::get_window_layout(Ref<ConfigFile> p_layout) { helps.push_back(eh->get_class_name()); } - - } - p_layout->set_value("ScriptEditor","open_scripts",scripts); - p_layout->set_value("ScriptEditor","open_help",helps); - p_layout->set_value("ScriptEditor","split_offset",script_split->get_split_offset()); + p_layout->set_value("ScriptEditor", "open_scripts", scripts); + p_layout->set_value("ScriptEditor", "open_help", helps); + p_layout->set_value("ScriptEditor", "split_offset", script_split->get_split_offset()); } +void ScriptEditor::_help_class_open(const String &p_class) { -void ScriptEditor::_help_class_open(const String& p_class) { - - - for(int i=0;i<tab_container->get_child_count();i++) { + for (int i = 0; i < tab_container->get_child_count(); i++) { EditorHelp *eh = tab_container->get_child(i)->cast_to<EditorHelp>(); - if (eh && eh->get_class_name()==p_class) { + if (eh && eh->get_class_name() == p_class) { _go_to_tab(i); _update_script_names(); @@ -2571,28 +2377,26 @@ void ScriptEditor::_help_class_open(const String& p_class) { } } - EditorHelp * eh = memnew( EditorHelp ); - + EditorHelp *eh = memnew(EditorHelp); eh->set_name(p_class); tab_container->add_child(eh); - _go_to_tab(tab_container->get_tab_count()-1); - eh->go_to_class(p_class,0); - eh->connect("go_to_help",this,"_help_class_goto"); + _go_to_tab(tab_container->get_tab_count() - 1); + eh->go_to_class(p_class, 0); + eh->connect("go_to_help", this, "_help_class_goto"); _update_script_names(); _save_layout(); } -void ScriptEditor::_help_class_goto(const String& p_desc) { +void ScriptEditor::_help_class_goto(const String &p_desc) { + String cname = p_desc.get_slice(":", 1); - String cname=p_desc.get_slice(":",1); - - for(int i=0;i<tab_container->get_child_count();i++) { + for (int i = 0; i < tab_container->get_child_count(); i++) { EditorHelp *eh = tab_container->get_child(i)->cast_to<EditorHelp>(); - if (eh && eh->get_class_name()==cname) { + if (eh && eh->get_class_name() == cname) { _go_to_tab(i); eh->go_to_help(p_desc); @@ -2601,13 +2405,13 @@ void ScriptEditor::_help_class_goto(const String& p_desc) { } } - EditorHelp * eh = memnew( EditorHelp ); + EditorHelp *eh = memnew(EditorHelp); eh->set_name(cname); tab_container->add_child(eh); - _go_to_tab(tab_container->get_tab_count()-1); + _go_to_tab(tab_container->get_tab_count() - 1); eh->go_to_help(p_desc); - eh->connect("go_to_help",this,"_help_class_goto"); + eh->connect("go_to_help", this, "_help_class_goto"); _update_script_names(); _save_layout(); } @@ -2618,16 +2422,16 @@ void ScriptEditor::_update_history_pos(int p_new_pos) { if (n->cast_to<ScriptTextEditor>()) { - history[history_pos].scroll_pos=n->cast_to<ScriptTextEditor>()->get_text_edit()->get_v_scroll(); - history[history_pos].cursor_column=n->cast_to<ScriptTextEditor>()->get_text_edit()->cursor_get_column(); - history[history_pos].cursor_row=n->cast_to<ScriptTextEditor>()->get_text_edit()->cursor_get_line(); + history[history_pos].scroll_pos = n->cast_to<ScriptTextEditor>()->get_text_edit()->get_v_scroll(); + history[history_pos].cursor_column = n->cast_to<ScriptTextEditor>()->get_text_edit()->cursor_get_column(); + history[history_pos].cursor_row = n->cast_to<ScriptTextEditor>()->get_text_edit()->cursor_get_line(); } if (n->cast_to<EditorHelp>()) { - history[history_pos].scroll_pos=n->cast_to<EditorHelp>()->get_scroll(); + history[history_pos].scroll_pos = n->cast_to<EditorHelp>()->get_scroll(); } - history_pos=p_new_pos; + history_pos = p_new_pos; tab_container->set_current_tab(history[history_pos].control->get_index()); n = history[history_pos].control; @@ -2635,8 +2439,8 @@ void ScriptEditor::_update_history_pos(int p_new_pos) { if (n->cast_to<ScriptTextEditor>()) { n->cast_to<ScriptTextEditor>()->get_text_edit()->set_v_scroll(history[history_pos].scroll_pos); - n->cast_to<ScriptTextEditor>()->get_text_edit()->cursor_set_column( history[history_pos].cursor_column ); - n->cast_to<ScriptTextEditor>()->get_text_edit()->cursor_set_line( history[history_pos].cursor_row ); + n->cast_to<ScriptTextEditor>()->get_text_edit()->cursor_set_column(history[history_pos].cursor_column); + n->cast_to<ScriptTextEditor>()->get_text_edit()->cursor_set_line(history[history_pos].cursor_row); n->cast_to<ScriptTextEditor>()->get_text_edit()->grab_focus(); } @@ -2646,27 +2450,25 @@ void ScriptEditor::_update_history_pos(int p_new_pos) { n->cast_to<EditorHelp>()->set_focused(); } - n->set_meta("__editor_pass",++edit_pass); + n->set_meta("__editor_pass", ++edit_pass); _update_script_names(); _update_history_arrows(); - } void ScriptEditor::_history_forward() { - if (history_pos<history.size()-1) { - _update_history_pos(history_pos+1); + if (history_pos < history.size() - 1) { + _update_history_pos(history_pos + 1); } } -void ScriptEditor::_history_back(){ +void ScriptEditor::_history_back() { - if (history_pos>0) { - _update_history_pos(history_pos-1); + if (history_pos > 0) { + _update_history_pos(history_pos - 1); } - } -void ScriptEditor::set_scene_root_script( Ref<Script> p_script ) { +void ScriptEditor::set_scene_root_script(Ref<Script> p_script) { bool open_dominant = EditorSettings::get_singleton()->get("text_editor/open_dominant_script_on_scene_change"); @@ -2678,44 +2480,44 @@ void ScriptEditor::set_scene_root_script( Ref<Script> p_script ) { } } -bool ScriptEditor::script_go_to_method(Ref<Script> p_script, const String& p_method) { +bool ScriptEditor::script_go_to_method(Ref<Script> p_script, const String &p_method) { Vector<String> functions; - bool found=false; + bool found = false; - for (int i=0;i<tab_container->get_child_count();i++) { + for (int i = 0; i < tab_container->get_child_count(); i++) { ScriptTextEditor *current = tab_container->get_child(i)->cast_to<ScriptTextEditor>(); - if (current && current->get_edited_script()==p_script) { - functions=current->get_functions(); - found=true; + if (current && current->get_edited_script() == p_script) { + functions = current->get_functions(); + found = true; break; } } if (!found) { String errortxt; - int line=-1,col; - String text=p_script->get_source_code(); + int line = -1, col; + String text = p_script->get_source_code(); List<String> fnc; - if (p_script->get_language()->validate(text,line,col,errortxt,p_script->get_path(),&fnc)) { + if (p_script->get_language()->validate(text, line, col, errortxt, p_script->get_path(), &fnc)) { - for (List<String>::Element *E=fnc.front();E;E=E->next()) + for (List<String>::Element *E = fnc.front(); E; E = E->next()) functions.push_back(E->get()); } } String method_search = p_method + ":"; - for (int i=0;i<functions.size();i++) { - String function=functions[i]; + for (int i = 0; i < functions.size(); i++) { + String function = functions[i]; if (function.begins_with(method_search)) { edit(p_script); - int line=function.get_slice(":",1).to_int(); - _goto_script_line2(line-1); + int line = function.get_slice(":", 1).to_int(); + _goto_script_line2(line - 1); return true; } } @@ -2725,93 +2527,90 @@ bool ScriptEditor::script_go_to_method(Ref<Script> p_script, const String& p_met void ScriptEditor::set_live_auto_reload_running_scripts(bool p_enabled) { - auto_reload_running_scripts=p_enabled; + auto_reload_running_scripts = p_enabled; } void ScriptEditor::_bind_methods() { - ObjectTypeDB::bind_method("_file_dialog_action",&ScriptEditor::_file_dialog_action); - ObjectTypeDB::bind_method("_tab_changed",&ScriptEditor::_tab_changed); - ObjectTypeDB::bind_method("_menu_option",&ScriptEditor::_menu_option); - ObjectTypeDB::bind_method("_close_current_tab",&ScriptEditor::_close_current_tab); + ObjectTypeDB::bind_method("_file_dialog_action", &ScriptEditor::_file_dialog_action); + ObjectTypeDB::bind_method("_tab_changed", &ScriptEditor::_tab_changed); + ObjectTypeDB::bind_method("_menu_option", &ScriptEditor::_menu_option); + ObjectTypeDB::bind_method("_close_current_tab", &ScriptEditor::_close_current_tab); ObjectTypeDB::bind_method("_close_docs_tab", &ScriptEditor::_close_docs_tab); - ObjectTypeDB::bind_method("_editor_play",&ScriptEditor::_editor_play); - ObjectTypeDB::bind_method("_editor_pause",&ScriptEditor::_editor_pause); - ObjectTypeDB::bind_method("_editor_stop",&ScriptEditor::_editor_stop); - ObjectTypeDB::bind_method("_add_callback",&ScriptEditor::_add_callback); - ObjectTypeDB::bind_method("_reload_scripts",&ScriptEditor::_reload_scripts); - ObjectTypeDB::bind_method("_resave_scripts",&ScriptEditor::_resave_scripts); - ObjectTypeDB::bind_method("_res_saved_callback",&ScriptEditor::_res_saved_callback); - ObjectTypeDB::bind_method("_goto_script_line",&ScriptEditor::_goto_script_line); - ObjectTypeDB::bind_method("_goto_script_line2",&ScriptEditor::_goto_script_line2); + ObjectTypeDB::bind_method("_editor_play", &ScriptEditor::_editor_play); + ObjectTypeDB::bind_method("_editor_pause", &ScriptEditor::_editor_pause); + ObjectTypeDB::bind_method("_editor_stop", &ScriptEditor::_editor_stop); + ObjectTypeDB::bind_method("_add_callback", &ScriptEditor::_add_callback); + ObjectTypeDB::bind_method("_reload_scripts", &ScriptEditor::_reload_scripts); + ObjectTypeDB::bind_method("_resave_scripts", &ScriptEditor::_resave_scripts); + ObjectTypeDB::bind_method("_res_saved_callback", &ScriptEditor::_res_saved_callback); + ObjectTypeDB::bind_method("_goto_script_line", &ScriptEditor::_goto_script_line); + ObjectTypeDB::bind_method("_goto_script_line2", &ScriptEditor::_goto_script_line2); ObjectTypeDB::bind_method("_breakpoint_toggled", &ScriptEditor::_breakpoint_toggled); - ObjectTypeDB::bind_method("_breaked",&ScriptEditor::_breaked); - ObjectTypeDB::bind_method("_show_debugger",&ScriptEditor::_show_debugger); - ObjectTypeDB::bind_method("_get_debug_tooltip",&ScriptEditor::_get_debug_tooltip); - ObjectTypeDB::bind_method("_autosave_scripts",&ScriptEditor::_autosave_scripts); - ObjectTypeDB::bind_method("_editor_settings_changed",&ScriptEditor::_editor_settings_changed); - ObjectTypeDB::bind_method("_update_script_names",&ScriptEditor::_update_script_names); - ObjectTypeDB::bind_method("_tree_changed",&ScriptEditor::_tree_changed); - ObjectTypeDB::bind_method("_script_selected",&ScriptEditor::_script_selected); - ObjectTypeDB::bind_method("_script_created",&ScriptEditor::_script_created); - ObjectTypeDB::bind_method("_script_split_dragged",&ScriptEditor::_script_split_dragged); - ObjectTypeDB::bind_method("_help_class_open",&ScriptEditor::_help_class_open); - ObjectTypeDB::bind_method("_help_class_goto",&ScriptEditor::_help_class_goto); - ObjectTypeDB::bind_method("_request_help",&ScriptEditor::_help_class_open); - ObjectTypeDB::bind_method("_history_forward",&ScriptEditor::_history_forward); - ObjectTypeDB::bind_method("_history_back",&ScriptEditor::_history_back); - ObjectTypeDB::bind_method("_live_auto_reload_running_scripts",&ScriptEditor::_live_auto_reload_running_scripts); - ObjectTypeDB::bind_method("_unhandled_input",&ScriptEditor::_unhandled_input); - + ObjectTypeDB::bind_method("_breaked", &ScriptEditor::_breaked); + ObjectTypeDB::bind_method("_show_debugger", &ScriptEditor::_show_debugger); + ObjectTypeDB::bind_method("_get_debug_tooltip", &ScriptEditor::_get_debug_tooltip); + ObjectTypeDB::bind_method("_autosave_scripts", &ScriptEditor::_autosave_scripts); + ObjectTypeDB::bind_method("_editor_settings_changed", &ScriptEditor::_editor_settings_changed); + ObjectTypeDB::bind_method("_update_script_names", &ScriptEditor::_update_script_names); + ObjectTypeDB::bind_method("_tree_changed", &ScriptEditor::_tree_changed); + ObjectTypeDB::bind_method("_script_selected", &ScriptEditor::_script_selected); + ObjectTypeDB::bind_method("_script_created", &ScriptEditor::_script_created); + ObjectTypeDB::bind_method("_script_split_dragged", &ScriptEditor::_script_split_dragged); + ObjectTypeDB::bind_method("_help_class_open", &ScriptEditor::_help_class_open); + ObjectTypeDB::bind_method("_help_class_goto", &ScriptEditor::_help_class_goto); + ObjectTypeDB::bind_method("_request_help", &ScriptEditor::_help_class_open); + ObjectTypeDB::bind_method("_history_forward", &ScriptEditor::_history_forward); + ObjectTypeDB::bind_method("_history_back", &ScriptEditor::_history_back); + ObjectTypeDB::bind_method("_live_auto_reload_running_scripts", &ScriptEditor::_live_auto_reload_running_scripts); + ObjectTypeDB::bind_method("_unhandled_input", &ScriptEditor::_unhandled_input); } ScriptEditor::ScriptEditor(EditorNode *p_editor) { current_theme = ""; - completion_cache = memnew( EditorScriptCodeCompletionCache ); - restoring_layout=false; - waiting_update_names=false; - pending_auto_reload=false; - auto_reload_running_scripts=false; - editor=p_editor; + completion_cache = memnew(EditorScriptCodeCompletionCache); + restoring_layout = false; + waiting_update_names = false; + pending_auto_reload = false; + auto_reload_running_scripts = false; + editor = p_editor; - menu_hb = memnew( HBoxContainer ); + menu_hb = memnew(HBoxContainer); add_child(menu_hb); - - script_split = memnew( HSplitContainer ); + script_split = memnew(HSplitContainer); add_child(script_split); script_split->set_v_size_flags(SIZE_EXPAND_FILL); - script_list = memnew( ItemList ); + script_list = memnew(ItemList); script_split->add_child(script_list); - script_list->set_custom_minimum_size(Size2(0,0)); + script_list->set_custom_minimum_size(Size2(0, 0)); script_split->set_split_offset(140); - tab_container = memnew( TabContainer ); + tab_container = memnew(TabContainer); tab_container->set_tabs_visible(false); script_split->add_child(tab_container); - tab_container->set_h_size_flags(SIZE_EXPAND_FILL); ED_SHORTCUT("script_editor/next_script", TTR("Next script"), KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_GREATER); ED_SHORTCUT("script_editor/prev_script", TTR("Previous script"), KEY_MASK_CMD | KEY_LESS); set_process_unhandled_input(true); - file_menu = memnew( MenuButton ); + file_menu = memnew(MenuButton); menu_hb->add_child(file_menu); file_menu->set_text(TTR("File")); file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/new", TTR("New")), FILE_NEW); file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/open", TTR("Open")), FILE_OPEN); file_menu->get_popup()->add_separator(); - file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/save", TTR("Save"), KEY_MASK_ALT|KEY_MASK_CMD|KEY_S), FILE_SAVE); + file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/save", TTR("Save"), KEY_MASK_ALT | KEY_MASK_CMD | KEY_S), FILE_SAVE); file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/save_as", TTR("Save As..")), FILE_SAVE_AS); - file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/save_all", TTR("Save All"), KEY_MASK_CMD|KEY_MASK_SHIFT|KEY_MASK_ALT|KEY_S), FILE_SAVE_ALL); + file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/save_all", TTR("Save All"), KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_MASK_ALT | KEY_S), FILE_SAVE_ALL); file_menu->get_popup()->add_separator(); - file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/history_previous", TTR("History Prev"), KEY_MASK_CTRL|KEY_MASK_ALT|KEY_LEFT), WINDOW_PREV); - file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/history_next", TTR("History Next"), KEY_MASK_CTRL|KEY_MASK_ALT|KEY_RIGHT), WINDOW_NEXT); + file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/history_previous", TTR("History Prev"), KEY_MASK_CTRL | KEY_MASK_ALT | KEY_LEFT), WINDOW_PREV); + file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/history_next", TTR("History Next"), KEY_MASK_CTRL | KEY_MASK_ALT | KEY_RIGHT), WINDOW_NEXT); file_menu->get_popup()->add_separator(); file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/import_theme", TTR("Import Theme")), FILE_IMPORT_THEME); file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/reload_theme", TTR("Reload Theme")), FILE_RELOAD_THEME); @@ -2820,67 +2619,65 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) { file_menu->get_popup()->add_separator(); file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/close_docs", TTR("Close Docs")), CLOSE_DOCS); file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/close_file", TTR("Close"), KEY_MASK_CMD | KEY_W), FILE_CLOSE); - file_menu->get_popup()->connect("item_pressed", this,"_menu_option"); + file_menu->get_popup()->connect("item_pressed", this, "_menu_option"); - edit_menu = memnew( MenuButton ); + edit_menu = memnew(MenuButton); menu_hb->add_child(edit_menu); edit_menu->set_text(TTR("Edit")); - edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/undo", TTR("Undo"), KEY_MASK_CMD|KEY_Z), EDIT_UNDO); - edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/redo", TTR("Redo"), KEY_MASK_CMD|KEY_Y), EDIT_REDO); + edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/undo", TTR("Undo"), KEY_MASK_CMD | KEY_Z), EDIT_UNDO); + edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/redo", TTR("Redo"), KEY_MASK_CMD | KEY_Y), EDIT_REDO); edit_menu->get_popup()->add_separator(); - edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/cut", TTR("Cut"), KEY_MASK_CMD|KEY_X), EDIT_CUT); - edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/copy", TTR("Copy"), KEY_MASK_CMD|KEY_C), EDIT_COPY); - edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/paste", TTR("Paste"), KEY_MASK_CMD|KEY_V), EDIT_PASTE); + edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/cut", TTR("Cut"), KEY_MASK_CMD | KEY_X), EDIT_CUT); + edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/copy", TTR("Copy"), KEY_MASK_CMD | KEY_C), EDIT_COPY); + edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/paste", TTR("Paste"), KEY_MASK_CMD | KEY_V), EDIT_PASTE); edit_menu->get_popup()->add_separator(); - edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/select_all", TTR("Select All"), KEY_MASK_CMD|KEY_A), EDIT_SELECT_ALL); + edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/select_all", TTR("Select All"), KEY_MASK_CMD | KEY_A), EDIT_SELECT_ALL); edit_menu->get_popup()->add_separator(); - edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/move_up", TTR("Move Up"), KEY_MASK_ALT|KEY_UP), EDIT_MOVE_LINE_UP); - edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/move_down", TTR("Move Down"), KEY_MASK_ALT|KEY_DOWN), EDIT_MOVE_LINE_DOWN); - edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/indent_left", TTR("Indent Left"), KEY_MASK_ALT|KEY_LEFT), EDIT_INDENT_LEFT); - edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/indent_right", TTR("Indent Right"), KEY_MASK_ALT|KEY_RIGHT), EDIT_INDENT_RIGHT); - edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/toggle_comment", TTR("Toggle Comment"), KEY_MASK_CMD|KEY_K), EDIT_TOGGLE_COMMENT); - edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/clone_down", TTR("Clone Down"), KEY_MASK_CMD|KEY_B), EDIT_CLONE_DOWN); + edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/move_up", TTR("Move Up"), KEY_MASK_ALT | KEY_UP), EDIT_MOVE_LINE_UP); + edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/move_down", TTR("Move Down"), KEY_MASK_ALT | KEY_DOWN), EDIT_MOVE_LINE_DOWN); + edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/indent_left", TTR("Indent Left"), KEY_MASK_ALT | KEY_LEFT), EDIT_INDENT_LEFT); + edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/indent_right", TTR("Indent Right"), KEY_MASK_ALT | KEY_RIGHT), EDIT_INDENT_RIGHT); + edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/toggle_comment", TTR("Toggle Comment"), KEY_MASK_CMD | KEY_K), EDIT_TOGGLE_COMMENT); + edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/clone_down", TTR("Clone Down"), KEY_MASK_CMD | KEY_B), EDIT_CLONE_DOWN); edit_menu->get_popup()->add_separator(); #ifdef OSX_ENABLED - edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/complete_symbol", TTR("Complete Symbol"), KEY_MASK_CTRL|KEY_SPACE), EDIT_COMPLETE); + edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/complete_symbol", TTR("Complete Symbol"), KEY_MASK_CTRL | KEY_SPACE), EDIT_COMPLETE); #else - edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/complete_symbol", TTR("Complete Symbol"), KEY_MASK_CMD|KEY_SPACE), EDIT_COMPLETE); + edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/complete_symbol", TTR("Complete Symbol"), KEY_MASK_CMD | KEY_SPACE), EDIT_COMPLETE); #endif - edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/trim_trailing_whitespace", TTR("Trim Trailing Whitespace"), KEY_MASK_CTRL|KEY_MASK_ALT|KEY_T), EDIT_TRIM_TRAILING_WHITESAPCE); - edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/auto_indent", TTR("Auto Indent"), KEY_MASK_CMD|KEY_I), EDIT_AUTO_INDENT); - edit_menu->get_popup()->connect("item_pressed", this,"_menu_option"); + edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/trim_trailing_whitespace", TTR("Trim Trailing Whitespace"), KEY_MASK_CTRL | KEY_MASK_ALT | KEY_T), EDIT_TRIM_TRAILING_WHITESAPCE); + edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/auto_indent", TTR("Auto Indent"), KEY_MASK_CMD | KEY_I), EDIT_AUTO_INDENT); + edit_menu->get_popup()->connect("item_pressed", this, "_menu_option"); edit_menu->get_popup()->add_separator(); - edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/reload_script_soft", TTR("Soft Reload Script"), KEY_MASK_CMD|KEY_MASK_SHIFT|KEY_R), FILE_TOOL_RELOAD_SOFT); - + edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/reload_script_soft", TTR("Soft Reload Script"), KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_R), FILE_TOOL_RELOAD_SOFT); - search_menu = memnew( MenuButton ); + search_menu = memnew(MenuButton); menu_hb->add_child(search_menu); search_menu->set_text(TTR("Search")); - search_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/find", TTR("Find.."), KEY_MASK_CMD|KEY_F), SEARCH_FIND); + search_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/find", TTR("Find.."), KEY_MASK_CMD | KEY_F), SEARCH_FIND); search_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/find_next", TTR("Find Next"), KEY_F3), SEARCH_FIND_NEXT); - search_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/find_previous", TTR("Find Previous"), KEY_MASK_SHIFT|KEY_F3), SEARCH_FIND_PREV); - search_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/replace", TTR("Replace.."), KEY_MASK_CMD|KEY_R), SEARCH_REPLACE); + search_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/find_previous", TTR("Find Previous"), KEY_MASK_SHIFT | KEY_F3), SEARCH_FIND_PREV); + search_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/replace", TTR("Replace.."), KEY_MASK_CMD | KEY_R), SEARCH_REPLACE); search_menu->get_popup()->add_separator(); - search_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/goto_function", TTR("Goto Function.."), KEY_MASK_SHIFT|KEY_MASK_CMD|KEY_F), SEARCH_LOCATE_FUNCTION); - search_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/goto_line", TTR("Goto Line.."), KEY_MASK_CMD|KEY_L), SEARCH_GOTO_LINE); - search_menu->get_popup()->connect("item_pressed", this,"_menu_option"); + search_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/goto_function", TTR("Goto Function.."), KEY_MASK_SHIFT | KEY_MASK_CMD | KEY_F), SEARCH_LOCATE_FUNCTION); + search_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/goto_line", TTR("Goto Line.."), KEY_MASK_CMD | KEY_L), SEARCH_GOTO_LINE); + search_menu->get_popup()->connect("item_pressed", this, "_menu_option"); - script_search_menu = memnew( MenuButton ); + script_search_menu = memnew(MenuButton); menu_hb->add_child(script_search_menu); script_search_menu->set_text(TTR("Search")); - script_search_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/find", TTR("Find.."), KEY_MASK_CMD|KEY_F), SEARCH_FIND); + script_search_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/find", TTR("Find.."), KEY_MASK_CMD | KEY_F), SEARCH_FIND); script_search_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/find_next", TTR("Find Next"), KEY_F3), SEARCH_FIND_NEXT); - script_search_menu->get_popup()->connect("item_pressed", this,"_menu_option"); + script_search_menu->get_popup()->connect("item_pressed", this, "_menu_option"); script_search_menu->hide(); - - debug_menu = memnew( MenuButton ); + debug_menu = memnew(MenuButton); menu_hb->add_child(debug_menu); debug_menu->set_text(TTR("Debug")); debug_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/toggle_breakpoint", TTR("Toggle Breakpoint"), KEY_F9), DEBUG_TOGGLE_BREAKPOINT); - debug_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/remove_all_breakpoints", TTR("Remove All Breakpoints"), KEY_MASK_CTRL|KEY_MASK_SHIFT|KEY_F9), DEBUG_REMOVE_ALL_BREAKPOINTS); - debug_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/goto_next_breakpoint", TTR("Goto Next Breakpoint"), KEY_MASK_CTRL|KEY_PERIOD), DEBUG_GOTO_NEXT_BREAKPOINT); - debug_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/goto_previous_breakpoint", TTR("Goto Previous Breakpoint"), KEY_MASK_CTRL|KEY_COMMA), DEBUG_GOTO_PREV_BREAKPOINT); + debug_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/remove_all_breakpoints", TTR("Remove All Breakpoints"), KEY_MASK_CTRL | KEY_MASK_SHIFT | KEY_F9), DEBUG_REMOVE_ALL_BREAKPOINTS); + debug_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/goto_next_breakpoint", TTR("Goto Next Breakpoint"), KEY_MASK_CTRL | KEY_PERIOD), DEBUG_GOTO_NEXT_BREAKPOINT); + debug_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/goto_previous_breakpoint", TTR("Goto Previous Breakpoint"), KEY_MASK_CTRL | KEY_COMMA), DEBUG_GOTO_PREV_BREAKPOINT); debug_menu->get_popup()->add_separator(); debug_menu->get_popup()->add_shortcut(ED_SHORTCUT("debugger/step_over", TTR("Step Over"), KEY_F10), DEBUG_NEXT); debug_menu->get_popup()->add_shortcut(ED_SHORTCUT("debugger/step_into", TTR("Step Into"), KEY_F11), DEBUG_STEP); @@ -2890,13 +2687,12 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) { debug_menu->get_popup()->add_separator(); //debug_menu->get_popup()->add_check_item("Show Debugger",DEBUG_SHOW); debug_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("debugger/keep_debugger_open", TTR("Keep Debugger Open")), DEBUG_SHOW_KEEP_OPEN); - debug_menu->get_popup()->connect("item_pressed", this,"_menu_option"); - - debug_menu->get_popup()->set_item_disabled( debug_menu->get_popup()->get_item_index(DEBUG_NEXT), true); - debug_menu->get_popup()->set_item_disabled( debug_menu->get_popup()->get_item_index(DEBUG_STEP), true ); - debug_menu->get_popup()->set_item_disabled( debug_menu->get_popup()->get_item_index(DEBUG_BREAK), true ); - debug_menu->get_popup()->set_item_disabled( debug_menu->get_popup()->get_item_index(DEBUG_CONTINUE), true ); + debug_menu->get_popup()->connect("item_pressed", this, "_menu_option"); + debug_menu->get_popup()->set_item_disabled(debug_menu->get_popup()->get_item_index(DEBUG_NEXT), true); + debug_menu->get_popup()->set_item_disabled(debug_menu->get_popup()->get_item_index(DEBUG_STEP), true); + debug_menu->get_popup()->set_item_disabled(debug_menu->get_popup()->get_item_index(DEBUG_BREAK), true); + debug_menu->get_popup()->set_item_disabled(debug_menu->get_popup()->get_item_index(DEBUG_CONTINUE), true); #if 0 window_menu = memnew( MenuButton ); @@ -2911,18 +2707,17 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) { #endif - help_menu = memnew( MenuButton ); + help_menu = memnew(MenuButton); menu_hb->add_child(help_menu); help_menu->set_text(TTR("Help")); - help_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/Contextual", TTR("Contextual Help"), KEY_MASK_SHIFT|KEY_F1), HELP_CONTEXTUAL); - help_menu->get_popup()->connect("item_pressed", this,"_menu_option"); + help_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/Contextual", TTR("Contextual Help"), KEY_MASK_SHIFT | KEY_F1), HELP_CONTEXTUAL); + help_menu->get_popup()->connect("item_pressed", this, "_menu_option"); menu_hb->add_spacer(); - - script_icon = memnew( TextureFrame ); + script_icon = memnew(TextureFrame); menu_hb->add_child(script_icon); - script_name_label = memnew( Label ); + script_name_label = memnew(Label); menu_hb->add_child(script_name_label); script_icon->hide(); @@ -2930,45 +2725,43 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) { menu_hb->add_spacer(); - site_search = memnew( ToolButton ); + site_search = memnew(ToolButton); site_search->set_text(TTR("Tutorials")); - site_search->connect("pressed",this,"_menu_option",varray(SEARCH_WEBSITE)); + site_search->connect("pressed", this, "_menu_option", varray(SEARCH_WEBSITE)); menu_hb->add_child(site_search); site_search->set_tooltip(TTR("Open https://godotengine.org at tutorials section.")); - class_search = memnew( ToolButton ); + class_search = memnew(ToolButton); class_search->set_text(TTR("Classes")); - class_search->connect("pressed",this,"_menu_option",varray(SEARCH_CLASSES)); + class_search->connect("pressed", this, "_menu_option", varray(SEARCH_CLASSES)); menu_hb->add_child(class_search); class_search->set_tooltip(TTR("Search the class hierarchy.")); - help_search = memnew( ToolButton ); + help_search = memnew(ToolButton); help_search->set_text(TTR("Search Help")); - help_search->connect("pressed",this,"_menu_option",varray(SEARCH_HELP)); + help_search->connect("pressed", this, "_menu_option", varray(SEARCH_HELP)); menu_hb->add_child(help_search); help_search->set_tooltip(TTR("Search the reference documentation.")); - menu_hb->add_child( memnew( VSeparator) ); + menu_hb->add_child(memnew(VSeparator)); - script_back = memnew( ToolButton ); - script_back->connect("pressed",this,"_history_back"); + script_back = memnew(ToolButton); + script_back->connect("pressed", this, "_history_back"); menu_hb->add_child(script_back); script_back->set_disabled(true); script_back->set_tooltip(TTR("Go to previous edited document.")); - script_forward = memnew( ToolButton ); - script_forward->connect("pressed",this,"_history_forward"); + script_forward = memnew(ToolButton); + script_forward->connect("pressed", this, "_history_forward"); menu_hb->add_child(script_forward); script_forward->set_disabled(true); script_forward->set_tooltip(TTR("Go to next edited document.")); + tab_container->connect("tab_changed", this, "_tab_changed"); - - tab_container->connect("tab_changed", this,"_tab_changed"); - - erase_tab_confirm = memnew( ConfirmationDialog ); + erase_tab_confirm = memnew(ConfirmationDialog); add_child(erase_tab_confirm); - erase_tab_confirm->connect("confirmed", this,"_close_current_tab"); + erase_tab_confirm->connect("confirmed", this, "_close_current_tab"); script_create_dialog = memnew(ScriptCreateDialog); script_create_dialog->set_title(TTR("Create Script")); @@ -2976,79 +2769,73 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) { script_create_dialog->connect("script_created", this, "_script_created"); file_dialog_option = -1; - file_dialog = memnew( EditorFileDialog ); + file_dialog = memnew(EditorFileDialog); add_child(file_dialog); - file_dialog->connect("file_selected", this,"_file_dialog_action"); + file_dialog->connect("file_selected", this, "_file_dialog_action"); goto_line_dialog = memnew(GotoLineDialog); add_child(goto_line_dialog); - debugger = memnew( ScriptEditorDebugger(editor) ); - debugger->connect("goto_script_line",this,"_goto_script_line"); - debugger->connect("show_debugger",this,"_show_debugger"); + debugger = memnew(ScriptEditorDebugger(editor)); + debugger->connect("goto_script_line", this, "_goto_script_line"); + debugger->connect("show_debugger", this, "_show_debugger"); - disk_changed = memnew( ConfirmationDialog ); + disk_changed = memnew(ConfirmationDialog); { - VBoxContainer *vbc = memnew( VBoxContainer ); + VBoxContainer *vbc = memnew(VBoxContainer); disk_changed->add_child(vbc); disk_changed->set_child_rect(vbc); - Label *dl = memnew( Label ); + Label *dl = memnew(Label); dl->set_text(TTR("The following files are newer on disk.\nWhat action should be taken?:")); vbc->add_child(dl); - disk_changed_list = memnew( Tree ); + disk_changed_list = memnew(Tree); vbc->add_child(disk_changed_list); disk_changed_list->set_v_size_flags(SIZE_EXPAND_FILL); - disk_changed->connect("confirmed",this,"_reload_scripts"); + disk_changed->connect("confirmed", this, "_reload_scripts"); disk_changed->get_ok()->set_text(TTR("Reload")); - disk_changed->add_button(TTR("Resave"),!OS::get_singleton()->get_swap_ok_cancel(),"resave"); - disk_changed->connect("custom_action",this,"_resave_scripts"); - - + disk_changed->add_button(TTR("Resave"), !OS::get_singleton()->get_swap_ok_cancel(), "resave"); + disk_changed->connect("custom_action", this, "_resave_scripts"); } add_child(disk_changed); - script_editor=this; + script_editor = this; - quick_open = memnew( ScriptEditorQuickOpen ); + quick_open = memnew(ScriptEditorQuickOpen); add_child(quick_open); - quick_open->connect("goto_line",this,"_goto_script_line2"); - + quick_open->connect("goto_line", this, "_goto_script_line2"); - Button *db = EditorNode::get_singleton()->add_bottom_panel_item(TTR("Debugger"),debugger); + Button *db = EditorNode::get_singleton()->add_bottom_panel_item(TTR("Debugger"), debugger); debugger->set_tool_button(db); + debugger->connect("breaked", this, "_breaked"); - debugger->connect("breaked",this,"_breaked"); - - autosave_timer = memnew( Timer ); + autosave_timer = memnew(Timer); autosave_timer->set_one_shot(false); add_child(autosave_timer); - grab_focus_block=false; + grab_focus_block = false; - help_search_dialog = memnew( EditorHelpSearch ); + help_search_dialog = memnew(EditorHelpSearch); add_child(help_search_dialog); - help_search_dialog->connect("go_to_help",this,"_help_class_goto"); - + help_search_dialog->connect("go_to_help", this, "_help_class_goto"); - help_index = memnew( EditorHelpIndex ); + help_index = memnew(EditorHelpIndex); add_child(help_index); - help_index->connect("open_class",this,"_help_class_open"); + help_index->connect("open_class", this, "_help_class_open"); - history_pos=-1; -// debugger_gui->hide(); + history_pos = -1; + // debugger_gui->hide(); - edit_pass=0; + edit_pass = 0; trim_trailing_whitespace_on_save = false; } - ScriptEditor::~ScriptEditor() { memdelete(completion_cache); @@ -3060,7 +2847,6 @@ void ScriptEditorPlugin::edit(Object *p_object) { return; script_editor->edit(p_object->cast_to<Script>()); - } bool ScriptEditorPlugin::handles(Object *p_object) const { @@ -3089,7 +2875,6 @@ void ScriptEditorPlugin::make_visible(bool p_visible) { script_editor->hide(); script_editor->set_process(false); } - } void ScriptEditorPlugin::selected_notify() { @@ -3102,7 +2887,7 @@ Dictionary ScriptEditorPlugin::get_state() const { return script_editor->get_state(); } -void ScriptEditorPlugin::set_state(const Dictionary& p_state) { +void ScriptEditorPlugin::set_state(const Dictionary &p_state) { script_editor->set_state(p_state); } @@ -3122,12 +2907,9 @@ void ScriptEditorPlugin::apply_changes() { } void ScriptEditorPlugin::restore_global_state() { - - } void ScriptEditorPlugin::save_global_state() { - } void ScriptEditorPlugin::set_window_layout(Ref<ConfigFile> p_layout) { @@ -3135,15 +2917,13 @@ void ScriptEditorPlugin::set_window_layout(Ref<ConfigFile> p_layout) { script_editor->set_window_layout(p_layout); } -void ScriptEditorPlugin::get_window_layout(Ref<ConfigFile> p_layout){ +void ScriptEditorPlugin::get_window_layout(Ref<ConfigFile> p_layout) { script_editor->get_window_layout(p_layout); } - void ScriptEditorPlugin::get_breakpoints(List<String> *p_breakpoints) { - return script_editor->get_breakpoints(p_breakpoints); } @@ -3152,39 +2932,34 @@ void ScriptEditorPlugin::edited_scene_changed() { script_editor->edited_scene_changed(); } - - ScriptEditorPlugin::ScriptEditorPlugin(EditorNode *p_node) { - editor=p_node; - script_editor = memnew( ScriptEditor(p_node) ); + editor = p_node; + script_editor = memnew(ScriptEditor(p_node)); editor->get_viewport()->add_child(script_editor); script_editor->set_v_size_flags(Control::SIZE_EXPAND_FILL); script_editor->hide(); - EDITOR_DEF("text_editor/auto_reload_scripts_on_external_change",true); - ScriptServer::set_reload_scripts_on_save(EDITOR_DEF("text_editor/auto_reload_and_parse_scripts_on_save",true)); - EDITOR_DEF("text_editor/open_dominant_script_on_scene_change",true); - EDITOR_DEF("external_editor/use_external_editor",false); - EDITOR_DEF("external_editor/exec_path",""); - EDITOR_DEF("text_editor/script_temperature_enabled",true); + EDITOR_DEF("text_editor/auto_reload_scripts_on_external_change", true); + ScriptServer::set_reload_scripts_on_save(EDITOR_DEF("text_editor/auto_reload_and_parse_scripts_on_save", true)); + EDITOR_DEF("text_editor/open_dominant_script_on_scene_change", true); + EDITOR_DEF("external_editor/use_external_editor", false); + EDITOR_DEF("external_editor/exec_path", ""); + EDITOR_DEF("text_editor/script_temperature_enabled", true); EDITOR_DEF("text_editor/highlight_current_script", true); - EDITOR_DEF("text_editor/script_temperature_history_size",15); - EDITOR_DEF("text_editor/script_temperature_hot_color",Color(1,0,0,0.3)); - EDITOR_DEF("text_editor/script_temperature_cold_color",Color(0,0,1,0.3)); - EDITOR_DEF("text_editor/current_script_background_color",Color(0.81,0.81,0.14,0.63)); - EDITOR_DEF("text_editor/group_help_pages",true); - EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::INT,"text_editor/sort_scripts_by",PROPERTY_HINT_ENUM,"Name,Path")); - EDITOR_DEF("text_editor/sort_scripts_by",0); - EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::INT,"text_editor/list_script_names_as",PROPERTY_HINT_ENUM,"Name,Parent Directory And Name,Full Path")); - EDITOR_DEF("text_editor/list_script_names_as",0); - EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING,"external_editor/exec_path",PROPERTY_HINT_GLOBAL_FILE)); - EDITOR_DEF("external_editor/exec_flags",""); - + EDITOR_DEF("text_editor/script_temperature_history_size", 15); + EDITOR_DEF("text_editor/script_temperature_hot_color", Color(1, 0, 0, 0.3)); + EDITOR_DEF("text_editor/script_temperature_cold_color", Color(0, 0, 1, 0.3)); + EDITOR_DEF("text_editor/current_script_background_color", Color(0.81, 0.81, 0.14, 0.63)); + EDITOR_DEF("text_editor/group_help_pages", true); + EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::INT, "text_editor/sort_scripts_by", PROPERTY_HINT_ENUM, "Name,Path")); + EDITOR_DEF("text_editor/sort_scripts_by", 0); + EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::INT, "text_editor/list_script_names_as", PROPERTY_HINT_ENUM, "Name,Parent Directory And Name,Full Path")); + EDITOR_DEF("text_editor/list_script_names_as", 0); + EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING, "external_editor/exec_path", PROPERTY_HINT_GLOBAL_FILE)); + EDITOR_DEF("external_editor/exec_flags", ""); } - -ScriptEditorPlugin::~ScriptEditorPlugin() -{ +ScriptEditorPlugin::~ScriptEditorPlugin() { } |