Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 17:11:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

External editor improvements and fixes

Browse source 
Notable changes:

- Now ScriptLanguages have the option to override the global external editor setting.
If `ScriptLanguage::open_in_external_editor()` returns `ERR_UNAVAILABLE` (which it does by default), then the global external editor option will be used.
- Added formatting to the external editor execution arguments. Now it's possible to write something like this: `{project} -g {file}:{line}:{col}`.
- `VisualScript::get_member_line()` now can return the line of functions (well, it returns the id of the _Function_ node of the function). I guess there is nothing else we can get a "line" from.

Fixes:

- Fixes a bug where `ScriptEditor::script_goto_method()` would not work if the script is not already open in the built-in editor.
- Fixes wrong DEFVAL for `cursor_set_column` and `cursor_set_line` in TextEdit.
- `Script::get_member_line()` now returns -1 ("found nothing") by default.
This commit is contained in:
Ignacio Etcheverry 2017-04-15 19:48:10 +02:00
parent fce779a4ef
commit 4b8568006d
11 changed files with 74 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

7
editor/plugins/script_editor_plugin.h
View file

@ -95,7 +95,6 @@ public:
virtual void tag_saved_version() = 0;
virtual void reload(bool p_soft) = 0;
virtual void get_breakpoints(List<int> *p_breakpoints) = 0;
virtual bool goto_method(const String &p_method) = 0;
virtual void add_callback(const String &p_function, PoolStringArray p_args) = 0;
virtual void update_settings() = 0;
virtual void set_debugger_active(bool p_active) = 0;
@ -312,7 +311,9 @@ public:
void apply_scripts() const;
void ensure_select_current();
void edit(const Ref<Script> &p_script, bool p_grab_focus = true);
_FORCE_INLINE_ bool edit(const Ref<Script> &p_script, bool p_grab_focus = true) { return edit(p_script, -1, 0, p_grab_focus); }
bool edit(const Ref<Script> &p_script, int p_line, int p_col, bool p_grab_focus = true);
Dictionary get_state() const;
void set_state(const Dictionary &p_state);
@ -329,7 +330,7 @@ public:
void set_scene_root_script(Ref<Script> p_script);
bool script_go_to_method(Ref<Script> p_script, const String &p_method);
bool script_goto_method(Ref<Script> p_script, const String &p_method);
virtual void edited_scene_changed();