godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #71519 from adamscott/fix-code-completion-home-end

Browse Source 
Fix code completion override of home and end keys
This commit is contained in:
Rémi Verschelde 2023-10-09 15:30:27 +02:00
commit c6635b4640
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scene/gui/code_edit.cpp
View File

@ -479,19 +479,8 @@ void CodeEdit::gui_input(const Ref<InputEvent> &p_gui_input) {
accept_event(); accept_event();
return; return;
} }
if (k->is_action("ui_home", true)) { if (k->is_action("ui_text_caret_line_start", true) || k->is_action("ui_text_caret_line_end", true)) {
code_completion_current_selected = 0; cancel_code_completion();
code_completion_force_item_center = -1;
queue_redraw();
accept_event();
return;
}
if (k->is_action("ui_end", true)) {
code_completion_current_selected = code_completion_options.size() - 1;
code_completion_force_item_center = -1;
queue_redraw();
accept_event();
return;
} }
if (k->is_action("ui_text_completion_replace", true) || k->is_action("ui_text_completion_accept", true)) { if (k->is_action("ui_text_completion_replace", true) || k->is_action("ui_text_completion_accept", true)) {
confirm_code_completion(k->is_action("ui_text_completion_replace", true)); confirm_code_completion(k->is_action("ui_text_completion_replace", true));

40
tests/scene/test_code_edit.h
View File

@ -3364,7 +3364,9 @@ TEST_CASE("[SceneTree][CodeEdit] completion") {
/* After update, pending add should not be counted, */ /* After update, pending add should not be counted, */
/* also does not work on col 0 */ /* also does not work on col 0 */
int before_text_caret_column = code_edit->get_caret_column();
code_edit->insert_text_at_caret("i"); code_edit->insert_text_at_caret("i");
code_edit->update_code_completion_options(); code_edit->update_code_completion_options();
code_edit->add_code_completion_option(CodeEdit::CodeCompletionKind::KIND_CLASS, "item_0.", "item_0", Color(1, 0, 0), Ref<Resource>(), Color(1, 0, 0)); code_edit->add_code_completion_option(CodeEdit::CodeCompletionKind::KIND_CLASS, "item_0.", "item_0", Color(1, 0, 0), Ref<Resource>(), Color(1, 0, 0));
code_edit->add_code_completion_option(CodeEdit::CodeCompletionKind::KIND_VARIABLE, "item_1.", "item_1"); code_edit->add_code_completion_option(CodeEdit::CodeCompletionKind::KIND_VARIABLE, "item_1.", "item_1");
@ -3400,12 +3402,40 @@ TEST_CASE("[SceneTree][CodeEdit] completion") {
/* Set size for mouse input. */ /* Set size for mouse input. */
code_edit->set_size(Size2(100, 100)); code_edit->set_size(Size2(100, 100));
/* Check input. */ /* Test home and end keys close the completion and move the caret */
SEND_GUI_ACTION("ui_end"); /* => ui_text_caret_line_start */
CHECK(code_edit->get_code_completion_selected_index() == 2); code_edit->set_caret_column(before_text_caret_column + 1);
code_edit->add_code_completion_option(CodeEdit::CodeCompletionKind::KIND_CLASS, "item_0.", "item_0", Color(1, 0, 0), Ref<Resource>(), Color(1, 0, 0));
code_edit->add_code_completion_option(CodeEdit::CodeCompletionKind::KIND_VARIABLE, "item_1.", "item_1");
code_edit->add_code_completion_option(CodeEdit::CodeCompletionKind::KIND_VARIABLE, "item_2.", "item_2");
SEND_GUI_ACTION("ui_home"); code_edit->update_code_completion_options();
CHECK(code_edit->get_code_completion_selected_index() == 0);
SEND_GUI_ACTION("ui_text_caret_line_start");
code_edit->update_code_completion_options();
CHECK(code_edit->get_code_completion_selected_index() == -1);
CHECK(code_edit->get_caret_column() == 0);
/* => ui_text_caret_line_end */
code_edit->set_caret_column(before_text_caret_column + 1);
code_edit->add_code_completion_option(CodeEdit::CodeCompletionKind::KIND_CLASS, "item_0.", "item_0", Color(1, 0, 0), Ref<Resource>(), Color(1, 0, 0));
code_edit->add_code_completion_option(CodeEdit::CodeCompletionKind::KIND_VARIABLE, "item_1.", "item_1");
code_edit->add_code_completion_option(CodeEdit::CodeCompletionKind::KIND_VARIABLE, "item_2.", "item_2");
code_edit->update_code_completion_options();
SEND_GUI_ACTION("ui_text_caret_line_end");
code_edit->update_code_completion_options();
CHECK(code_edit->get_code_completion_selected_index() == -1);
CHECK(code_edit->get_caret_column() == before_text_caret_column + 1);
/* Check input. */
code_edit->set_caret_column(before_text_caret_column + 1);
code_edit->add_code_completion_option(CodeEdit::CodeCompletionKind::KIND_CLASS, "item_0.", "item_0", Color(1, 0, 0), Ref<Resource>(), Color(1, 0, 0));
code_edit->add_code_completion_option(CodeEdit::CodeCompletionKind::KIND_VARIABLE, "item_1.", "item_1");
code_edit->add_code_completion_option(CodeEdit::CodeCompletionKind::KIND_VARIABLE, "item_2.", "item_2");
code_edit->update_code_completion_options();
SEND_GUI_ACTION("ui_page_down"); SEND_GUI_ACTION("ui_page_down");
CHECK(code_edit->get_code_completion_selected_index() == 2); CHECK(code_edit->get_code_completion_selected_index() == 2);