diff --git a/doc/classes/EditorSettings.xml b/doc/classes/EditorSettings.xml index 4b1ff0b2aec1..a0db1f2e2097 100644 --- a/doc/classes/EditorSettings.xml +++ b/doc/classes/EditorSettings.xml @@ -837,6 +837,9 @@ The delay in seconds after which autocompletion suggestions should be displayed when the user stops typing. + + If [code]true[/code], code completion will be triggered automatically after [member text_editor/completion/code_complete_delay]. If [code]false[/code], you can still trigger completion manually by pressing [kbd]Ctrl + Space[/kbd] ([kbd]Cmd + Space[/kbd] on macOS). + If [code]true[/code], provides autocompletion suggestions for file paths in methods such as [code]load()[/code] and [code]preload()[/code]. diff --git a/editor/code_editor.cpp b/editor/code_editor.cpp index b48bd4ab5fae..f301dd1cb788 100644 --- a/editor/code_editor.cpp +++ b/editor/code_editor.cpp @@ -905,7 +905,7 @@ void CodeTextEditor::_line_col_changed() { } void CodeTextEditor::_text_changed() { - if (text_editor->is_insert_text_operation()) { + if (code_complete_enabled && text_editor->is_insert_text_operation()) { code_complete_timer_line = text_editor->get_caret_line(); code_complete_timer->start(); } @@ -1736,6 +1736,7 @@ void CodeTextEditor::_apply_settings_change() { 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_timer->set_wait_time(EDITOR_GET("text_editor/completion/code_complete_delay")); idle->set_wait_time(EDITOR_GET("text_editor/completion/idle_parse_delay")); } @@ -2010,6 +2011,7 @@ CodeTextEditor::CodeTextEditor() { idle->set_one_shot(true); idle->set_wait_time(EDITOR_GET("text_editor/completion/idle_parse_delay")); + code_complete_enabled = EDITOR_GET("text_editor/completion/code_complete_enabled"); code_complete_timer = memnew(Timer); add_child(code_complete_timer); code_complete_timer->set_one_shot(true); diff --git a/editor/code_editor.h b/editor/code_editor.h index a83bb96771f5..c18154a1ef65 100644 --- a/editor/code_editor.h +++ b/editor/code_editor.h @@ -157,6 +157,7 @@ class CodeTextEditor : public VBoxContainer { Label *info = nullptr; Timer *idle = nullptr; + bool code_complete_enabled = true; Timer *code_complete_timer = nullptr; int code_complete_timer_line = 0; diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index 8634b94858d6..537e862a51ca 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -597,7 +597,8 @@ void EditorSettings::_load_defaults(Ref p_extra_config) { // Completion EDITOR_SETTING(Variant::FLOAT, PROPERTY_HINT_RANGE, "text_editor/completion/idle_parse_delay", 2.0, "0.1,10,0.01") _initial_set("text_editor/completion/auto_brace_complete", true); - EDITOR_SETTING(Variant::FLOAT, PROPERTY_HINT_RANGE, "text_editor/completion/code_complete_delay", 0.3, "0.01,5,0.01") + _initial_set("text_editor/completion/code_complete_enabled", true); + EDITOR_SETTING(Variant::FLOAT, PROPERTY_HINT_RANGE, "text_editor/completion/code_complete_delay", 0.3, "0.01,5,0.01,or_greater") _initial_set("text_editor/completion/put_callhint_tooltip_below_current_line", true); _initial_set("text_editor/completion/complete_file_paths", true); _initial_set("text_editor/completion/add_type_hints", false);