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.
---
 modules/gdscript/gdscript.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'modules/gdscript/gdscript.cpp')

diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp
index d42fdb1e04..1d26e2148e 100644
--- a/modules/gdscript/gdscript.cpp
+++ b/modules/gdscript/gdscript.cpp
@@ -321,9 +321,11 @@ bool GDScript::instance_has(const Object *p_this) const {
 bool GDScript::has_source_code() const {
 	return source != "";
 }
+
 String GDScript::get_source_code() const {
 	return source;
 }
+
 void GDScript::set_source_code(const String &p_code) {
 	if (source == p_code)
 		return;
@@ -708,6 +710,7 @@ bool GDScript::_get(const StringName &p_name, Variant &r_ret) const {
 
 	return false;
 }
+
 bool GDScript::_set(const StringName &p_name, const Variant &p_value) {
 	if (p_name == GDScriptLanguage::get_singleton()->strings._script_source) {
 		set_source_code(p_value);
@@ -884,6 +887,7 @@ bool GDScript::has_script_signal(const StringName &p_signal) const {
 #endif
 	return false;
 }
+
 void GDScript::get_script_signal_list(List<MethodInfo> *r_signals) const {
 	for (const Map<StringName, Vector<StringName>>::Element *E = _signals.front(); E; E = E->next()) {
 		MethodInfo mi;
@@ -1242,6 +1246,7 @@ bool GDScriptInstance::has_method(const StringName &p_method) const {
 
 	return false;
 }
+
 Variant GDScriptInstance::call(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
 	GDScript *sptr = script.ptr();
 	while (sptr) {
@@ -1493,13 +1498,16 @@ void GDScriptLanguage::init() {
 String GDScriptLanguage::get_type() const {
 	return "GDScript";
 }
+
 String GDScriptLanguage::get_extension() const {
 	return "gd";
 }
+
 Error GDScriptLanguage::execute_file(const String &p_path) {
 	// ??
 	return OK;
 }
+
 void GDScriptLanguage::finish() {
 }
 
@@ -2275,6 +2283,7 @@ void ResourceFormatSaverGDScript::get_recognized_extensions(const RES &p_resourc
 		p_extensions->push_back("gd");
 	}
 }
+
 bool ResourceFormatSaverGDScript::recognize(const RES &p_resource) const {
 	return Object::cast_to<GDScript>(*p_resource) != nullptr;
 }
-- 
cgit v1.2.3