1berry/godotengine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #87542 from Mickeon/code-editor-idle-parse-delay-I-am-speed

Browse Source 
Make the Script Editor's parser execute sooner on edit after error was found
This commit is contained in:
Rémi Verschelde 2024-12-17 16:18:33 +01:00
commit bf0f1054db
No known key found for this signature in database
GPG Key ID: C3336907360768E1
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/classes/EditorSettings.xml
View File

@ -1299,6 +1299,9 @@
<member name="text_editor/completion/idle_parse_delay" type="float" setter="" getter=""> <member name="text_editor/completion/idle_parse_delay" type="float" setter="" getter="">
The delay in seconds after which the script editor should check for errors when the user stops typing. The delay in seconds after which the script editor should check for errors when the user stops typing.
</member> </member>
<member name="text_editor/completion/idle_parse_delay_with_errors_found" type="float" setter="" getter="">
The delay used instead of [member text_editor/completion/idle_parse_delay], when the parser has found errors. A lower value should feel more responsive while fixing code, but may cause notable stuttering and increase CPU usage.
</member>
<member name="text_editor/completion/put_callhint_tooltip_below_current_line" type="bool" setter="" getter=""> <member name="text_editor/completion/put_callhint_tooltip_below_current_line" type="bool" setter="" getter="">
If [code]true[/code], the code completion tooltip will appear below the current line unless there is no space on screen below the current line. If [code]false[/code], the code completion tooltip will appear above the current line. If [code]true[/code], the code completion tooltip will appear below the current line unless there is no space on screen below the current line. If [code]false[/code], the code completion tooltip will appear above the current line.
</member> </member>

13
editor/code_editor.cpp
View File

@ -1119,7 +1119,12 @@ void CodeTextEditor::update_editor_settings() {
text_editor->set_code_hint_draw_below(EDITOR_GET("text_editor/completion/put_callhint_tooltip_below_current_line")); text_editor->set_code_hint_draw_below(EDITOR_GET("text_editor/completion/put_callhint_tooltip_below_current_line"));
code_complete_enabled = EDITOR_GET("text_editor/completion/code_complete_enabled"); code_complete_enabled = EDITOR_GET("text_editor/completion/code_complete_enabled");
code_complete_timer->set_wait_time(EDITOR_GET("text_editor/completion/code_complete_delay")); code_complete_timer->set_wait_time(EDITOR_GET("text_editor/completion/code_complete_delay"));
idle->set_wait_time(EDITOR_GET("text_editor/completion/idle_parse_delay")); bool first_time = idle_time == 0.0;
idle_time = EDITOR_GET("text_editor/completion/idle_parse_delay");
idle_time_with_errors = EDITOR_GET("text_editor/completion/idle_parse_delay_with_errors_found");
if (first_time) {
idle->set_wait_time(idle_time);
}
// Appearance: Guidelines // Appearance: Guidelines
if (EDITOR_GET("text_editor/appearance/guidelines/show_line_length_guidelines")) { if (EDITOR_GET("text_editor/appearance/guidelines/show_line_length_guidelines")) {
@ -1624,8 +1629,11 @@ void CodeTextEditor::_notification(int p_what) {
void CodeTextEditor::set_error_count(int p_error_count) { void CodeTextEditor::set_error_count(int p_error_count) {
error_button->set_text(itos(p_error_count)); error_button->set_text(itos(p_error_count));
error_button->set_visible(p_error_count > 0); error_button->set_visible(p_error_count > 0);
if (!p_error_count) { if (p_error_count > 0) {
_set_show_errors_panel(false); _set_show_errors_panel(false);
idle->set_wait_time(idle_time_with_errors); // Parsing should happen sooner.
} else {
idle->set_wait_time(idle_time);
} }
} }
@ -1797,7 +1805,6 @@ CodeTextEditor::CodeTextEditor() {
add_child(status_bar); add_child(status_bar);
status_bar->set_h_size_flags(SIZE_EXPAND_FILL); status_bar->set_h_size_flags(SIZE_EXPAND_FILL);
status_bar->set_custom_minimum_size(Size2(0, 24 * EDSCALE)); // Adjust for the height of the warning icon. status_bar->set_custom_minimum_size(Size2(0, 24 * EDSCALE)); // Adjust for the height of the warning icon.
idle = memnew(Timer); idle = memnew(Timer);
add_child(idle); add_child(idle);
idle->set_one_shot(true); idle->set_one_shot(true);

2
editor/code_editor.h
View File

@ -174,6 +174,8 @@ class CodeTextEditor : public VBoxContainer {
Label *info = nullptr; Label *info = nullptr;
Timer *idle = nullptr; Timer *idle = nullptr;
float idle_time = 0.0f;
float idle_time_with_errors = 0.0f;
bool code_complete_enabled = true; bool code_complete_enabled = true;
Timer *code_complete_timer = nullptr; Timer *code_complete_timer = nullptr;
int code_complete_timer_line = 0; int code_complete_timer_line = 0;

1
editor/editor_settings.cpp
View File

@ -732,6 +732,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
// Completion // Completion
EDITOR_SETTING(Variant::FLOAT, PROPERTY_HINT_RANGE, "text_editor/completion/idle_parse_delay", 1.5, "0.1,10,0.01") EDITOR_SETTING(Variant::FLOAT, PROPERTY_HINT_RANGE, "text_editor/completion/idle_parse_delay", 1.5, "0.1,10,0.01")
EDITOR_SETTING(Variant::FLOAT, PROPERTY_HINT_RANGE, "text_editor/completion/idle_parse_delay_with_errors_found", 0.5, "0.1,5,0.01")
_initial_set("text_editor/completion/auto_brace_complete", true, true); _initial_set("text_editor/completion/auto_brace_complete", true, true);
_initial_set("text_editor/completion/code_complete_enabled", true, true); _initial_set("text_editor/completion/code_complete_enabled", true, true);
EDITOR_SETTING(Variant::FLOAT, PROPERTY_HINT_RANGE, "text_editor/completion/code_complete_delay", 0.3, "0.01,5,0.01,or_greater") EDITOR_SETTING(Variant::FLOAT, PROPERTY_HINT_RANGE, "text_editor/completion/code_complete_delay", 0.3, "0.01,5,0.01,or_greater")