mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-02-05 21:41:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #60519 from nathanfranke/fix-newline-indent

Browse Source 
fix lines with ':' that end in comments causing auto indent
This commit is contained in:
Rémi Verschelde 2022-04-29 14:08:31 +02:00 committed by GitHub
commit 65aacd6b0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scene/gui/code_edit.cpp
View File

@ -994,7 +994,8 @@ void CodeEdit::_new_line(bool p_split_current_line, bool p_above) {
} }
/* Make sure this is the last char, trailing whitespace or comments are okay. */ /* Make sure this is the last char, trailing whitespace or comments are okay. */
if (should_indent && (!is_whitespace(c) && is_in_comment(cl, cc) == -1)) { /* Increment column for comments because the delimiter (#) should be ignored. */
if (should_indent && (!is_whitespace(c) && is_in_comment(cl, line_col + 1) == -1)) {
should_indent = false; should_indent = false;
} }
} }

32
tests/scene/test_code_edit.h
View File

@ -2179,8 +2179,24 @@ TEST_CASE("[SceneTree][CodeEdit] indent") {
SEND_GUI_ACTION(code_edit, "ui_text_newline"); SEND_GUI_ACTION(code_edit, "ui_text_newline");
CHECK(code_edit->get_line(0) == "test: # string"); CHECK(code_edit->get_line(0) == "test: # string");
CHECK(code_edit->get_line(1) == ""); CHECK(code_edit->get_line(1) == "");
code_edit->remove_string_delimiter("#");
/* Non-whitespace prevents auto-indentation. */
code_edit->add_comment_delimiter("#", "");
code_edit->set_text("");
code_edit->insert_text_at_caret("test := 0 # comment");
SEND_GUI_ACTION(code_edit, "ui_text_newline");
CHECK(code_edit->get_line(0) == "test := 0 # comment");
CHECK(code_edit->get_line(1) == "");
code_edit->remove_comment_delimiter("#"); code_edit->remove_comment_delimiter("#");
/* Even when there's no comments. */
code_edit->set_text("");
code_edit->insert_text_at_caret("test := 0");
SEND_GUI_ACTION(code_edit, "ui_text_newline");
CHECK(code_edit->get_line(0) == "test := 0");
CHECK(code_edit->get_line(1) == "");
/* If between brace pairs an extra line is added. */ /* If between brace pairs an extra line is added. */
code_edit->set_text(""); code_edit->set_text("");
code_edit->insert_text_at_caret("test{}"); code_edit->insert_text_at_caret("test{}");
@ -2256,8 +2272,24 @@ TEST_CASE("[SceneTree][CodeEdit] indent") {
SEND_GUI_ACTION(code_edit, "ui_text_newline"); SEND_GUI_ACTION(code_edit, "ui_text_newline");
CHECK(code_edit->get_line(0) == "test: # string"); CHECK(code_edit->get_line(0) == "test: # string");
CHECK(code_edit->get_line(1) == ""); CHECK(code_edit->get_line(1) == "");
code_edit->remove_string_delimiter("#");
/* Non-whitespace prevents auto-indentation. */
code_edit->add_comment_delimiter("#", "");
code_edit->set_text("");
code_edit->insert_text_at_caret("test := 0 # comment");
SEND_GUI_ACTION(code_edit, "ui_text_newline");
CHECK(code_edit->get_line(0) == "test := 0 # comment");
CHECK(code_edit->get_line(1) == "");
code_edit->remove_comment_delimiter("#"); code_edit->remove_comment_delimiter("#");
/* Even when there's no comments. */
code_edit->set_text("");
code_edit->insert_text_at_caret("test := 0");
SEND_GUI_ACTION(code_edit, "ui_text_newline");
CHECK(code_edit->get_line(0) == "test := 0");
CHECK(code_edit->get_line(1) == "");
/* If between brace pairs an extra line is added. */ /* If between brace pairs an extra line is added. */
code_edit->set_text(""); code_edit->set_text("");
code_edit->insert_text_at_caret("test{}"); code_edit->insert_text_at_caret("test{}");