Fix bug related to multicursor and backspacing with brackets #89469
Conversation
scene/gui/code_edit.cpp
Outdated
| int new_cc; | ||
| if (_get_auto_brace_pair_close_at_pos(cl, cc) == idx) { | ||
| remove_text(prev_line, prev_column, cl, cc + auto_brace_completion_pairs[idx].close_key.length()); | ||
| new_cc = cc + auto_brace_completion_pairs[idx].close_key.length(); | ||
| } else { | ||
| remove_text(prev_line, prev_column, cl, cc); | ||
| new_cc = cc; | ||
| } |
There was a problem hiding this comment.
Could be simplified to:
int new_cc = cc;
if (_get_auto_brace_pair_close_at_pos(cl, cc) == idx) {
new_cc += auto_brace_completion_pairs[idx].close_key.length();
}Note: Please make modifications by amending the commit, and force pushing the changes, so that it stays as a single commit (see PR workflow).
There was a problem hiding this comment.
Can also just use cc instead of making new_cc.
There was a problem hiding this comment.
cc is still used further down in other branches and iterations of the loop, so modifying it might change behavior. Does it fix further bugs by doing so or actually risk introducing bugs?
There was a problem hiding this comment.
There is a continue after this, and it is re-set on the next loop iteration, so it doesn't affect any other uses.
It won't fix any other bugs, its just cleaner.
garrettgu10
force-pushed
the
ggu/multicursor-bugfix
branch
from
ae54a8a to
769aff5
Compare
garrettgu10
force-pushed
the
ggu/multicursor-bugfix
branch
from
769aff5 to
4ab08fb
Compare
akien-mga
added
the
cherrypick:4.2
|
Thanks! And congrats for your first merged Godot contribution 🎉 |
Fixes #89417.
The root of the issue is that when removing an opening brace
remove_textis sometimes called with justcc(when the opening and closing brace are not next to each other), butadjust_carets_after_editwas always being called assuming that the closing brace was removed as well.