Style: clang-format: Disable AllowShortIfStatementsOnASingleLine

Part of #33027, also discussed in #29848.

Enforcing the use of brackets even on single line statements would be
preferred, but `clang-format` doesn't have this functionality yet.
This commit is contained in:
Rémi Verschelde 2020-05-10 12:56:01 +02:00
parent 03b13e0c69
commit e956e80c1f
130 changed files with 967 additions and 511 deletions

View file

@ -2277,7 +2277,8 @@ void Tree::_gui_input(Ref<InputEvent> p_event) {
bool is_command = k.is_valid() && k->get_command();
if (p_event->is_action("ui_right") && p_event->is_pressed()) {
if (!cursor_can_exit_tree) accept_event();
if (!cursor_can_exit_tree)
accept_event();
if (!selected_item || select_mode == SELECT_ROW || selected_col > (columns.size() - 1)) {
return;
@ -2294,7 +2295,8 @@ void Tree::_gui_input(Ref<InputEvent> p_event) {
}
} else if (p_event->is_action("ui_left") && p_event->is_pressed()) {
if (!cursor_can_exit_tree) accept_event();
if (!cursor_can_exit_tree)
accept_event();
if (!selected_item || select_mode == SELECT_ROW || selected_col < 0) {
return;
@ -2313,19 +2315,22 @@ void Tree::_gui_input(Ref<InputEvent> p_event) {
} else if (p_event->is_action("ui_up") && p_event->is_pressed() && !is_command) {
if (!cursor_can_exit_tree) accept_event();
if (!cursor_can_exit_tree)
accept_event();
_go_up();
} else if (p_event->is_action("ui_down") && p_event->is_pressed() && !is_command) {
if (!cursor_can_exit_tree) accept_event();
if (!cursor_can_exit_tree)
accept_event();
_go_down();
} else if (p_event->is_action("ui_page_down") && p_event->is_pressed()) {
if (!cursor_can_exit_tree) accept_event();
if (!cursor_can_exit_tree)
accept_event();
TreeItem *next = nullptr;
if (!selected_item)
@ -2363,7 +2368,8 @@ void Tree::_gui_input(Ref<InputEvent> p_event) {
ensure_cursor_is_visible();
} else if (p_event->is_action("ui_page_up") && p_event->is_pressed()) {
if (!cursor_can_exit_tree) accept_event();
if (!cursor_can_exit_tree)
accept_event();
TreeItem *prev = nullptr;
if (!selected_item)