From 07bc4e2f96f8f47991339654ff4ab16acc19d44f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Thu, 14 May 2020 14:29:06 +0200
Subject: 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.
---
 scene/debugger/scene_debugger.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'scene/debugger')

diff --git a/scene/debugger/scene_debugger.cpp b/scene/debugger/scene_debugger.cpp
index 965dd2c8a3..879f891cc9 100644
--- a/scene/debugger/scene_debugger.cpp
+++ b/scene/debugger/scene_debugger.cpp
@@ -224,6 +224,7 @@ void SceneDebugger::add_to_cache(const String &p_filename, Node *p_node) {
 		debugger->live_scene_edit_cache[p_filename].insert(p_node);
 	}
 }
+
 void SceneDebugger::remove_from_cache(const String &p_filename, Node *p_node) {
 	LiveEditor *debugger = LiveEditor::get_singleton();
 	if (!debugger)
@@ -537,6 +538,7 @@ void LiveEditor::_node_set_res_func(int p_id, const StringName &p_prop, const St
 		return;
 	_node_set_func(p_id, p_prop, r);
 }
+
 void LiveEditor::_node_call_func(int p_id, const StringName &p_method, VARIANT_ARG_DECLARE) {
 	SceneTree *scene_tree = SceneTree::get_singleton();
 	if (!scene_tree)
@@ -566,6 +568,7 @@ void LiveEditor::_node_call_func(int p_id, const StringName &p_method, VARIANT_A
 		n2->call(p_method, VARIANT_ARG_PASS);
 	}
 }
+
 void LiveEditor::_res_set_func(int p_id, const StringName &p_prop, const Variant &p_value) {
 	if (!live_edit_resource_cache.has(p_id))
 		return;
@@ -581,12 +584,14 @@ void LiveEditor::_res_set_func(int p_id, const StringName &p_prop, const Variant
 
 	r->set(p_prop, p_value);
 }
+
 void LiveEditor::_res_set_res_func(int p_id, const StringName &p_prop, const String &p_value) {
 	RES r = ResourceLoader::load(p_value);
 	if (!r.is_valid())
 		return;
 	_res_set_func(p_id, p_prop, r);
 }
+
 void LiveEditor::_res_call_func(int p_id, const StringName &p_method, VARIANT_ARG_DECLARE) {
 	if (!live_edit_resource_cache.has(p_id))
 		return;
@@ -640,6 +645,7 @@ void LiveEditor::_create_node_func(const NodePath &p_parent, const String &p_typ
 		n2->add_child(no);
 	}
 }
+
 void LiveEditor::_instance_node_func(const NodePath &p_parent, const String &p_path, const String &p_name) {
 	SceneTree *scene_tree = SceneTree::get_singleton();
 	if (!scene_tree)
@@ -677,6 +683,7 @@ void LiveEditor::_instance_node_func(const NodePath &p_parent, const String &p_p
 		n2->add_child(no);
 	}
 }
+
 void LiveEditor::_remove_node_func(const NodePath &p_at) {
 	SceneTree *scene_tree = SceneTree::get_singleton();
 	if (!scene_tree)
@@ -707,6 +714,7 @@ void LiveEditor::_remove_node_func(const NodePath &p_at) {
 		F = N;
 	}
 }
+
 void LiveEditor::_remove_and_keep_node_func(const NodePath &p_at, ObjectID p_keep_id) {
 	SceneTree *scene_tree = SceneTree::get_singleton();
 	if (!scene_tree)
@@ -740,6 +748,7 @@ void LiveEditor::_remove_and_keep_node_func(const NodePath &p_at, ObjectID p_kee
 		F = N;
 	}
 }
+
 void LiveEditor::_restore_node_func(ObjectID p_id, const NodePath &p_at, int p_at_pos) {
 	SceneTree *scene_tree = SceneTree::get_singleton();
 	if (!scene_tree)
@@ -785,6 +794,7 @@ void LiveEditor::_restore_node_func(ObjectID p_id, const NodePath &p_at, int p_a
 		F = N;
 	}
 }
+
 void LiveEditor::_duplicate_node_func(const NodePath &p_at, const String &p_new_name) {
 	SceneTree *scene_tree = SceneTree::get_singleton();
 	if (!scene_tree)
@@ -817,6 +827,7 @@ void LiveEditor::_duplicate_node_func(const NodePath &p_at, const String &p_new_
 		n2->get_parent()->add_child(dup);
 	}
 }
+
 void LiveEditor::_reparent_node_func(const NodePath &p_at, const NodePath &p_new_place, const String &p_new_name, int p_at_pos) {
 	SceneTree *scene_tree = SceneTree::get_singleton();
 	if (!scene_tree)
-- 
cgit v1.2.3