From 07bc4e2f96f8f47991339654ff4ab16acc19d44f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= 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_editor.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'modules/gdscript/gdscript_editor.cpp') diff --git a/modules/gdscript/gdscript_editor.cpp b/modules/gdscript/gdscript_editor.cpp index fc6f9b5419..8aa7809347 100644 --- a/modules/gdscript/gdscript_editor.cpp +++ b/modules/gdscript/gdscript_editor.cpp @@ -237,6 +237,7 @@ int GDScriptLanguage::debug_get_stack_level_count() const { return _debug_call_stack_pos; } + int GDScriptLanguage::debug_get_stack_level_line(int p_level) const { if (_debug_parse_err_line >= 0) return _debug_parse_err_line; @@ -247,6 +248,7 @@ int GDScriptLanguage::debug_get_stack_level_line(int p_level) const { return *(_call_stack[l].line); } + String GDScriptLanguage::debug_get_stack_level_function(int p_level) const { if (_debug_parse_err_line >= 0) return ""; @@ -255,6 +257,7 @@ String GDScriptLanguage::debug_get_stack_level_function(int p_level) const { int l = _debug_call_stack_pos - p_level - 1; return _call_stack[l].function->get_name(); } + String GDScriptLanguage::debug_get_stack_level_source(int p_level) const { if (_debug_parse_err_line >= 0) return _debug_parse_err_file; @@ -263,6 +266,7 @@ String GDScriptLanguage::debug_get_stack_level_source(int p_level) const { int l = _debug_call_stack_pos - p_level - 1; return _call_stack[l].function->get_source(); } + void GDScriptLanguage::debug_get_stack_level_locals(int p_level, List *p_locals, List *p_values, int p_max_subitems, int p_max_depth) { if (_debug_parse_err_line >= 0) return; @@ -280,6 +284,7 @@ void GDScriptLanguage::debug_get_stack_level_locals(int p_level, List *p p_values->push_back(_call_stack[l].stack[E->get().second]); } } + void GDScriptLanguage::debug_get_stack_level_members(int p_level, List *p_members, List *p_values, int p_max_subitems, int p_max_depth) { if (_debug_parse_err_line >= 0) return; -- cgit v1.2.3