Style: Enforce separation line between function definitions
I couldn't find a tool that enforces it, so I went the manual route: ``` find -name "thirdparty" -prune \ -o -name "*.cpp" -o -name "*.h" -o -name "*.m" -o -name "*.mm" \ -o -name "*.glsl" > files perl -0777 -pi -e 's/\n}\n([^#])/\n}\n\n\1/g' $(cat files) misc/scripts/fix_style.sh -c ``` This adds a newline after all `}` on the first column, unless they are followed by `#` (typically `#endif`). This leads to having lots of places with two lines between function/class definitions, but clang-format then fixes it as we enforce max one line of separation. This doesn't fix potential occurrences of function definitions which are indented (e.g. for a helper class defined in a .cpp), but it's better than nothing. Also can't be made to run easily on CI/hooks so we'll have to be careful with new code. Part of #33027.
This commit is contained in:
@@ -296,6 +296,7 @@ void TextEdit::Text::insert(int p_at, const String &p_text) {
|
||||
line.data = p_text;
|
||||
text.insert(p_at, line);
|
||||
}
|
||||
|
||||
void TextEdit::Text::remove(int p_at) {
|
||||
text.remove(p_at);
|
||||
}
|
||||
@@ -5166,27 +5167,33 @@ void TextEdit::select(int p_from_line, int p_from_column, int p_to_line, int p_t
|
||||
|
||||
update();
|
||||
}
|
||||
|
||||
void TextEdit::swap_lines(int line1, int line2) {
|
||||
String tmp = get_line(line1);
|
||||
String tmp2 = get_line(line2);
|
||||
set_line(line2, tmp);
|
||||
set_line(line1, tmp2);
|
||||
}
|
||||
|
||||
bool TextEdit::is_selection_active() const {
|
||||
return selection.active;
|
||||
}
|
||||
|
||||
int TextEdit::get_selection_from_line() const {
|
||||
ERR_FAIL_COND_V(!selection.active, -1);
|
||||
return selection.from_line;
|
||||
}
|
||||
|
||||
int TextEdit::get_selection_from_column() const {
|
||||
ERR_FAIL_COND_V(!selection.active, -1);
|
||||
return selection.from_column;
|
||||
}
|
||||
|
||||
int TextEdit::get_selection_to_line() const {
|
||||
ERR_FAIL_COND_V(!selection.active, -1);
|
||||
return selection.to_line;
|
||||
}
|
||||
|
||||
int TextEdit::get_selection_to_column() const {
|
||||
ERR_FAIL_COND_V(!selection.active, -1);
|
||||
return selection.to_column;
|
||||
|
||||
Reference in New Issue
Block a user