From 66e3060ea193aeb81a627c8cd4478a3547de9830 Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Wed, 23 Sep 2020 02:17:14 -0400 Subject: [PATCH] Add line removal around braces to the file formatting script --- misc/scripts/file_format.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/misc/scripts/file_format.sh b/misc/scripts/file_format.sh index c570ec23a7b..0e9db68a90f 100755 --- a/misc/scripts/file_format.sh +++ b/misc/scripts/file_format.sh @@ -40,6 +40,13 @@ while IFS= read -rd '' f; do perl -i -ple 's/\s*$//g' "$f" # Remove the character sequence "== true" if it has a leading space. perl -i -pe 's/\x20== true//g' "$f" + + if [[ $(uname) == "Linux" ]] && [[ "$f" != *"xml" ]]; then + # Remove empty lines after the opening brace of indented blocks. + sed -z -i 's/\x7B\x0A\x0A\x09/\x7B\x0A\x09/g' "$f" + # Remove empty lines before the closing brace (in some cases). + sed -z -i 's/\x0A\x0A\x7D/\x0A\x7D/g' "$f" + fi done git diff > patch.patch