diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-07-04 08:38:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-04 08:38:27 +0200 |
| commit | 14d1cfd0daf6db8fdffc0e57540619eff81ac240 (patch) | |
| tree | 914511435507d93e8cfafa1f395c5e96d8ae3eb0 /editor/plugins/script_text_editor.h | |
| parent | 2293c612e6c0913b6999080c9f2fa77227348818 (diff) | |
| parent | ed7ed52151a9eca2a60a418881bd7065529acb66 (diff) | |
Merge pull request #29626 from GodotExplorer/script_more_complete_info
More information for code completion options
Diffstat (limited to 'editor/plugins/script_text_editor.h')
| -rw-r--r-- | editor/plugins/script_text_editor.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/editor/plugins/script_text_editor.h b/editor/plugins/script_text_editor.h index b53383b117..9a2a514a6e 100644 --- a/editor/plugins/script_text_editor.h +++ b/editor/plugins/script_text_editor.h @@ -143,7 +143,6 @@ class ScriptTextEditor : public ScriptEditorBase { }; protected: - static void _code_complete_scripts(void *p_ud, const String &p_code, List<String> *r_options, bool &r_force); void _update_breakpoint_list(); void _breakpoint_item_pressed(int p_idx); void _breakpoint_toggled(int p_row); @@ -151,7 +150,10 @@ protected: void _validate_script(); // No longer virtual. void _update_bookmark_list(); void _bookmark_item_pressed(int p_idx); - void _code_complete_script(const String &p_code, List<String> *r_options, bool &r_force); + + static void _code_complete_scripts(void *p_ud, const String &p_code, List<ScriptCodeCompletionOption> *r_options, bool &r_force); + void _code_complete_script(const String &p_code, List<ScriptCodeCompletionOption> *r_options, bool &r_force); + void _load_theme_settings(); void _set_theme_for_script(); void _show_warnings_panel(bool p_show); |