diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-12-10 01:16:07 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-12-10 01:16:07 +0100 |
| commit | 7cb6e6b72375fa384c509651657aeba3f67110be (patch) | |
| tree | 06dc7c61e75e6b52f5a85b5c10db8a22e8108ac2 /misc | |
| parent | ce0f894b4844b74b4f423056b5dc13102d89cafb (diff) | |
Style: Apply clang-format to Java files
Only those from org/godotengine/godot though, not the thirdparty ones.
Diffstat (limited to 'misc')
| -rwxr-xr-x | misc/hooks/pre-commit-clang-format | 2 | ||||
| -rwxr-xr-x | misc/travis/clang-format.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/misc/hooks/pre-commit-clang-format b/misc/hooks/pre-commit-clang-format index d2d65a7428..8ef4e27748 100755 --- a/misc/hooks/pre-commit-clang-format +++ b/misc/hooks/pre-commit-clang-format @@ -31,7 +31,7 @@ PARSE_EXTS=true # File types to parse. Only effective when PARSE_EXTS is true. # FILE_EXTS=".c .h .cpp .hpp" -FILE_EXTS=".c .h .cpp .hpp .cc .hh .cxx .m .mm .inc" +FILE_EXTS=".c .h .cpp .hpp .cc .hh .cxx .m .mm .inc *.java" # Use pygmentize instead of cat to parse diff with highlighting. # Install it with `pip install pygments` (Linux) or `easy_install Pygments` (Mac) diff --git a/misc/travis/clang-format.sh b/misc/travis/clang-format.sh index 2b30cf5ada..d1e37cc10e 100755 --- a/misc/travis/clang-format.sh +++ b/misc/travis/clang-format.sh @@ -11,7 +11,7 @@ else RANGE=HEAD fi -FILES=$(git diff-tree --no-commit-id --name-only -r $RANGE | grep -v thirdparty/ | grep -E "\.(c|h|cpp|hpp|cc|hh|cxx|m|mm|inc)$") +FILES=$(git diff-tree --no-commit-id --name-only -r $RANGE | grep -v thirdparty/ | grep -E "\.(c|h|cpp|hpp|cc|hh|cxx|m|mm|inc|java)$") echo "Checking files:\n$FILES" # create a random filename to store our generated patch |