mirror of
https://github.com/godotengine/godot.git
synced 2025-10-19 16:03:29 +00:00
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:
parent
0be6d925dc
commit
07bc4e2f96
409 changed files with 2286 additions and 0 deletions
|
@ -1276,6 +1276,7 @@ void Node::remove_child(Node *p_child) {
|
|||
int Node::get_child_count() const {
|
||||
return data.children.size();
|
||||
}
|
||||
|
||||
Node *Node::get_child(int p_index) const {
|
||||
ERR_FAIL_INDEX_V(p_index, data.children.size(), nullptr);
|
||||
|
||||
|
@ -1516,6 +1517,7 @@ void Node::set_owner(Node *p_owner) {
|
|||
|
||||
_set_owner_nocheck(p_owner);
|
||||
}
|
||||
|
||||
Node *Node::get_owner() const {
|
||||
return data.owner;
|
||||
}
|
||||
|
@ -1685,6 +1687,7 @@ int Node::get_persistent_group_count() const {
|
|||
|
||||
return count;
|
||||
}
|
||||
|
||||
void Node::_print_tree_pretty(const String &prefix, const bool last) {
|
||||
String new_prefix = last ? String::utf8(" ┖╴") : String::utf8(" ┠╴");
|
||||
print_line(prefix + new_prefix + String(get_name()));
|
||||
|
@ -1814,6 +1817,7 @@ void Node::remove_and_skip() {
|
|||
void Node::set_filename(const String &p_filename) {
|
||||
data.filename = p_filename;
|
||||
}
|
||||
|
||||
String Node::get_filename() const {
|
||||
return data.filename;
|
||||
}
|
||||
|
@ -1821,6 +1825,7 @@ String Node::get_filename() const {
|
|||
void Node::set_editor_description(const String &p_editor_description) {
|
||||
set_meta("_editor_description_", p_editor_description);
|
||||
}
|
||||
|
||||
String Node::get_editor_description() const {
|
||||
if (has_meta("_editor_description_")) {
|
||||
return get_meta("_editor_description_");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue